From cfb3f2c7e9cde8cc2eb2a19263d0802c0c5410a3 Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期一, 06 四月 2026 15:41:04 +0800
Subject: [PATCH] mes接口
---
项目代码/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde.vue | 48
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderDetailService.cs | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 24
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 256 ++--
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/FillingEnum/FillingStatusEnum.cs | 8
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/IDt_FillingOrderDetailService.cs | 2
项目代码/WMS/WIDESEA_WMSClient/src/views/Home.vue | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IOutboundOrderService.cs | 3
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderService.cs | 3
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 260 +++-
项目代码/WMS/WIDESEA_WMSClient/src/views/outbound/fillingOrde.vue | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Command/ConveyorLineCommand.cs | 8
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 6
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/Messages.cs | 22
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderService.cs | 4
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs | 43
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/OutBound.cs | 37
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/FillingOrderController.cs | 3
项目代码/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js | 50
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/FillingJob.cs | 31
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Reports.cs | 458 ++++----
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/FillingOrder.cs | 6
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 276 ++--
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder_Hty.cs | 131 ++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/OutboundOrderController.cs | 12
项目代码/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js | 32
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/OutboundOrderService.cs | 36
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockService.cs | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs | 38
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/UpstreamJob.cs | 84 +
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs | 31
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Return.cs | 18
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs | 225 ++--
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs | 82 +
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/User.cs | 15
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 6
项目代码/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue | 7
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/FillingEnum/FillingStatusEnum.cs | 6
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs | 16
项目代码/WMS/WIDESEA_WMSClient/config/buttons.js | 10
项目代码/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde_hty.vue | 43
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder.cs | 6
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 264 +++-
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 94 +
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Filling/FillingOrder.cs | 6
项目代码/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.js | 38
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderDetailService.cs | 6
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/Commands.cs | 14
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderDetailService.cs | 6
/dev/null | 23
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 6
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder_Hty.cs | 131 ++
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder.cs | 6
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 48
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutboundOrder/OutboundOrderEnum.cs | 30
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt | 0
57 files changed, 2,057 insertions(+), 977 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
index d14387a..21588f3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
@@ -3,35 +3,52 @@
"WorkspaceRootPath": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\fa0fa28a5ee3fda2e58b5a96f64149e68d350882c3393d47438376781993a408\\WebSocketServer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\upstreamjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\upstreamjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\commands.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\commands.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\dbname\\fillingdbname.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\dbname\\fillingdbname.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\command\\conveyorlinecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\command\\conveyorlinecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\tasktypeenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\tasktypeenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\return.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\return.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\user.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\user.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_model\\models\\system\\dt_fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -42,16 +59,8 @@
"RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\dt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_isystemservices\\idt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|solutionrelative:wideseawcs_isystemservices\\idt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
"AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\filling\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\filling\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\command\\fillingcommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -65,17 +74,17 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 3,
+ "SelectedChildIndex": 15,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 13,
"Title": "Dt_FillingOrderService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
"RelativeToolTip": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
- "ViewState": "AgIAABEAAAAAAAAAAAAgwDEAAAA1AAAAAAAAAA==",
+ "ViewState": "AgIAABEAAAAAAAAAAIAwwDUAAAA7AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-01-19T05:47:31.48Z",
"IsPinned": true,
@@ -91,96 +100,105 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "WebSocketServer.cs",
- "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\fa0fa28a5ee3fda2e58b5a96f64149e68d350882c3393d47438376781993a408\\WebSocketServer.cs",
- "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\fa0fa28a5ee3fda2e58b5a96f64149e68d350882c3393d47438376781993a408\\WebSocketServer.cs [\u53EA\u8BFB]",
- "ViewState": "AgIAAHwAAAAAAAAAAAAcwIcAAABOAAAAAQAAAA==",
+ "DocumentIndex": 2,
+ "Title": "Commands.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "ViewState": "AgIAAE0AAAAAAAAAAAA0wGsAAAAiAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-20T04:44:56.597Z",
- "EditorCaption": " [\u53EA\u8BFB]"
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "ConveyorLineCommand.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "ViewState": "AgIAAAkAAAAAAAAAAADwvx0AAAAYAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-19T07:37:14.719Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "IDt_FillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "RelativeToolTip": "WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvw8AAABHAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-18T02:42:29.785Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "Dt_FillingOrder.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "RelativeToolTip": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "ViewState": "AgIAAF0AAAAAAAAAAAAqwH4AAAAPAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-18T02:07:57.26Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "FillingOrder.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "RelativeToolTip": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "ViewState": "AgIAADEAAAAAAAAAAAAIwF0AAAAsAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-18T02:05:44.498Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "Title": "Reports.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\Reports.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
- "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\Reports.cs",
- "ViewState": "AgIAAKkAAAAAAAAAAAAtwL0AAAATAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T08:36:16.433Z",
+ "WhenOpened": "2026-04-03T05:47:24.81Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 7,
+ "Title": "TaskTypeEnum.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "ViewState": "AgIAAAkAAAAAAAAAAAAhwCQAAAAQAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T05:16:13.615Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
"Title": "appsettings.json",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAB0AAAAlAAAAAAAAAA==",
+ "ViewState": "AgIAAAMAAAAAAAAAAADwvx8AAAAEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2026-03-17T08:24:31.672Z",
+ "WhenOpened": "2026-04-02T06:30:21.613Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 10,
+ "Title": "Return.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Return.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\Return.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Return.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\Return.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAswAgAAAAEAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T06:54:34.104Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "User.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\User.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\User.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\User.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\User.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwwAAAAoAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T06:47:53.382Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "Reports.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "ViewState": "AgIAABYAAAAAAAAAAADgv3gAAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:49:08.933Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
+ "Title": "Dt_FillingOrder.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "ViewState": "AgIAAEgAAAAAAAAAAADgv10AAAAUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:29:30.849Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 14,
+ "Title": "FillingOrder.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:29:11.354Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 15,
"Title": "FillingCommand.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Command\\FillingCommand.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Command\\FillingCommand.cs",
@@ -188,8 +206,7 @@
"RelativeToolTip": "WIDESEAWCS_Tasks\\Command\\FillingCommand.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAswA4AAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T07:10:49.13Z",
- "EditorCaption": ""
+ "WhenOpened": "2026-03-17T07:10:49.13Z"
},
{
"$type": "Document",
@@ -206,55 +223,66 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 6,
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAAEoAAAAAAAAAAAAgwFcAAAAMAAAAAAAAAA==",
+ "ViewState": "AgIAABIAAAAAAAAAAADwvyYAAAAYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T06:06:14.908Z",
- "EditorCaption": ""
+ "WhenOpened": "2026-03-17T06:06:14.908Z"
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"Title": "StackerCraneJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
- "ViewState": "AgIAADMAAAAAAAAAAAAkwEkAAAAYAAAAAAAAAA==",
+ "ViewState": "AgIAAHAAAAAAAAAAAAAuwLoAAAAUAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-09-23T11:18:20.339Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 0,
"Title": "ConveyorLineJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
- "ViewState": "AgIAAEIAAAAAAAAAAAAkwGIAAABSAAAAAAAAAA==",
+ "ViewState": "AgIAAKEAAAAAAAAAAAAqwKUAAAB0AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-09-23T06:53:01.475Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 1,
+ "Title": "UpstreamJob.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "ViewState": "AgIAADkAAAAAAAAAAAAuwF4AAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T01:25:46.001Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 8,
"Title": "FillingJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
- "ViewState": "AgIAAEcAAAAAAAAAAAAIwFsAAAAkAAAAAAAAAA==",
+ "ViewState": "AgIAAGcAAAAAAAAAAAAiwHQAAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-12-31T04:31:20.591Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-12-31T04:31:20.591Z"
}
]
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
index ff7134c..a3711cd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
@@ -3,35 +3,52 @@
"WorkspaceRootPath": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\fa0fa28a5ee3fda2e58b5a96f64149e68d350882c3393d47438376781993a408\\WebSocketServer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\commands.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\commands.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\upstreamjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\upstreamjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\dbname\\fillingdbname.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\dbname\\fillingdbname.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\command\\conveyorlinecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\command\\conveyorlinecommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\tasktypeenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\tasktypeenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\return.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\return.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\user.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\user.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_model\\models\\system\\dt_fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -42,16 +59,8 @@
"RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\dt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_isystemservices\\idt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{9E4BFF47-52BF-4FD8-9CC7-3763BF19D9E0}|WIDESEAWCS_ISystemServices\\WIDESEAWCS_ISystemServices.csproj|solutionrelative:wideseawcs_isystemservices\\idt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
"AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\filling\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\filling\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\mes\\reports.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\command\\fillingcommand.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -68,6 +77,20 @@
"SelectedChildIndex": 14,
"Children": [
{
+ "$type": "Document",
+ "DocumentIndex": 13,
+ "Title": "Dt_FillingOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
+ "RelativeToolTip": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
+ "ViewState": "AgIAABEAAAAAAAAAAIAwwDUAAAA7AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-01-19T05:47:31.48Z",
+ "IsPinned": true,
+ "EditorCaption": ""
+ },
+ {
"$type": "Bookmark",
"Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
@@ -77,110 +100,105 @@
},
{
"$type": "Document",
- "DocumentIndex": 9,
- "Title": "Dt_FillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
- "RelativeToolTip": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
- "ViewState": "AgIAABEAAAAAAAAAAAAgwDEAAAA1AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-01-19T05:47:31.48Z",
- "IsPinned": true,
- "EditorCaption": ""
- },
- {
- "$type": "Document",
"DocumentIndex": 1,
- "Title": "WebSocketServer.cs",
- "DocumentMoniker": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\fa0fa28a5ee3fda2e58b5a96f64149e68d350882c3393d47438376781993a408\\WebSocketServer.cs",
- "ToolTip": "C:\\Users\\Administrator\\AppData\\Local\\Temp\\.vsdbgsrc\\fa0fa28a5ee3fda2e58b5a96f64149e68d350882c3393d47438376781993a408\\WebSocketServer.cs [\u53EA\u8BFB]",
- "ViewState": "AgIAAHwAAAAAAAAAAAAcwIcAAABOAAAAAQAAAA==",
+ "Title": "Commands.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\Commands.cs",
+ "ViewState": "AgIAAEkAAAAAAAAAAAAzwDAAAAAUAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-20T04:44:56.597Z",
- "EditorCaption": " [\u53EA\u8BFB]"
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "ConveyorLineCommand.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\Command\\ConveyorLineCommand.cs",
- "ViewState": "AgIAAAkAAAAAAAAAAADwvx0AAAAYAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-19T07:37:14.719Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "IDt_FillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "RelativeToolTip": "WIDESEAWCS_ISystemServices\\IDt_FillingOrderService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvw8AAABHAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-18T02:42:29.785Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "Dt_FillingOrder.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "RelativeToolTip": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
- "ViewState": "AgIAAF0AAAAAAAAAAAAqwH4AAAAPAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-18T02:07:57.26Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "FillingOrder.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "RelativeToolTip": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
- "ViewState": "AgIAADEAAAAAAAAAAAAIwF0AAAAsAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-18T02:05:44.498Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "Title": "Reports.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\Reports.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
- "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\Reports.cs",
- "ViewState": "AgIAAKkAAAAAAAAAAAAtwL0AAAATAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T08:36:16.433Z",
+ "WhenOpened": "2026-04-03T05:47:24.81Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 7,
+ "Title": "TaskTypeEnum.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs",
+ "ViewState": "AgIAAAkAAAAAAAAAAAAhwCQAAAAQAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T05:16:13.615Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
"Title": "appsettings.json",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAB0AAAAlAAAAAAAAAA==",
+ "ViewState": "AgIAAAMAAAAAAAAAAADwvx8AAAAEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2026-03-17T08:24:31.672Z",
+ "WhenOpened": "2026-04-02T06:30:21.613Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 10,
+ "Title": "Return.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Return.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\Return.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Return.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\Return.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAswAgAAAAEAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T06:54:34.104Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "User.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\User.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\User.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\User.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\User.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwwAAAAoAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T06:47:53.382Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "Reports.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\MES\\Reports.cs",
+ "ViewState": "AgIAABYAAAAAAAAAAADgv3gAAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:49:08.933Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
+ "Title": "Dt_FillingOrder.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\System\\Dt_FillingOrder.cs",
+ "ViewState": "AgIAAEgAAAAAAAAAAADgv10AAAAUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:29:30.849Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 14,
+ "Title": "FillingOrder.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "RelativeToolTip": "WIDESEAWCS_DTO\\Filling\\FillingOrder.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:29:11.354Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 15,
"Title": "FillingCommand.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Command\\FillingCommand.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Command\\FillingCommand.cs",
@@ -188,8 +206,7 @@
"RelativeToolTip": "WIDESEAWCS_Tasks\\Command\\FillingCommand.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAswA4AAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T07:10:49.13Z",
- "EditorCaption": ""
+ "WhenOpened": "2026-03-17T07:10:49.13Z"
},
{
"$type": "Document",
@@ -206,55 +223,66 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 6,
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAAEoAAAAAAAAAAAAgwFcAAAAMAAAAAAAAAA==",
+ "ViewState": "AgIAABIAAAAAAAAAAADwvyYAAAAYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T06:06:14.908Z",
- "EditorCaption": ""
+ "WhenOpened": "2026-03-17T06:06:14.908Z"
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 0,
"Title": "StackerCraneJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
- "ViewState": "AgIAADMAAAAAAAAAAAAkwEkAAAAYAAAAAAAAAA==",
+ "ViewState": "AgIAAGgAAAAAAAAAAAAiwHIAAAB+AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-09-23T11:18:20.339Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 2,
"Title": "ConveyorLineJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
- "ViewState": "AgIAAEIAAAAAAAAAAAAkwE0AAAAcAAAAAAAAAA==",
+ "ViewState": "AgIAAKEAAAAAAAAAAAAqwKUAAAB0AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-09-23T06:53:01.475Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 3,
+ "Title": "UpstreamJob.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\UpstreamJob.cs",
+ "ViewState": "AgIAADkAAAAAAAAAAAAuwF4AAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T01:25:46.001Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 8,
"Title": "FillingJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\FillingJob.cs",
- "ViewState": "AgIAAEcAAAAAAAAAAAAIwFsAAAAkAAAAAAAAAA==",
+ "ViewState": "AgIAAGcAAAAAAAAAAAAiwHQAAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-12-31T04:31:20.591Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-12-31T04:31:20.591Z"
}
]
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
new file mode 100644
index 0000000..28ea320
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/FillingEnum/FillingStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/FillingEnum/FillingStatusEnum.cs"
index 48f2997..7e65cb0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/FillingEnum/FillingStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/FillingEnum/FillingStatusEnum.cs"
@@ -19,6 +19,12 @@
/// 宸蹭娇鐢�
/// </summary>
[Description("宸蹭娇鐢�")]
- ExecuteCompleted = 10,
+ ExecuteCompleted = 10,
+
+ /// <summary>
+ /// 宸插彂閫�
+ /// </summary>
+ [Description("宸插彂閫�")]
+ Send = 20,
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Filling/FillingOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Filling/FillingOrder.cs"
index c9dffe9..b5741ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Filling/FillingOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Filling/FillingOrder.cs"
@@ -51,7 +51,7 @@
/// <summary>
/// 娲惧伐ID
/// </summary>
- public int WorkID { get; set; }
+ public long WorkID { get; set; }
/// <summary>
/// 浜у搧鍖呰妗剁被鍨�
@@ -61,12 +61,12 @@
/// <summary>
/// 鏉＄爜鍊糹d
/// </summary>
- public int BarCodeID { get; set; }
+ public long BarCodeID { get; set; }
/// <summary>
/// 鍝佸彿id
/// </summary>
- public int ArticleNumID { get; set; }
+ public long ArticleNumID { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Reports.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Reports.cs"
index a30c33c..f80dcd3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Reports.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Reports.cs"
@@ -12,7 +12,7 @@
/// <summary>
/// 鎶ュ伐淇℃伅
/// </summary>
- public report report { get; set; }
+ public report report { get; set; } = new report();
/// <summary>
/// 鏄惁寮哄埗鍏ュ簱
@@ -22,12 +22,12 @@
/// <summary>
/// 鎶ュ伐鏉＄爜
/// </summary>
- public List<barcodeSN> barcodeSN { get; set; }
+ public List<barcodeSN> barcodeSN { get; set; } = new List<barcodeSN>();
- /// <summary>
- /// 鎶ュ伐淇℃伅鑷畾涔夊瓧娈�
- /// </summary>
- public List<cusValues> cusValues { get; set; }
+ ///// <summary>
+ ///// 鎶ュ伐淇℃伅鑷畾涔夊瓧娈�
+ ///// </summary>
+ //public List<cusValues> cusValues { get; set; } = new List<cusValues>();
}
public class report
@@ -35,87 +35,87 @@
/// <summary>
/// 鎶ュ伐鏁伴噺蹇呭～
/// </summary>
- public decimal Qty { get; set; }
+ public decimal Qty { get; set; }//
/// <summary>
/// 娲惧伐鍗旾D蹇呭～
/// </summary>
- public string DispatchID { get; set; }
- /// <summary>
- /// 杞崲鏁伴噺decimal
- /// </summary>
- public decimal ConversionQty { get; set; }
- /// <summary>
- /// 杞崲鐜嘾ecimal
- /// </summary>
- public decimal ConversionRate { get; set; }
- /// <summary>
- /// 杞崲鍗曚綅id
- /// </summary>
- public int ConversionUnitId { get; set; }
- /// <summary>
- /// 鎶ュ伐浜哄憳id
- /// </summary>
- public string CreateEmpId { get; set; }
- /// <summary>
- /// 宸ュ簭id
- /// </summary>
- public string ProcessId { get; set; }
- /// <summary>
- /// 璁惧id
- /// </summary>
- public string FacilityId { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- /// 鏍囧寘鏁伴噺decimal
- /// </summary>
- public int MinPackage { get; set; }
- /// <summary>
- /// 鍏ュ簱浠撳簱id
- /// </summary>
- public string WarehouseId { get; set; }
- /// <summary>
- /// 鍏ュ簱搴撲綅id
- /// </summary>
- public int WareareaId { get; set; }
- /// <summary>
- /// 杩斿伐鏁伴噺
- /// </summary>
- public int ReworkQty { get; set; }
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- public int ScrapQty { get; set; }
- /// <summary>
- /// 鎶ュ伐鍗曞彿
- /// </summary>
- public string ReportNo { get; set; }
- /// <summary>
- /// 鍗曚环
- /// </summary>
- public decimal PriceOne { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskBillNo { get; set; }
- /// <summary>
- /// 宸ュ簭搴忓彿
- /// </summary>
- public int SubNo { get; set; }
- /// <summary>
- /// 鐢熶骇绫诲瀷锛堝澶�/鑷埗锛�
- /// </summary>
- public string RouteType { get; set; }
- /// <summary>
- /// 鐝Id
- /// </summary>
- public string ClassId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string EmpCode { get; set; }
+ public string DispatchID { get; set; }//
+ ///// <summary>
+ ///// 杞崲鏁伴噺decimal
+ ///// </summary>
+ //public decimal ConversionQty { get; set; }
+ ///// <summary>
+ ///// 杞崲鐜嘾ecimal
+ ///// </summary>
+ //public decimal ConversionRate { get; set; }
+ ///// <summary>
+ ///// 杞崲鍗曚綅id
+ ///// </summary>
+ //public int ConversionUnitId { get; set; }
+ ///// <summary>
+ ///// 鎶ュ伐浜哄憳id
+ ///// </summary>
+ //public string CreateEmpId { get; set; }
+ ///// <summary>
+ ///// 宸ュ簭id
+ ///// </summary>
+ //public string ProcessId { get; set; }
+ ///// <summary>
+ ///// 璁惧id
+ ///// </summary>
+ //public string FacilityId { get; set; }
+ ///// <summary>
+ ///// 澶囨敞
+ ///// </summary>
+ //public string Remark { get; set; }
+ ///// <summary>
+ ///// 鏍囧寘鏁伴噺decimal
+ ///// </summary>
+ //public int MinPackage { get; set; }
+ ///// <summary>
+ ///// 鍏ュ簱浠撳簱id
+ ///// </summary>
+ //public string WarehouseId { get; set; }
+ ///// <summary>
+ ///// 鍏ュ簱搴撲綅id
+ ///// </summary>
+ //public int WareareaId { get; set; }
+ ///// <summary>
+ ///// 杩斿伐鏁伴噺
+ ///// </summary>
+ //public int ReworkQty { get; set; }
+ ///// <summary>
+ ///// 鎶ュ簾鏁伴噺
+ ///// </summary>
+ //public int ScrapQty { get; set; }
+ ///// <summary>
+ ///// 鎶ュ伐鍗曞彿
+ ///// </summary>
+ //public string ReportNo { get; set; }
+ ///// <summary>
+ ///// 鍗曚环
+ ///// </summary>
+ //public decimal PriceOne { get; set; }
+ ///// <summary>
+ ///// 浠诲姟鍗曞彿
+ ///// </summary>
+ //public string TaskBillNo { get; set; }
+ ///// <summary>
+ ///// 宸ュ簭搴忓彿
+ ///// </summary>
+ //public int SubNo { get; set; }
+ ///// <summary>
+ ///// 鐢熶骇绫诲瀷锛堝澶�/鑷埗锛�
+ ///// </summary>
+ //public string RouteType { get; set; }
+ ///// <summary>
+ ///// 鐝Id
+ ///// </summary>
+ //public string ClassId { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string EmpCode { get; set; }
}
public class barcodeSN
@@ -123,7 +123,7 @@
/// <summary>
/// 鏉＄爜蹇呭～
/// </summary>
- public string Barcode { get; set; }
+ public string Barcode { get; set; }//
/// <summary>
/// 鏉＄爜绫诲瀷蹇呭～ 0鐗╂枡鏉＄爜 1绠辨潯鐮� 3SN鐮� 4鎵樼爜
/// </summary>
@@ -131,162 +131,162 @@
/// <summary>
/// 蹇呭～
/// </summary>
- public int Id { get; set; }
+ public long Id { get; set; }//
/// <summary>
/// 鏁伴噺蹇呭～decimal
/// </summary>
- public int Quantity { get; set; }
+ public int Quantity { get; set; }//
/// <summary>
/// 鐗╂枡ID蹇呭～
/// </summary>
- public int MaterialId { get; set; }
- /// <summary>
- /// 杈呭姪鏁伴噺decimal
- /// </summary>
- public int AuxQty { get; set; }
- /// <summary>
- /// 閲嶉噺decimal
- /// </summary>
- public int BarWeight { get; set; }
- /// <summary>
- /// 鏍囩鏁伴噺decimal
- /// </summary>
- public int PackageQty { get; set; }
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- public int QuantityIn { get; set; }
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- public int QuantityOut { get; set; }
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public int Status { get; set; }
+ public long MaterialId { get; set; }//
+ ///// <summary>
+ ///// 杈呭姪鏁伴噺decimal
+ ///// </summary>
+ //public int AuxQty { get; set; }
+ ///// <summary>
+ ///// 閲嶉噺decimal
+ ///// </summary>
+ //public int BarWeight { get; set; }
+ ///// <summary>
+ ///// 鏍囩鏁伴噺decimal
+ ///// </summary>
+ //public int PackageQty { get; set; }
+ ///// <summary>
+ ///// 鍏ュ簱鏁伴噺
+ ///// </summary>
+ //public int QuantityIn { get; set; }
+ ///// <summary>
+ ///// 鍑哄簱鏁伴噺
+ ///// </summary>
+ //public int QuantityOut { get; set; }
+ ///// <summary>
+ ///// 鐘舵��
+ ///// </summary>
+ //public int Status { get; set; }
/// <summary>
/// 鎵规
/// </summary>
- public int BatchNum { get; set; }
- /// <summary>
- /// 鍒涘缓浜哄憳Id
- /// </summary>
- public int CreateEmpId { get; set; }
- /// <summary>
- /// 浠诲姟鍗旾d
- /// </summary>
- public int TaskId { get; set; }
- /// <summary>
- /// 浠诲姟宸ュ簭Id
- /// </summary>
- public int TaskSubId { get; set; }
- /// <summary>
- /// 鎶ュ伐涓嶈壇id
- /// </summary>
- public int ReportNGId { get; set; }
+ public int BatchNum { get; set; }//
+ ///// <summary>
+ ///// 鍒涘缓浜哄憳Id
+ ///// </summary>
+ //public int CreateEmpId { get; set; }
+ ///// <summary>
+ ///// 浠诲姟鍗旾d
+ ///// </summary>
+ //public int TaskId { get; set; }
+ ///// <summary>
+ ///// 浠诲姟宸ュ簭Id
+ ///// </summary>
+ //public int TaskSubId { get; set; }
+ ///// <summary>
+ ///// 鎶ュ伐涓嶈壇id
+ ///// </summary>
+ //public int ReportNGId { get; set; }
/// <summary>
/// 娲惧伐鍗旾d
/// </summary>
- public int DispatchId { get; set; }
- /// <summary>
- /// 鎶ュ伐鍗昳d
- /// </summary>
- public int ReportId { get; set; }
- /// <summary>
- /// 鏉ユ簮绫诲瀷
- /// </summary>
- public int SourceType { get; set; }
- /// <summary>
- /// 瀹㈡埛鏉＄爜
- /// </summary>
- public int CustomerBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鍝佸悕
- /// </summary>
- public int CustomerMaterialName { get; set; }
- /// <summary>
- /// 瀹㈡埛鍝佸彿
- /// </summary>
- public int CustomerMaterialCode { get; set; }
- /// <summary>
- /// 瀹㈡埛鍨嬪彿
- /// </summary>
- public int CustomerMaterialModel { get; set; }
- /// <summary>
- /// 瀹㈡埛瑙勬牸
- /// </summary>
- public int CustomerMaterialSpecification { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public int Remark { get; set; }
- /// <summary>
- /// 浣撶Н
- /// </summary>
- public int Volume { get; set; }
- /// <summary>
- /// 璐ㄦ鍗旾d
- /// </summary>
- public int QcRecordId { get; set; }
- /// <summary>
- /// 渚涘簲鍟咺d
- /// </summary>
- public int SupplierId { get; set; }
- /// <summary>
- /// 璁惧Id
- /// </summary>
- public int FacId { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- public int WarehouseId { get; set; }
- /// <summary>
- /// 搴撲綅
- /// </summary>
- public int WareareaId { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- public int WorkcenterId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int EntityId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int CreateTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int CreateUserId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int CreateUserName { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int LastUpdateTime { get; set; }
- /// <summary>
- //
- /// </summary>
- public int LastUpdateUserId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int LastUpdateUserName { get; set; }
+ public long DispatchId { get; set; }//
+ ///// <summary>
+ ///// 鎶ュ伐鍗昳d
+ ///// </summary>
+ //public int ReportId { get; set; }
+ ///// <summary>
+ ///// 鏉ユ簮绫诲瀷
+ ///// </summary>
+ //public int SourceType { get; set; }
+ ///// <summary>
+ ///// 瀹㈡埛鏉＄爜
+ ///// </summary>
+ //public int CustomerBarcode { get; set; }
+ ///// <summary>
+ ///// 瀹㈡埛鍝佸悕
+ ///// </summary>
+ //public int CustomerMaterialName { get; set; }
+ ///// <summary>
+ ///// 瀹㈡埛鍝佸彿
+ ///// </summary>
+ //public int CustomerMaterialCode { get; set; }
+ ///// <summary>
+ ///// 瀹㈡埛鍨嬪彿
+ ///// </summary>
+ //public int CustomerMaterialModel { get; set; }
+ ///// <summary>
+ ///// 瀹㈡埛瑙勬牸
+ ///// </summary>
+ //public int CustomerMaterialSpecification { get; set; }
+ ///// <summary>
+ ///// 澶囨敞
+ ///// </summary>
+ //public int Remark { get; set; }
+ ///// <summary>
+ ///// 浣撶Н
+ ///// </summary>
+ //public int Volume { get; set; }
+ ///// <summary>
+ ///// 璐ㄦ鍗旾d
+ ///// </summary>
+ //public int QcRecordId { get; set; }
+ ///// <summary>
+ ///// 渚涘簲鍟咺d
+ ///// </summary>
+ //public int SupplierId { get; set; }
+ ///// <summary>
+ ///// 璁惧Id
+ ///// </summary>
+ //public int FacId { get; set; }
+ ///// <summary>
+ ///// 浠撳簱
+ ///// </summary>
+ //public int WarehouseId { get; set; }
+ ///// <summary>
+ ///// 搴撲綅
+ ///// </summary>
+ //public int WareareaId { get; set; }
+ ///// <summary>
+ ///// 宸ヤ綔涓績
+ ///// </summary>
+ //public int WorkcenterId { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public int EntityId { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public int CreateTime { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public int CreateUserId { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public int CreateUserName { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public int LastUpdateTime { get; set; }
+ ///// <summary>
+ ////
+ ///// </summary>
+ //public int LastUpdateUserId { get; set; }
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public int LastUpdateUserName { get; set; }
}
- public class cusValues
- {
- /// <summary>
- /// 瀛楁鍐呯爜
- /// </summary>
- public int FormFieldCode { get; set; }
- /// <summary>
- /// 瀛楁鍊�
- /// </summary>
- public int FieldValue { get; set; }
- }
+ //public class cusValues
+ //{
+ // /// <summary>
+ // /// 瀛楁鍐呯爜
+ // /// </summary>
+ // public int FormFieldCode { get; set; }
+ // /// <summary>
+ // /// 瀛楁鍊�
+ // /// </summary>
+ // public int FieldValue { get; set; }
+ //}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Return.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Return.cs"
new file mode 100644
index 0000000..a77d121
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/Return.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_DTO.MES
+{
+ public class Return
+ {
+ public string message { get; set; }
+
+ public string code { get; set; }
+
+ public string changepsw { get; set; }
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/User.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/User.cs"
new file mode 100644
index 0000000..0c30d55
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MES/User.cs"
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_DTO.MES
+{
+ public class User
+ {
+ public string userName = "admin";
+
+ public string password = "123456";
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/IDt_FillingOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/IDt_FillingOrderDetailService.cs"
index 08ea794..559a6c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/IDt_FillingOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/IDt_FillingOrderDetailService.cs"
@@ -8,7 +8,7 @@
namespace WIDESEAWCS_ISystemServices
{
- public interface IDt_FillingOrderDetailService : IService<Dt_FillingOrderDetail>
+ public interface IDt_FillingOrderDetailService : IService<Dt_FillingOrder_Hty>
{
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder.cs"
index 6b15d03..7d96bcf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder.cs"
@@ -73,7 +73,7 @@
/// 娲惧伐ID
/// </summary>
[SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "娲惧伐ID")]
- public int WorkID { get; set; }
+ public long WorkID { get; set; }
/// <summary>
/// 浜у搧鍖呰妗剁被鍨�
@@ -91,13 +91,13 @@
/// 鏉＄爜鍊糹d
/// </summary>
[SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鍊糹d")]
- public int BarCodeID { get; set; }
+ public long BarCodeID { get; set; }
/// <summary>
/// 鍝佸彿id
/// </summary>
[SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸彿id")]
- public int ArticleNumID { get; set; }
+ public long ArticleNumID { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrderDetail.cs"
deleted file mode 100644
index 89c0136..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrderDetail.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using WIDESEAWCS_Core.DB.Models;
-
-namespace WIDESEA_Model.Models.Basic
-{
- [SugarTable(nameof(Dt_FillingOrderDetail), "浜岀淮鐮�")]
- public class Dt_FillingOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [ImporterHeader(Name = "涓婚敭")]
- [ExporterHeader(DisplayName = "涓婚敭")]
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder_Hty.cs"
new file mode 100644
index 0000000..d374646
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Dt_FillingOrder_Hty.cs"
@@ -0,0 +1,131 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using WIDESEAWCS_Core.DB.Models;
+
+namespace WIDESEA_Model.Models.Basic
+{
+ [SugarTable(nameof(Dt_FillingOrder_Hty), "浜岀淮鐮�")]
+ public class Dt_FillingOrder_Hty : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 鍝佸彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸彿")]
+ public string ArticleNum { get; set; }
+
+ /// <summary>
+ /// 鍝佸悕
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸悕")]
+ public string ArticleName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "瑙勬牸")]
+ public string Specification { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鎵瑰彿")]
+ public string batchNum { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍊�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鍊�")]
+ public string BarCode { get; set; }
+
+ /// <summary>
+ /// 娲惧伐鍗曞彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "娲惧伐鍗曞彿")]
+ public string WorkOrder { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鏁伴噺
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鏁伴噺")]
+ public decimal BarNum { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍒涘缓鏃堕棿")]
+ public string CreationTime { get; set; }
+
+ /// <summary>
+ /// 娲惧伐ID
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "娲惧伐ID")]
+ public long WorkID { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍖呰妗剁被鍨�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "浜у搧鍖呰妗剁被鍨�")]
+ public string ProductType { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鐘舵��
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鐘舵��")]
+ public int BarStatus { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍊糹d
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鍊糹d")]
+ public long BarCodeID { get; set; }
+
+ /// <summary>
+ /// 鍝佸彿id
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸彿id")]
+ public long ArticleNumID { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 璐у尯
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "璐у尯")]
+ public string WarehouseType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鐗╂枡缂栫爜")]
+ public string MaterialCode { get; set; }
+
+ /// <summary>
+ /// 澶囩敤1
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "澶囩敤1")]
+ public string Standby1 { get; set; }
+
+ /// <summary>
+ /// 澶囩敤2
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "澶囩敤2")]
+ public string Standby2 { get; set; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index 5e4d789..fe869a2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -17,7 +17,9 @@
//5.PostgreSQL
"DBType": "SqlServer",
//杩炴帴瀛楃涓�
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_EXAM;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=192.168.10.203;Initial Catalog=WIDESEAWCS_EXAM;User ID=sa;Password=Ab123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_EXAM;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderDetailService.cs"
index 0e14ade..cc8da90 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderDetailService.cs"
@@ -12,12 +12,12 @@
namespace WIDESEAWCS_SystemServices
{
- public class Dt_FillingOrderDetailService : ServiceBase<Dt_FillingOrderDetail, IRepository<Dt_FillingOrderDetail>>, IDt_FillingOrderDetailService
+ public class Dt_FillingOrderDetailService : ServiceBase<Dt_FillingOrder_Hty, IRepository<Dt_FillingOrder_Hty>>, IDt_FillingOrderDetailService
{
- public Dt_FillingOrderDetailService(IRepository<Dt_FillingOrderDetail> BaseDal) : base(BaseDal)
+ public Dt_FillingOrderDetailService(IRepository<Dt_FillingOrder_Hty> BaseDal) : base(BaseDal)
{
}
- public IRepository<Dt_FillingOrderDetail> Repository => BaseDal;
+ public IRepository<Dt_FillingOrder_Hty> Repository => BaseDal;
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderService.cs"
index 781b9c4..8909331 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Dt_FillingOrderService.cs"
@@ -11,6 +11,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.LogHelper;
namespace WIDESEA_BasicService
{
@@ -23,7 +24,7 @@
public IRepository<Dt_FillingOrder> Repository => BaseDal;
- //娣诲姞缃愯璁㈠崟
+ //娣诲姞缃愯浜岀淮鐮�
public WebResponseContent InsertFilling(FillingOrder fillingOrder)
{
WebResponseContent content = new WebResponseContent();
@@ -50,6 +51,7 @@
Filling.Standby2 = fillingOrder.Standby2;
BaseDal.AddData(Filling);
+ LogLock.OutLogAOP("鎺ュ彛鏃ュ織", new string[] { "鎺ユ敹鏉＄爜鍊�:", fillingOrder.BarCode });
return content;
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Command/ConveyorLineCommand.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Command/ConveyorLineCommand.cs"
index 521f576..2c813f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Command/ConveyorLineCommand.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Command/ConveyorLineCommand.cs"
@@ -27,25 +27,25 @@
/// <summary>
/// 鐗╂枡缂栧彿1
/// </summary>
- [DataLength(18)]
+ [DataLength(50)]
public string R_NumberA { get; set; }
/// <summary>
/// 鐗╂枡缂栧彿2
/// </summary>
- [DataLength(18)]
+ [DataLength(50)]
public string R_NumberB { get; set; }
/// <summary>
/// 鐗╂枡缂栧彿3
/// </summary>
- [DataLength(18)]
+ [DataLength(50)]
public string R_NumberC { get; set; }
/// <summary>
/// 鐗╂枡缂栧彿4
/// </summary>
- [DataLength(18)]
+ [DataLength(50)]
public string R_NumberD { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/Commands.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/Commands.cs"
index 71e61cb..398a289 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/Commands.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/Commands.cs"
@@ -95,5 +95,19 @@
{
CommandData.R_PickD = R_PickD;
}
+ //杈撻�佺嚎
+ public int GETR_StatusD()
+ {
+ return CommandData.R_StatusD;
+ }
+ public int GETR_PickD()
+ {
+ return CommandData.R_PickD;
+ }
+ //鍫嗗灈鏈�
+ public int GETR_TaskStatus()
+ {
+ return CommandData.R_TaskStatus;
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs"
index 85698b5..90503dc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/ConveyorLineJob.cs"
@@ -12,6 +12,7 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_DTO.MES;
using WIDESEAWCS_DTO.Stock;
using WIDESEAWCS_ITaskInfoService;
@@ -55,6 +56,8 @@
public Task Execute(IJobExecutionContext context)
{
+ //鍫嗗灈鏈鸿澶囩姸鎬�
+ int sc = comm.GETR_TaskStatus();
//杩炴帴璁惧
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
if (flag && value != null)
@@ -62,29 +65,30 @@
OtherDevice device = (OtherDevice)value;
List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).Distinct().ToList();
List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode);
- //鍏蜂綋璁惧
- foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))
+ try
{
- i++;
- //璇诲彇淇″彿
- DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- //DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode ).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- if (deviceProRead != null)
+ //鍏蜂綋璁惧
+ foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))
{
- ConveyorLineCommand conveyorLineInfoRead = device.Communicator.ReadCustomer<ConveyorLineCommand>(deviceProRead.DeviceProAddress);
- //绌烘《鍏ュ簱浠诲姟
- if (item.StationName == "绌烘《鍏�")
+ i++;
+ //璇诲彇淇″彿
+ DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ //DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode ).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ if (deviceProRead != null)
{
- comm.R_StatusA((short)conveyorLineInfoRead.R_State);
- comm.R_PickA((short)conveyorLineInfoRead.R_Pick);
- if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
+ ConveyorLineCommand conveyorLineInfoRead = device.Communicator.ReadCustomer<ConveyorLineCommand>(deviceProRead.DeviceProAddress);
+ //绌烘《鍏ュ簱浠诲姟
+ if (item.StationName == "绌烘《鍏�")
{
- try
+ comm.R_StatusA((short)conveyorLineInfoRead.R_State);
+ comm.R_PickA((short)conveyorLineInfoRead.R_Pick);
+ if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
{
//鍒ゆ柇浠诲姟鏄惁閲嶅
Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.InEmpty);
if (task == null)
{
+ LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"绌烘《鍏ュ簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
//WMS鐢熸垚浠诲姟
string address = AppSettings.Get("WMSApiAddress");
if (!string.IsNullOrEmpty(address))
@@ -93,21 +97,13 @@
}
}
}
- catch (Exception ex)
- {
- //鍐欏叆鏃ュ織
- WriteInfo(device.DeviceCode, $"{ex.Message}");
- }
}
- }
- //婊℃《鍏ュ簱浠诲姟
- if (item.StationName == "婊℃《鍏�")
- {
- comm.R_StatusC((short)conveyorLineInfoRead.R_State);
- comm.R_PickC((short)conveyorLineInfoRead.R_Pick);
- if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
+ //婊℃《鍏ュ簱浠诲姟
+ if (item.StationName == "婊℃《鍏�")
{
- try
+ comm.R_StatusC((short)conveyorLineInfoRead.R_State);
+ comm.R_PickC((short)conveyorLineInfoRead.R_Pick);
+ if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
{
//娓呯┖鐗╂枡缂栧彿
if (k)
@@ -125,9 +121,10 @@
Stock.MaterialCode4 = conveyorLineInfoRead.R_NumberD;
//鍒ゆ柇浠诲姟鏄惁閲嶅
- Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.Infull);
+ Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.Infull || x.TaskType == (int)TaskTypeEnum.OutDirect);
if (task == null)
{
+ LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"婊℃《鍏ュ簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State + "//" + conveyorLineInfoRead.R_NumberA + "/" + conveyorLineInfoRead.R_NumberB + "/" + conveyorLineInfoRead.R_NumberC + "/" + conveyorLineInfoRead.R_NumberD}" });
Stock.location = item.location;
//WMS鐢熸垚浠诲姟
string address = AppSettings.Get("WMSApiAddress");
@@ -140,46 +137,40 @@
k = true;
//鍚慚ES鍙戦�佹姤宸ュ崟
- if (Stock.MaterialCode1 != null && !Stock.MaterialCode1.Equals(""))
- {
- MESReport(Stock.MaterialCode1);
- }
- if (Stock.MaterialCode2 != null && !Stock.MaterialCode2.Equals(""))
- {
- MESReport(Stock.MaterialCode2);
- }
- if (Stock.MaterialCode3 != null && !Stock.MaterialCode3.Equals(""))
- {
- MESReport(Stock.MaterialCode3);
- }
- if (Stock.MaterialCode4 != null && !Stock.MaterialCode4.Equals(""))
- {
- MESReport(Stock.MaterialCode4);
- }
+ //if (Stock.MaterialCode1 != null && !Stock.MaterialCode1.Equals(""))
+ //{
+ // MESReport(Stock.MaterialCode1);
+ //}
+ //if (Stock.MaterialCode2 != null && !Stock.MaterialCode2.Equals(""))
+ //{
+ // MESReport(Stock.MaterialCode2);
+ //}
+ //if (Stock.MaterialCode3 != null && !Stock.MaterialCode3.Equals(""))
+ //{
+ // MESReport(Stock.MaterialCode3);
+ //}
+ //if (Stock.MaterialCode4 != null && !Stock.MaterialCode4.Equals(""))
+ //{
+ // MESReport(Stock.MaterialCode4);
+ //}
}
}
}
- catch (Exception ex)
- {
- //鍐欏叆鏃ュ織
- WriteInfo(device.DeviceCode, $"{ex.Message}");
- }
}
- }
- //绌烘《鍑�
- if (item.StationName == "绌烘《鍑�")
- {
- comm.R_StatusB((short)conveyorLineInfoRead.R_State);
- comm.R_PickB((short)conveyorLineInfoRead.R_Pick);
- if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
+ //绌烘《鍑�
+ if (item.StationName == "绌烘《鍑�")
{
- try
+ comm.R_StatusB((short)conveyorLineInfoRead.R_State);
+ comm.R_PickB((short)conveyorLineInfoRead.R_Pick);
+ if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
{
+
//鍒ゆ柇浠诲姟鏄惁閲嶅
Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.OutEmpty);
if (task == null)
{
+ LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"绌烘《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
//WMS鐢熸垚浠诲姟
string address = AppSettings.Get("WMSApiAddress");
if (!string.IsNullOrEmpty(address))
@@ -187,85 +178,91 @@
HttpHelper.Post($"{address}/api/Task/addOutEmptyTask/?location={item.location}", "");
}
}
- }
- catch (Exception ex)
- {
- //鍐欏叆鏃ュ織
- WriteInfo(device.DeviceCode, $"{ex.Message}");
+
}
}
- }
- //婊℃《鍑�
- if (item.StationName == "婊℃《鍑�")
- {
- comm.R_StatusD((short)conveyorLineInfoRead.R_State);
- comm.R_PickD((short)conveyorLineInfoRead.R_Pick);
- //鍛婅瘔WMS鍙互鍑哄簱
- if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
+ //婊℃《鍑�
+ if (item.StationName == "婊℃《鍑�")
{
- if (m)
+ comm.R_StatusD((short)conveyorLineInfoRead.R_State);
+ comm.R_PickD((short)conveyorLineInfoRead.R_Pick);
+ //鍛婅瘔WMS鍙互鍑哄簱
+ if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
{
- //WMS鐢熸垚浠诲姟
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
+ if (m)
{
- HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=1", "");
+ //WMS鐢熸垚浠诲姟
+ string address = AppSettings.Get("WMSApiAddress");
+ if (!string.IsNullOrEmpty(address))
+ {
+ HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=1", "");
+ }
+ m = false;
+ n = true;
+ //鍐欏叆鏃ュ織
+ LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"婊℃《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
}
- m = false;
- n = true;
}
- }
- //鍛婅瘔WMS涓嶅彲浠ュ嚭搴�
- else
- {
- if (n)
+ //鍛婅瘔WMS涓嶅彲浠ュ嚭搴�
+ else
{
- //WMS鐢熸垚浠诲姟
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
+ if (n)
{
- HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=0", "");
+ //WMS鐢熸垚浠诲姟
+ string address = AppSettings.Get("WMSApiAddress");
+ if (!string.IsNullOrEmpty(address))
+ {
+ HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=0", "");
+ }
+ n = false;
+ m = true;
+ //鍐欏叆鏃ュ織
+ LogLock.OutLogAOP("杈撻�佺嚎浠诲姟鏃ュ織", new string[] { device.DeviceCode, $"{"婊℃《鍑哄簱浠诲姟鐢熸垚" + "鐢宠鍙�(鏀�)鏂欙細" + conveyorLineInfoRead.R_Pick + "璁惧鐘舵�侊細" + conveyorLineInfoRead.R_State}" });
}
- n = false;
- m = true;
}
}
}
}
+ i = 0;
}
- i = 0;
+ catch (Exception ex)
+ {
+ //鍐欏叆鏃ュ織
+ WriteInfo(device.DeviceCode, $"{ex.Message}");
+ }
}
return Task.CompletedTask;
}
//MES鎶ュ伐
- public void MESReport(string MaterialCode)
- {
- try
- {
- Reports reports = new Reports();
+ //public void MESReport(string MaterialCode)
+ //{
+ // try
+ // {
+ // Reports reports = new Reports();
- //鏌ヨ浜岀淮鐮�
- Dt_FillingOrder FillingOrder = _FillingOrderRepository.QueryFirst(x => x.BarCode == MaterialCode);
+ // //鏌ヨ浜岀淮鐮�
+ // Dt_FillingOrder FillingOrder = _FillingOrderRepository.QueryFirst(x => x.BarCode == MaterialCode);
- reports.report.Qty = FillingOrder.BarNum;
- reports.report.DispatchID = FillingOrder.WorkID + "";
- reports.barcodeSN[0].Barcode = FillingOrder.BarCode;
- reports.barcodeSN[0].BatchNum = int.Parse(FillingOrder.batchNum);
- reports.barcodeSN[0].Id = FillingOrder.BarCodeID;
- reports.barcodeSN[0].MaterialId = FillingOrder.ArticleNumID;
- reports.barcodeSN[0].Quantity = (int)FillingOrder.BarNum;
- reports.barcodeSN[0].DispatchId = FillingOrder.WorkID;
+ // reports.report.Qty = FillingOrder.BarNum;
+ // reports.report.DispatchID = FillingOrder.WorkID + "";
+ // reports.barcodeSN[0].Barcode = FillingOrder.BarCode;
+ // reports.barcodeSN[0].BatchNum = int.Parse(FillingOrder.batchNum);
+ // reports.barcodeSN[0].Id = FillingOrder.BarCodeID;
+ // reports.barcodeSN[0].MaterialId = FillingOrder.ArticleNumID;
+ // reports.barcodeSN[0].Quantity = (int)FillingOrder.BarNum;
+ // reports.barcodeSN[0].DispatchId = FillingOrder.WorkID;
- string mes = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(mes))
- {
- HttpHelper.Post($"{mes}/Task/SaveReportRaw/", reports.Serialize());
- }
- }
- catch (Exception ex) {
- WriteInfo( "MES鎶ュ伐閿欒", $"{ex.Message}");
- }
- }
+ // string mes = AppSettings.Get("MSE");
+ // if (!string.IsNullOrEmpty(mes))
+ // {
+ // HttpHelper.Post($"{mes}/Task/SaveReportRaw/", reports.Serialize());
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // WriteInfo("MES鎶ュ伐閿欒", $"{ex.Message}");
+ // }
+ //}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/FillingJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/FillingJob.cs"
index f948da2..334d3b1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/FillingJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/FillingJob.cs"
@@ -23,10 +23,12 @@
{
private readonly IRepository<Dt_FillingOrder> _FillingRepository;
+ private readonly IRepository<Dt_FillingOrder_Hty> _FillingHtyRepository;
- public FillingJob(IRepository<Dt_FillingOrder> FillingRepository)
+ public FillingJob(IRepository<Dt_FillingOrder> FillingRepository, IRepository<Dt_FillingOrder_Hty> fillingHtyRepository)
{
_FillingRepository = FillingRepository;
+ _FillingHtyRepository = fillingHtyRepository;
}
public Task Execute(IJobExecutionContext context)
@@ -80,9 +82,32 @@
device.SetValue(FillingDBName.W_QRcode15, StackerCommand.W_QRcode15);
device.SetValue(FillingDBName.W_Refresh, StackerCommand.W_Refresh);
- //淇敼浜岀淮鐮佷俊鎭姸鎬�
+ //鐢熸垚鍘嗗彶浜岀淮鐮佷俊鎭�
FillingOrder.BarStatus = (int)FillingStatusEnum.ExecuteCompleted;
- _FillingRepository.UpdateData(FillingOrder);
+
+ Dt_FillingOrder_Hty FillingOrderHty = new Dt_FillingOrder_Hty();
+ FillingOrderHty.ArticleNum = FillingOrder.ArticleNum;
+ FillingOrderHty.ArticleName = FillingOrder.ArticleName;
+ FillingOrderHty.Specification = FillingOrder.Specification;
+ FillingOrderHty.batchNum = FillingOrder.batchNum;
+ FillingOrderHty.BarCode = FillingOrder.BarCode;
+ FillingOrderHty.WorkOrder = FillingOrder.WorkOrder;
+ FillingOrderHty.BarNum = FillingOrder.BarNum;
+ FillingOrderHty.CreationTime = FillingOrder.CreationTime;
+ FillingOrderHty.WorkID = FillingOrder.WorkID;
+ FillingOrderHty.ProductType = FillingOrder.ProductType;
+ FillingOrderHty.BarStatus = FillingOrder.BarStatus;
+ FillingOrderHty.BarCodeID = FillingOrder.BarCodeID;
+ FillingOrderHty.ArticleNumID = FillingOrder.ArticleNumID;
+ FillingOrderHty.MaterialName = FillingOrder.MaterialName;
+ FillingOrderHty.WarehouseType = FillingOrder.WarehouseType;
+ FillingOrderHty.MaterialCode = FillingOrder.MaterialCode;
+ FillingOrderHty.Standby1 = FillingOrder.Standby1;
+ FillingOrderHty.Standby2 = FillingOrder.Standby2;
+
+
+ _FillingHtyRepository.AddData(FillingOrderHty);
+ _FillingRepository.DeleteData(FillingOrder);
string address = AppSettings.Get("WMSApiAddress");
if (!string.IsNullOrEmpty(address))
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs"
index 0a6f6d8..505838b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/StackerCraneJob.cs"
@@ -23,7 +23,7 @@
namespace WIDESEAWCS_Tasks
{
[DisallowConcurrentExecution]
- public class StackerCraneJob : JobBase, IJob
+ public class StackerCraneJob : JobBase, IJob
{
public static int R_HeartBeat = 0;
public static string InorOut = "In";
@@ -84,22 +84,19 @@
{
//鍙戦�佺墿鏂欑紪鍙�
CL.SetValue(ConveyorLineName.W_NumberAD, result.MaterialCode1);
- if (result.MaterialCode2 != null)
- CL.SetValue(ConveyorLineName.W_NumberBD, result.MaterialCode2);
- if (result.MaterialCode3 != null)
- CL.SetValue(ConveyorLineName.W_NumberCD, result.MaterialCode3);
- if (result.MaterialCode4 != null)
- CL.SetValue(ConveyorLineName.W_NumberDD, result.MaterialCode4);
+ CL.SetValue(ConveyorLineName.W_NumberBD, result.MaterialCode2);
+ CL.SetValue(ConveyorLineName.W_NumberCD, result.MaterialCode3);
+ CL.SetValue(ConveyorLineName.W_NumberDD, result.MaterialCode4);
}
//commonStackerCrane.SetValue(StackerCraneDBName.W_Accomplish, true);
}
}
}
//淇敼浠诲姟鐘舵��
- else if(R_TaskPhases == 1 || R_TaskPhases == 2 || R_TaskPhases == 4)
+ else if (R_TaskPhases == 1 || R_TaskPhases == 2 || R_TaskPhases == 4)
{
Dt_Task tasks = _TaskService.UpdateTaskStatus(R_OrderNo, R_TaskPhases);
- if (tasks!=null)
+ if (tasks != null)
{
//鍚屾WMS
string address = AppSettings.Get("WMSApiAddress");
@@ -115,19 +112,20 @@
}
//鍒ゆ柇鏄惁涓鸿嚜鍔ㄦā寮�
- if (R_ControlMode == 2 && R_TaskStatus == 2 && R_LoadStatus != 2)
+ if (R_ControlMode == 2 && R_TaskStatus == 2 && R_LoadStatus != 2 && (R_TaskPhases == 0 || R_TaskPhases == 5))
{
+ Thread.Sleep(3000);
//鍒ゆ柇鏄惁鏈夋墽琛屼腑鐨勪换鍔�
- Dt_Task tasking = _taskRepository.QueryFirst(x=> x.TaskState !=(int) TaskStatusEnum.InNew && x.TaskState != (int)TaskStatusEnum.OutNew && x.TaskState != (int)TaskStatusEnum.Task_Put && x.TaskState != (int)TaskStatusEnum.Task_fetch);
+ Dt_Task tasking = _taskRepository.QueryFirst(x => (x.TaskState == (int)TaskStatusEnum.InNew && x.TaskState == (int)TaskStatusEnum.OutNew) || x.TaskState == (int)TaskStatusEnum.Task_Put || x.TaskState == (int)TaskStatusEnum.Task_fetch);
if (tasking == null)
{
//鑾峰彇浠诲姟
Dt_Task? task = GetTask(InorOut);
- if(task != null)
+ if (task != null)
{
//浠诲姟瀹炰綋杞懡浠odel
StackerCraneCommand? StackerCommand = ConvertToStackerCommand(task);
- if(StackerCommand != null)
+ if (StackerCommand != null)
{
//鍙戦�佸懡浠�
commonStackerCrane.SetValue(StackerCraneDBName.W_SourceRow, StackerCommand.W_SourceRow);
@@ -141,6 +139,7 @@
commonStackerCrane.SetValue(StackerCraneDBName.W_DataCheckSum, StackerCommand.W_DataCheckSum);
commonStackerCrane.SetValue(StackerCraneDBName.W_OrderNo, StackerCommand.W_OrderNo);
commonStackerCrane.SetValue(StackerCraneDBName.W_Start, StackerCommand.W_Start);
+ WriteInfo("鍫嗗灈鏈烘墽琛屼换鍔★細", $"{StackerCommand.W_OrderNo}");
}
}
}
@@ -178,6 +177,22 @@
{
Dt_Task task;
task = _TaskService.TaskInorOut(InorOuts);
+ //婊℃《鍑哄簱
+ if (task != null)
+ {
+ if (task.TaskType == (int)TaskTypeEnum.Outfull)
+ {
+ int pick = comm.GETR_PickD();
+ int status = comm.GETR_StatusD();
+ if (pick != 1 || status != 1)
+ {
+ WriteInfo("鍫嗗灈鏈烘墽琛屾弧妗跺嚭搴撲换鍔★細", $"{"杈撻�佺嚎鍑哄簱淇″彿寮傚父" + pick + "//" + status}");
+ return null;
+ }
+ WriteInfo("鍫嗗灈鏈烘墽琛屾弧妗跺嚭搴撲换鍔★細", $"{"杈撻�佺嚎鍑哄簱淇″彿姝ｅ父" + pick + "//" + status}");
+ }
+ }
+
//涓�鍏ヤ竴鍑�
if (task != null && (task.TaskState == (int)TaskStatusEnum.InNew || task.TaskState == (int)TaskStatusEnum.OutNew))
{
@@ -205,7 +220,7 @@
}
//浠诲姟瀹炰綋杞懡浠odel
- public StackerCraneCommand? ConvertToStackerCommand(Dt_Task task)
+ public StackerCraneCommand? ConvertToStackerCommand(Dt_Task task)
{
StackerCraneCommand stackerCraneCommand = new StackerCraneCommand();
string[] TargetAddress = task.TargetAddress.Split('-');
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/UpstreamJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/UpstreamJob.cs"
index 2ef6682..66e0231 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/UpstreamJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Job/UpstreamJob.cs"
@@ -4,8 +4,15 @@
using System.Text;
using System.Threading.Tasks;
using Autofac.Core;
+using Newtonsoft.Json;
using Quartz;
+using WIDESEA_Common.FillingEnum;
+using WIDESEA_DTO.Basic;
+using WIDESEA_Model.Models.Basic;
+using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_Core.LogHelper;
+using WIDESEAWCS_DTO.MES;
using WIDESEAWCS_QuartzJob;
namespace WIDESEAWCS_Tasks
@@ -13,21 +20,88 @@
[DisallowConcurrentExecution]
public class UpstreamJob : JobBase, IJob
{
+
+ private readonly IRepository<Dt_FillingOrder_Hty> _FillingHtyRepository;
+
+ //mes鏍￠獙鐮�
+ private static string mesVerification = "";
+ //绉�
+ private static int shijian = 0;
+
+ public UpstreamJob(IRepository<Dt_FillingOrder_Hty> fillingHtyRepository)
+ {
+ _FillingHtyRepository = fillingHtyRepository;
+ }
+
public Task Execute(IJobExecutionContext context)
{
try
{
- //WMS鐢熸垚浠诲姟
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
+ //涓�澶╄幏鍙栦竴娆℃牎楠岀爜
+ Thread.Sleep(1000);
+ shijian = shijian -1;
+ string mes = AppSettings.Get("MSE");
+ if (!string.IsNullOrEmpty(mes))
{
- //string k = HttpHelper.Post($"{address}/api/Task/addInTask/?location={1}", "");
+ Reports reports = new Reports();
+ //鑾峰彇MES鏍￠獙鐮�
+ if (shijian <= 0)
+ {
+ User user = new User();
+ Return s = JsonConvert.DeserializeObject<Return>(HttpHelper.Post($"{mes}/Account/Check/", user.Serialize()));
+ if (s.code.Equals("200"))
+ {
+ mesVerification = s.message;
+ shijian = 86400;
+ LogLock.OutLogAOP("涓婃父绯荤粺鏃ュ織", new string[] { "涓婃父绯荤粺", $"{"鑾峰彇mes鏍￠獙鐮佹垚鍔�" + s.message}" });
+ }
+ else
+ {
+ LogLock.OutLogAOP("涓婃父绯荤粺鏃ュ織", new string[] { "涓婃父绯荤粺", $"{"鑾峰彇mes鏍￠獙鐮佸け璐�" + JsonConvert.SerializeObject(s)}" });
+ }
+ }
+
+ //鏌ヨ浜岀淮鐮�
+ Dt_FillingOrder_Hty FillingOrder = _FillingHtyRepository.QueryFirst(x => x.BarStatus == (int)FillingStatusEnum.ExecuteCompleted);
+ if (FillingOrder != null && !mesVerification.Equals(""))
+ {
+ reports.report.Qty = FillingOrder.BarNum;
+ reports.report.DispatchID = FillingOrder.WorkID + "";
+ reports.barcodeSN.Add(new barcodeSN());
+ reports.barcodeSN[0].Barcode = FillingOrder.BarCode;
+ reports.barcodeSN[0].BatchNum = int.Parse(FillingOrder.batchNum);
+ reports.barcodeSN[0].Id = FillingOrder.BarCodeID;
+ reports.barcodeSN[0].MaterialId = FillingOrder.ArticleNumID;
+ reports.barcodeSN[0].Quantity = (int)FillingOrder.BarNum;
+ reports.barcodeSN[0].DispatchId = FillingOrder.WorkID;
+ reports.barcodeSN[0].BarcodeType = 0;
+
+ var headers = new Dictionary<string, string>();
+ headers.Add("token", mesVerification);
+ Return k = JsonConvert.DeserializeObject<Return>(HttpHelper.Post($"{mes}/Task/SaveReportRaw/", reports.Serialize(), "application/json", headers));
+
+ string zhi = JsonConvert.SerializeObject(reports);
+ LogLock.OutLogAOP("涓婃父绯荤粺鏃ュ織", new string[] { "涓婃父绯荤粺", $"{"鍙戦�佷簩缁寸爜锛�" + zhi + "//"}" });
+
+ //淇敼鐘舵��
+ if (k.code.Equals("200"))
+ {
+ FillingOrder.BarStatus = (int)FillingStatusEnum.Send;
+ _FillingHtyRepository.UpdateData(FillingOrder);
+ LogLock.OutLogAOP("涓婃父绯荤粺鏃ュ織", new string[] { "涓婃父绯荤粺", $"{"淇敼浜岀淮鐮両D锛�" + FillingOrder.Id + "//"}" });
+ }
+ }
+ else
+ {
+ //LogLock.OutLogAOP("涓婃父绯荤粺鏃ュ織", new string[] { "涓婃父绯荤粺", $"{"娌℃湁鍙笂鎶ョ殑浜岀淮鐮佹垨鏃犳牎楠岀爜"}" });
+ }
}
+
}
catch (Exception ex)
{
//鍐欏叆鏃ュ織
- WriteInfo( "涓婃父绯荤粺", $"{ex.Message}");
+ LogLock.OutLogAOP("涓婃父绯荤粺鏃ュ織", new string[] { "涓婃父绯荤粺", $"{ex.Message}" });
}
return Task.CompletedTask;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/config/buttons.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/config/buttons.js"
index d8099df..dcb18ae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/config/buttons.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/config/buttons.js"
@@ -54,6 +54,16 @@
}
},
{
+ name: "鎵ц璁㈠崟",
+ icon: 'el-icon-boundOrder',
+ value: 'boundOrder',
+ class: '',
+ type: 'boundOrder',
+ onClick: function () {
+ this.boundOrder();
+ }
+},
+{
name: "瀹� 鏍�",
icon: 'el-icon-check',
class: '',
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js"
index ea3e848..0fd1708 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js"
@@ -916,6 +916,38 @@
this.$success("鎴愬姛");
})
},
+ async boundOrder(rows) {
+ this.boxOptions.title = '鎵ц璁㈠崟';
+ this.currentAction = this.const.EDIT;
+ if (rows) {
+ if (!(rows instanceof Array)) {
+ rows = [rows];
+ }
+ } else {
+ rows = this.$refs.table.getSelected();
+ }
+ if (rows.length == 0) {
+ return this.$error('璇烽�夋嫨瑕佺紪杈戠殑琛�!');
+ }
+ if (rows.length != 1) {
+ return this.$error('鍙兘閫夋嫨涓�琛屾暟鎹繘琛岀紪杈�!');
+ }
+ //璁板綍褰撳墠缂栬緫鐨勮
+ this.currentRow = rows[0];
+ let w = this.currentRow.id;
+ axios
+ .post("api/Task/ExecuteOrder/?k=" + w, {
+ rows: 100
+ })
+ .then(x => {
+ if(x==null||x==""){
+ this.$success("鎴愬姛");
+ }else{
+ this.$message(x.data);
+ console.log(x.data+"///");
+ }
+ });
+ },
async add() {
this.boxOptions.title = this.table.cnName + '(鏂板缓)';
//鏂板缓
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.js"
index 912ad0a..aa303be 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.js"
@@ -1,6 +1,6 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBody from './extend/stockInfoDetails.vue'
+import gridBody from './extend/stockInfoDetails.vue'//鐢变簬杩欎釜鏉ユ帶鍒舵煡鐪嬫槑缁嗘樉绀虹殑绫诲
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
@@ -16,24 +16,24 @@
buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 90,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
- );
- },
- click: (row) => {
- this.$refs.gridBody.open(row);
- }
- });
- },
+ // onInit() {
+ // //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
+ // this.columns.push({
+ // field: '鎿嶄綔',
+ // title: '鎿嶄綔',
+ // width: 90,
+ // fixed: 'right',
+ // align: 'center',
+ // formatter: (row) => {
+ // return (
+ // '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
+ // );
+ // },
+ // click: (row) => {
+ // this.$refs.gridBody.open(row);//鐐瑰嚮灞曠ず
+ // }
+ // });
+ // },
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index 8a02afb..4489cb1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -16,33 +16,33 @@
buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- // this.$Notice.success({ title: this.detailOptions.cnName + ',鏌ヨ缁撴灉', desc: '杩斿洖鐨勫璞★細' + JSON.stringify(data) });
+ // onInit() {
+ // // this.$Notice.success({ title: this.detailOptions.cnName + ',鏌ヨ缁撴灉', desc: '杩斿洖鐨勫璞★細' + JSON.stringify(data) });
- var previousButton = this.buttons.find((x) => x.value == "Previous");
- if (previousButton) previousButton.hidden = true;
- var nextButton = this.buttons.find((x) => x.value == "Next");
- if (nextButton) nextButton.hidden = true;
- var recoveryButton = this.buttons.find((x) => x.value == "TaskRecovery");
- if (recoveryButton) recoveryButton.hidden = true;
+ // var previousButton = this.buttons.find((x) => x.value == "Previous");
+ // if (previousButton) previousButton.hidden = true;
+ // var nextButton = this.buttons.find((x) => x.value == "Next");
+ // if (nextButton) nextButton.hidden = true;
+ // var recoveryButton = this.buttons.find((x) => x.value == "TaskRecovery");
+ // if (recoveryButton) recoveryButton.hidden = true;
- //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 70,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅</i>'
- );
- },
- click: (row) => {
- this.$refs.gridBody.open(row);
- }
- });
- },
+ // //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
+ // this.columns.push({
+ // field: '鎿嶄綔',
+ // title: '鎿嶄綔',
+ // width: 70,
+ // fixed: 'right',
+ // align: 'center',
+ // formatter: (row) => {
+ // return (
+ // '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅</i>'
+ // );
+ // },
+ // click: (row) => {
+ // this.$refs.gridBody.open(row);
+ // }
+ // });
+ // },
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
index 72ae7f5..a90c459 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
@@ -165,7 +165,7 @@
}
)
.then(x => {
- console.log(x);
+ console.log("浜哄伐寮哄埗婊℃《鍑哄簱"+x);
if (x.data.message != null) {
tiwz.innerHTML = x.data.message;
} else {
@@ -221,7 +221,7 @@
let xianA3 = document.getElementById("xianA3");
//鏄剧ず
- xianA1.innerHTML = x.data.bigOrLittle == 1 ? "浼樺厛鍑哄皯" : "鍑哄叏婊�";
+ xianA1.innerHTML = x.data.bigOrLittle == 0 ? "浼樺厛鍑哄皯" : "鍑哄叏婊�";
xianA3.innerHTML = x.data.outMode == 1 ? "姝ｅ父鍏ュ簱" : "鐩存帴鍑哄簱";
});
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
index ecfb5d0..6c47c91 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
@@ -31,7 +31,8 @@
});
const editFormOptions = ref([
[
- { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "select",dataKey: "locationStatusEnum",data: [],},
+ { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "select",dataKey: "LocationStatusEnum",data: [],},
+ { title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "EnableStatusEnum",data: [],},
],
]);
const searchFormFields = ref({
@@ -48,8 +49,8 @@
[
{ title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
{ title: "宸烽亾缂栧彿", field: "roadwayNo",type:"like" },
- { title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "enableStatusEnum",data: [],},
- { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
+ { title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "EnableStatusEnum",data: [],},
+ { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "LocationStatusEnum",data: [],},
],
[
{ title: "琛�", field: "row" ,type: "int"},
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/fillingOrde.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/fillingOrde.vue"
index 8ab2024..6d34099 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/fillingOrde.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/fillingOrde.vue"
@@ -129,7 +129,7 @@
},
{
field: "barStatus",
- title: "鐗╂枡绫诲瀷",
+ title: "浜岀淮鐮佺姸鎬�",
type: "int",
width: 90,
align: "left",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde.vue"
index ee00f12..4ef4a93 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde.vue"
@@ -58,13 +58,57 @@
align: "left"
},
{
- field: "OrderNo",
- title: "鍗曟嵁缂栧彿",
+ field: "num",
+ title: "鏁伴噺",
type: "string",
width: 90,
align: "left"
},
{
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 90,
+ align: "left"
+ },
+ {
+ field: "boundOrderCode",
+ title: "鍗曟嵁鍗曞彿",
+ type: "string",
+ width: 90,
+ align: "left"
+ },
+ {
+ field: "boundOrderType",
+ title: "鍗曟嵁绫诲瀷",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: {
+ key: "FillingStatusEnum",
+ data: [
+ { key: "1", value: "鍙戣揣鍑哄簱" },
+ { key: "2", value: "鍏朵粬鍑哄簱" },
+ { key: "3", value: "绉诲簱鍑哄簱" },
+ ]
+ }
+ },
+ {
+ field: "boundOrderStatue",
+ title: "鍗曟嵁鐘舵��",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: {
+ key: "FillingStatusEnum",
+ data: [
+ { key: "1", value: "鏂板缓鍗曟嵁" },
+ { key: "2", value: "鍗曟嵁鎵ц涓�" },
+ { key: "3", value: "鍗曟嵁宸插畬鎴�" },
+ ]
+ }
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde_hty.vue"
index 8e737e0..c7e2a75 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrde_hty.vue"
@@ -13,7 +13,7 @@
></view-grid>
</template>
<script>
-import extend from "@/extension/stock/stockInfo.js";
+import extend from "@/extension/taskinfo/task.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
setup() {
@@ -58,13 +58,50 @@
align: "left"
},
{
- field: "OrderNo",
- title: "鍗曟嵁缂栧彿",
+ field: "num",
+ title: "鏁伴噺",
type: "string",
width: 90,
align: "left"
},
{
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 90,
+ align: "left"
+ },
+ {
+ field: "boundOrderType",
+ title: "鍗曟嵁绫诲瀷",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: {
+ key: "FillingStatusEnum",
+ data: [
+ { key: "1", value: "鍙戣揣鍑哄簱" },
+ { key: "2", value: "鍏朵粬鍑哄簱" },
+ { key: "3", value: "绉诲簱鍑哄簱" },
+ ]
+ }
+ },
+ {
+ field: "boundOrderStatue",
+ title: "鍗曟嵁鐘舵��",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: {
+ key: "FillingStatusEnum",
+ data: [
+ { key: "1", value: "鏂板缓鍗曟嵁" },
+ { key: "2", value: "鍗曟嵁鎵ц涓�" },
+ { key: "3", value: "鍗曟嵁宸插畬鎴�" },
+ ]
+ }
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
index 439d46a..be777ac 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
@@ -7,36 +7,60 @@
"RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\basic\\outboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\basic\\outboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\basic\\fillingordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\basic\\fillingordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_ibasicservice\\ifillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|solutionrelative:widesea_ibasicservice\\ifillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
{
- "AbsoluteMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_dto\\basic\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|solutionrelative:widesea_dto\\basic\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\outboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\outboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_dto\\mes\\outbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|solutionrelative:widesea_dto\\mes\\outbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_ibasicservice\\ioutboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|solutionrelative:widesea_ibasicservice\\ioutboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\basic\\dt_fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basic\\dt_fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
+ "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\outbound\\dt_outboundorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\outbound\\dt_outboundorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|solutionrelative:widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_common\\outboundorder\\outboundorderenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\outboundorder\\outboundorderenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_common\\fillingenum\\fillingstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\fillingenum\\fillingstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\basic\\dt_fillingorder_hty.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basic\\dt_fillingorder_hty.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -46,7 +70,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 9,
"Children": [
{
"$type": "Bookmark",
@@ -58,41 +82,93 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 5,
+ "Title": "OutBound.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\MES\\OutBound.cs",
+ "RelativeDocumentMoniker": "WIDESEA_DTO\\MES\\OutBound.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\MES\\OutBound.cs",
+ "RelativeToolTip": "WIDESEA_DTO\\MES\\OutBound.cs",
+ "ViewState": "AgIAAAwAAAAAAAAAAAAAABUAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T03:50:41.149Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 8,
+ "Title": "Dt_OutboundOrder.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "RelativeToolTip": "WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "ViewState": "AgIAACMAAAAAAAAAAAAgwDIAAAAQAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T03:35:02.447Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "Title": "OutboundOrderEnum.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "RelativeToolTip": "WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwkAAAAhAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T02:48:24.656Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "FillingOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\FillingOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\FillingOrderService.cs",
+ "ViewState": "AgIAADQAAAAAAAAAAAASwFoAAAAqAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-02T08:57:43.168Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 14,
+ "Title": "Dt_FillingOrder_Hty.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "RelativeToolTip": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "ViewState": "AgIAAEUAAAAAAAAAAAAUwFwAAAATAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:32:05.058Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 13,
+ "Title": "LocationInfoService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\LocationInfoService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\LocationInfoService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\LocationInfoService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\LocationInfoService.cs",
+ "ViewState": "AgIAAFEAAAAAAAAAAAAIwG8AAAAMAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-30T01:03:26.787Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
"Title": "TaskController.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
"RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
- "ViewState": "AgIAADIAAAAAAAAAAAA9wFoAAAAoAAAAAAAAAA==",
+ "ViewState": "AgIAADUAAAAAAAAAAAAswCYAAAAiAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-19T01:42:10.491Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "appsettings.json",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2026-03-17T08:24:43.46Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "IFillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IFillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEA_IBasicService\\IFillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IFillingOrderService.cs",
- "RelativeToolTip": "WIDESEA_IBasicService\\IFillingOrderService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAA9AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T08:10:52.296Z",
"EditorCaption": ""
},
{
@@ -101,76 +177,102 @@
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs",
- "RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAAAoBAAAAAAAAAADgv8YAAAAVAAAAAAAAAA==",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs*",
+ "RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService.cs*",
+ "ViewState": "AgIAAPQCAAAAAAAAAADwvwIDAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T06:06:14.899Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 8,
- "Title": "FillingStatusEnum.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "RelativeDocumentMoniker": "WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "RelativeToolTip": "WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvxQAAAAZAAAAAAAAAA==",
+ "DocumentIndex": 4,
+ "Title": "OutboundOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\OutboundOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\OutboundOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\OutboundOrderService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\OutboundOrderService.cs",
+ "ViewState": "AgIAABYAAAAAAAAAAADwvyoAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T05:29:54.512Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "FillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEA_BasicService\\FillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
- "RelativeToolTip": "WIDESEA_BasicService\\FillingOrderService.cs",
- "ViewState": "AgIAAAYAAAAAAAAAAAAAABUAAAA+AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T05:06:30.37Z",
+ "WhenOpened": "2026-03-25T06:18:11.009Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 6,
+ "Title": "IOutboundOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "RelativeToolTip": "WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvw8AAAAqAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-25T06:18:15.631Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "OutboundOrderController.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABYAAAA8AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-25T06:13:37.372Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "StockService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\StockService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_StockService\\StockService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\StockService.cs",
+ "RelativeToolTip": "WIDESEA_StockService\\StockService.cs",
+ "ViewState": "AgIAACAAAAAAAAAAAAAIwD4AAAAMAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-24T03:13:40.921Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "appsettings.json",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
+ "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
+ "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
+ "ViewState": "AgIAAAYAAAAAAAAAAAAAAAwAAAAEAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2026-03-17T08:24:43.46Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
"Title": "Dt_FillingOrder.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
"RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
"RelativeToolTip": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
- "ViewState": "AgIAAF0AAAAAAAAAAAA4wG8AAAAjAAAAAAAAAA==",
+ "ViewState": "AgIAAAMAAAAAAAAAAAAAADMAAAAWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T05:04:40.448Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 2,
"Title": "FillingOrderController.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
"RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
- "ViewState": "AgIAAAMAAAAAAAAAAADwvxUAAAApAAAAAAAAAA==",
+ "ViewState": "AgIAAAoAAAAAAAAAAAAjwBkAAAAhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T05:04:11.09Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "FillingOrder.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "RelativeDocumentMoniker": "WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "RelativeToolTip": "WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAvAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-01-19T02:45:06.634Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
index fb97be1..f2538c2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
@@ -7,36 +7,60 @@
"RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\basic\\outboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\basic\\outboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\basic\\fillingordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\basic\\fillingordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_ibasicservice\\ifillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|solutionrelative:widesea_ibasicservice\\ifillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
{
- "AbsoluteMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_dto\\basic\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|solutionrelative:widesea_dto\\basic\\fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\outboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\outboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_dto\\mes\\outbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{929DF936-042C-4EEC-8722-A831FC2F0AEA}|WIDESEA_DTO\\WIDESEA_DTO.csproj|solutionrelative:widesea_dto\\mes\\outbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_ibasicservice\\ioutboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{5F260E03-095A-4870-8419-5B72CB62929E}|WIDESEA_IBasicService\\WIDESEA_IBasicService.csproj|solutionrelative:widesea_ibasicservice\\ioutboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\basic\\dt_fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basic\\dt_fillingorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
+ "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\outbound\\dt_outboundorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\outbound\\dt_outboundorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|solutionrelative:widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_common\\outboundorder\\outboundorderenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\outboundorder\\outboundorderenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_common\\fillingenum\\fillingstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}|WIDESEA_Common\\WIDESEA_Common.csproj|solutionrelative:widesea_common\\fillingenum\\fillingstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\taskinfo\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\basic\\dt_fillingorder_hty.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basic\\dt_fillingorder_hty.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -46,7 +70,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 9,
"Children": [
{
"$type": "Bookmark",
@@ -58,41 +82,93 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 5,
+ "Title": "OutBound.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\MES\\OutBound.cs",
+ "RelativeDocumentMoniker": "WIDESEA_DTO\\MES\\OutBound.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\MES\\OutBound.cs",
+ "RelativeToolTip": "WIDESEA_DTO\\MES\\OutBound.cs",
+ "ViewState": "AgIAAAwAAAAAAAAAAAAAABUAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T03:50:41.149Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 8,
+ "Title": "Dt_OutboundOrder.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "RelativeToolTip": "WIDESEA_Model\\Models\\Outbound\\Dt_OutboundOrder.cs",
+ "ViewState": "AgIAACMAAAAAAAAAAAAgwDIAAAAQAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T03:35:02.447Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "Title": "OutboundOrderEnum.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "RelativeToolTip": "WIDESEA_Common\\OutboundOrder\\OutboundOrderEnum.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwkAAAAhAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-03T02:48:24.656Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "FillingOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\FillingOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\FillingOrderService.cs",
+ "ViewState": "AgIAADQAAAAAAAAAAAASwFoAAAAqAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-02T08:57:43.168Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 14,
+ "Title": "Dt_FillingOrder_Hty.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "RelativeToolTip": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder_Hty.cs",
+ "ViewState": "AgIAAEUAAAAAAAAAAAAUwFwAAAATAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-01T04:32:05.058Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 13,
+ "Title": "LocationInfoService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\LocationInfoService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\LocationInfoService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\LocationInfoService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\LocationInfoService.cs",
+ "ViewState": "AgIAAFEAAAAAAAAAAAAIwG8AAAAMAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-30T01:03:26.787Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
"Title": "TaskController.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
"RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs",
- "ViewState": "AgIAADIAAAAAAAAAAAA9wFoAAAAoAAAAAAAAAA==",
+ "ViewState": "AgIAADUAAAAAAAAAAAAswCYAAAAiAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-19T01:42:10.491Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "appsettings.json",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2026-03-17T08:24:43.46Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "IFillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IFillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEA_IBasicService\\IFillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IFillingOrderService.cs",
- "RelativeToolTip": "WIDESEA_IBasicService\\IFillingOrderService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAA9AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T08:10:52.296Z",
"EditorCaption": ""
},
{
@@ -103,74 +179,100 @@
"RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAALwBAAAAAAAAAAASwNMBAAAMAAAAAAAAAA==",
+ "ViewState": "AgIAAPQCAAAAAAAAAADwvwADAAAMAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T06:06:14.899Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 8,
- "Title": "FillingStatusEnum.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "RelativeDocumentMoniker": "WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "RelativeToolTip": "WIDESEA_Common\\FillingEnum\\FillingStatusEnum.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvxQAAAAZAAAAAAAAAA==",
+ "DocumentIndex": 4,
+ "Title": "OutboundOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\OutboundOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\OutboundOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\OutboundOrderService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\OutboundOrderService.cs",
+ "ViewState": "AgIAABYAAAAAAAAAAADwvyoAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T05:29:54.512Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "FillingOrderService.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEA_BasicService\\FillingOrderService.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\FillingOrderService.cs",
- "RelativeToolTip": "WIDESEA_BasicService\\FillingOrderService.cs",
- "ViewState": "AgIAAAYAAAAAAAAAAAAAABUAAAA+AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-03-17T05:06:30.37Z",
+ "WhenOpened": "2026-03-25T06:18:11.009Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 6,
+ "Title": "IOutboundOrderService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "RelativeToolTip": "WIDESEA_IBasicService\\IOutboundOrderService.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvw8AAAAqAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-25T06:18:15.631Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "OutboundOrderController.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Basic\\OutboundOrderController.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABYAAAA8AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-25T06:13:37.372Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "StockService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\StockService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_StockService\\StockService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\StockService.cs",
+ "RelativeToolTip": "WIDESEA_StockService\\StockService.cs",
+ "ViewState": "AgIAACAAAAAAAAAAAAAIwD4AAAAMAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-03-24T03:13:40.921Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "appsettings.json",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
+ "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
+ "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
+ "ViewState": "AgIAAAYAAAAAAAAAAAAAAAwAAAAEAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2026-03-17T08:24:43.46Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
"Title": "Dt_FillingOrder.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
"RelativeDocumentMoniker": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
"RelativeToolTip": "WIDESEA_Model\\Models\\Basic\\Dt_FillingOrder.cs",
- "ViewState": "AgIAAF0AAAAAAAAAAAA4wG8AAAAjAAAAAAAAAA==",
+ "ViewState": "AgIAAAMAAAAAAAAAAAAAADMAAAAWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T05:04:40.448Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 2,
"Title": "FillingOrderController.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
"RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Basic\\FillingOrderController.cs",
- "ViewState": "AgIAAAMAAAAAAAAAAADwvxUAAAApAAAAAAAAAA==",
+ "ViewState": "AgIAAAoAAAAAAAAAAAAjwBkAAAAhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T05:04:11.09Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "FillingOrder.cs",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "RelativeDocumentMoniker": "WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "RelativeToolTip": "WIDESEA_DTO\\Basic\\FillingOrder.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAvAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2026-01-19T02:45:06.634Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderDetailService.cs"
index 19f89b8..eb1cb39 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderDetailService.cs"
@@ -10,12 +10,12 @@
namespace WIDESEA_BasicService
{
- public class FillingOrderDetailService : ServiceBase<Dt_FillingOrderDetail, IRepository<Dt_FillingOrderDetail>>, IFillingOrderDetailService
+ public class FillingOrderDetailService : ServiceBase<Dt_FillingOrder_Hty, IRepository<Dt_FillingOrder_Hty>>, IFillingOrderDetailService
{
- public FillingOrderDetailService(IRepository<Dt_FillingOrderDetail> BaseDal) : base(BaseDal)
+ public FillingOrderDetailService(IRepository<Dt_FillingOrder_Hty> BaseDal) : base(BaseDal)
{
}
- public IRepository<Dt_FillingOrderDetail> Repository => BaseDal;
+ public IRepository<Dt_FillingOrder_Hty> Repository => BaseDal;
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs"
index 7cd033f..2bfa380 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs"
@@ -10,6 +10,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.MES;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models.Basic;
using WIDESEAWCS_Model.Models.TaskInfo;
@@ -36,39 +37,60 @@
}
//娣诲姞浜岀淮鐮佷俊鎭�
- public WebResponseContent InsertFilling(FillingOrder fillingOrder)
+ public Messages InsertFilling(FillingOrder fillingOrder)
{
- WebResponseContent content = new WebResponseContent();
- Dt_FillingOrder Filling = new Dt_FillingOrder();
-
- //鍒涘缓浜岀淮鐮佷俊鎭�
- Filling.ArticleNum = fillingOrder.ArticleNum;
- Filling.ArticleName = fillingOrder.ArticleName;
- Filling.Specification = fillingOrder.Specification;
- Filling.batchNum = fillingOrder.batchNum;
- Filling.BarCode = fillingOrder.BarCode;
- Filling.WorkOrder = fillingOrder.WorkOrder;
- Filling.BarNum = (decimal)fillingOrder.BarNum;
- Filling.CreationTime = fillingOrder.CreationTime;
- Filling.WorkID = fillingOrder.WorkID;
- Filling.ProductType = fillingOrder.ProductType;
- Filling.BarStatus = (int)FillingStatusEnum.Queue;
- Filling.BarCodeID = fillingOrder.BarCodeID;
- Filling.ArticleNumID = fillingOrder.ArticleNumID;
- Filling.MaterialName = fillingOrder.MaterialName;
- Filling.WarehouseType = fillingOrder.WarehouseType;
- Filling.MaterialCode = fillingOrder.MaterialCode;
- Filling.Standby1 = fillingOrder.Standby1;
- Filling.Standby2 = fillingOrder.Standby2;
-
- BaseDal.AddData(Filling);
- //鍙戦�佺粰WCS
- string address = AppSettings.Get("WCS");
- if (!string.IsNullOrEmpty(address))
+ Messages Message = new Messages();
+ if (fillingOrder != null)
{
- HttpHelper.Post($"{address}/api/FillingOrder/InsertFilling/", fillingOrder.Serialize());
+ //鏌ヨ鏉＄爜鍊奸槻姝㈤噸澶�
+ Dt_FillingOrder Fillings = BaseDal.QueryFirst(x=>x.BarCode == fillingOrder.BarCode);
+ if(Fillings != null)
+ {
+ Message.Status = false;
+ Message.Code = 500;
+ Message.Message = "鍙戦�佺殑鏉＄爜鍊奸噸澶�";
+ return Message;
+ }
+ Dt_FillingOrder Filling = new Dt_FillingOrder();
+
+ //鍒涘缓浜岀淮鐮佷俊鎭�
+ Filling.ArticleNum = fillingOrder.ArticleNum;
+ Filling.ArticleName = fillingOrder.ArticleName;
+ Filling.Specification = fillingOrder.Specification;
+ Filling.batchNum = fillingOrder.batchNum;
+ Filling.BarCode = fillingOrder.BarCode;
+ Filling.WorkOrder = fillingOrder.WorkOrder;
+ Filling.BarNum = (decimal)fillingOrder.BarNum;
+ Filling.CreationTime = fillingOrder.CreationTime;
+ Filling.WorkID = fillingOrder.WorkID;
+ Filling.ProductType = fillingOrder.ProductType;
+ Filling.BarStatus = (int)FillingStatusEnum.Queue;
+ Filling.BarCodeID = fillingOrder.BarCodeID;
+ Filling.ArticleNumID = fillingOrder.ArticleNumID;
+ Filling.MaterialName = fillingOrder.MaterialName;
+ Filling.WarehouseType = fillingOrder.WarehouseType;
+ Filling.MaterialCode = fillingOrder.MaterialCode;
+ Filling.Standby1 = fillingOrder.Standby1;
+ Filling.Standby2 = fillingOrder.Standby2;
+
+ BaseDal.AddData(Filling);
+ //鍙戦�佺粰WCS
+ string address = AppSettings.Get("WCS");
+ if (!string.IsNullOrEmpty(address))
+ {
+ HttpHelper.Post($"{address}/api/FillingOrder/InsertFilling/", fillingOrder.Serialize());
+ }
+
+ Message.Status = true;
+ Message.Code = 200;
}
- return content;
+ else
+ {
+ Message.Status = false;
+ Message.Code = 500;
+ Message.Message = "鍙戦�佺殑鏁版嵁涓虹┖";
+ }
+ return Message;
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index 1dac80b..3d6600f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -98,16 +98,16 @@
//绌烘《鍒嗛厤
if (k == 1)
{
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free).OrderBy(x => x.Layer).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free).OrderBy(x => x.Column).OrderBy(x => x.Layer).First();
}
//椋熷搧鍖哄垎閰�
else if(k == 2)
{
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Food).OrderByDescending(x=>x.Column).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Food).OrderBy(x=>x.Column).OrderBy(x => x.Layer).First();
}
//宸ヤ笟鍖哄垎閰�
else if(k == 3){
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Industry).OrderBy(x=>x.Column).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Industry).OrderBy(x=>x.Column).OrderBy(x => x.Layer).First();
}
return locationInfo;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/OutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/OutboundOrderService.cs"
index a5f1a90..4029d00 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/OutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/OutboundOrderService.cs"
@@ -3,8 +3,10 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OutboundOrder;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.MES;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models.Outbound;
using WIDESEAWCS_Model.Models.TaskInfo;
@@ -16,5 +18,39 @@
public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal) : base(BaseDal)
{
}
+
+ public IRepository<Dt_OutboundOrder> Repository => BaseDal;
+
+ //鐢熸垚鍑哄簱璁㈠崟
+ public Messages addOutboundOrder(OutBound OutBound)
+ {
+ Messages Message = new Messages();
+ int k = OutBound.Bound.Count;
+ if (OutBound != null && k > 0)
+ {
+ List<Dt_OutboundOrder> OutboundOrder = new List<Dt_OutboundOrder>();
+ foreach(var item in OutBound.Bound)
+ {
+ var newOrder = new Dt_OutboundOrder();
+ newOrder.num = item.num;
+ newOrder.MaterielName = item.MaterielName;
+ newOrder.BoundOrderType = OutBound.BoundOrderType;
+ newOrder.BoundOrderStatue = (int)OutboundOrderEnum.NewBound;
+ newOrder.BoundOrderCode = OutBound.BoundOrderCode;
+ OutboundOrder.Add(newOrder);
+ }
+ BaseDal.AddData(OutboundOrder);
+
+ Message.Status = true;
+ Message.Code = 200;
+ }
+ else
+ {
+ Message.Status = false;
+ Message.Code = 500;
+ Message.Message = "鍙戦�佺殑鏁版嵁涓虹┖";
+ }
+ return Message;
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/FillingEnum/FillingStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/FillingEnum/FillingStatusEnum.cs"
index 5087b66..7e65cb0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/FillingEnum/FillingStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/FillingEnum/FillingStatusEnum.cs"
@@ -20,5 +20,11 @@
/// </summary>
[Description("宸蹭娇鐢�")]
ExecuteCompleted = 10,
+
+ /// <summary>
+ /// 宸插彂閫�
+ /// </summary>
+ [Description("宸插彂閫�")]
+ Send = 20,
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutboundOrder/OutboundOrderEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutboundOrder/OutboundOrderEnum.cs"
new file mode 100644
index 0000000..0658bc0
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutboundOrder/OutboundOrderEnum.cs"
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OutboundOrder
+{
+ public enum OutboundOrderEnum
+ {
+ /// <summary>
+ /// 鏂板缓璁㈠崟
+ /// </summary>
+ [Description("鏂板缓璁㈠崟")]
+ NewBound = 1,
+
+ /// <summary>
+ /// 璁㈠崟鎵ц涓�
+ /// </summary>
+ [Description("璁㈠崟鎵ц涓�")]
+ Execute = 2,
+
+ /// <summary>
+ /// 璁㈠崟浠ュ畬鎴�
+ /// </summary>
+ [Description("璁㈠崟浠ュ畬鎴�")]
+ Accomplish = 3,
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/FillingOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/FillingOrder.cs"
index c9dffe9..b5741ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/FillingOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/FillingOrder.cs"
@@ -51,7 +51,7 @@
/// <summary>
/// 娲惧伐ID
/// </summary>
- public int WorkID { get; set; }
+ public long WorkID { get; set; }
/// <summary>
/// 浜у搧鍖呰妗剁被鍨�
@@ -61,12 +61,12 @@
/// <summary>
/// 鏉＄爜鍊糹d
/// </summary>
- public int BarCodeID { get; set; }
+ public long BarCodeID { get; set; }
/// <summary>
/// 鍝佸彿id
/// </summary>
- public int ArticleNumID { get; set; }
+ public long ArticleNumID { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/Messages.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/Messages.cs"
new file mode 100644
index 0000000..d80a640
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/Messages.cs"
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+
+namespace WIDESEA_DTO.MES
+{
+ public class Messages
+ {
+
+ public bool Status { get; set; }
+ public int Code { get; set; }
+
+ public string Message { get; set; }
+
+ public string Data { get; set; }
+
+ public string DevMessage { get; set; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/OutBound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/OutBound.cs"
new file mode 100644
index 0000000..ab12b34
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/OutBound.cs"
@@ -0,0 +1,37 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+
+namespace WIDESEA_DTO.MES
+{
+ public class OutBound
+ {
+
+ /// <summary>
+ /// 鍗曟嵁鍗曞彿
+ /// </summary>
+ public string BoundOrderCode { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ public int BoundOrderType { get; set; }
+
+ public List<Bound> Bound { get; set; } = new List<Bound>();
+ }
+
+ public class Bound
+ {
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string MaterielName { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int num { get; set; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderDetailService.cs"
index 0170c70..3ba7efd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderDetailService.cs"
@@ -8,7 +8,7 @@
namespace WIDESEA_IBasicService
{
- public interface IFillingOrderDetailService : IService<Dt_FillingOrderDetail>
+ public interface IFillingOrderDetailService : IService<Dt_FillingOrder_Hty>
{
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderService.cs"
index 5e1be9e..6bece7f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IFillingOrderService.cs"
@@ -7,6 +7,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.MES;
using WIDESEA_Model.Models.Basic;
using WIDESEAWCS_Model.Models.TaskInfo;
@@ -16,7 +17,7 @@
{
//娣诲姞浜岀淮鐮佷俊鎭�
- WebResponseContent InsertFilling(FillingOrder fillingOrder);
+ Messages InsertFilling(FillingOrder fillingOrder);
//鏍规嵁鍗曞彿淇敼浜岀淮鐮佷俊鎭姸鎬�
WebResponseContent UpdateFilling(string FillingNumber);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IOutboundOrderService.cs"
index baa0277..3073882 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IOutboundOrderService.cs"
@@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.MES;
using WIDESEA_Model.Models.Outbound;
using WIDESEAWCS_Model.Models.TaskInfo;
@@ -11,5 +12,7 @@
{
public interface IOutboundOrderService : IService<Dt_OutboundOrder>
{
+ //MES涓嬪彂鍑哄簱璁㈠崟
+ Messages addOutboundOrder(OutBound OutBound);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockService.cs"
index 907a7f2..83dd9a3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockService.cs"
@@ -13,10 +13,10 @@
public interface IStockService : IService<Dt_StockInfo>
{
//浼樺厛鍑烘弧
- List<Dt_StockInfo> PriorityBig(int Num, int Type);
+ List<Dt_StockInfo> PriorityBig(int Num, string Type);
//浼樺厛鍑烘畫
- List<Dt_StockInfo> PriorityLittle(int Num, int Type);
+ List<Dt_StockInfo> PriorityLittle(int Num, string Type);
//鏌ヨ鐗╂枡鏁伴噺
int MaterielNum(string MaterielName);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index fc3328a..5d8a308 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -14,7 +14,7 @@
public interface ITaskService : IService<Dt_Task>
{
//娴嬭瘯
- WebResponseContent ceshi();
+ string ceshi();
//澶у睆鐢佃鏌ヨ浠诲姟
List<Dt_Task> selectTask();
@@ -41,7 +41,7 @@
string SelectStationManger(string StationName);
//鏍规嵁鏁伴噺鍜岀绫讳笅鍙戞弧妗跺嚭搴撲换鍔�
- WebResponseContent ArtificialTask(int Num, int Type);
+ WebResponseContent ArtificialTask(int Num, string Types);
//鎵嬪姩绔嬪嵆瀹屾垚浠诲姟
WebResponseContent Complete(int taskid);
@@ -49,5 +49,7 @@
//WCS婊℃《鍑哄簱淇″彿
WebResponseContent WCSSignal(int k);
+ //鎵ц璁㈠崟
+ string ExecuteOrder(int k);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder.cs"
index c277e21..89c993c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder.cs"
@@ -73,7 +73,7 @@
/// 娲惧伐ID
/// </summary>
[SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "娲惧伐ID")]
- public int WorkID { get; set; }
+ public long WorkID { get; set; }
/// <summary>
/// 浜у搧鍖呰妗剁被鍨�
@@ -91,13 +91,13 @@
/// 鏉＄爜鍊糹d
/// </summary>
[SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鍊糹d")]
- public int BarCodeID { get; set; }
+ public long BarCodeID { get; set; }
/// <summary>
/// 鍝佸彿id
/// </summary>
[SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸彿id")]
- public int ArticleNumID { get; set; }
+ public long ArticleNumID { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrderDetail.cs"
deleted file mode 100644
index efcf8d7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrderDetail.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models.Basic
-{
- [SugarTable(nameof(Dt_FillingOrderDetail), "浜岀淮鐮�")]
- public class Dt_FillingOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [ImporterHeader(Name = "涓婚敭")]
- [ExporterHeader(DisplayName = "涓婚敭")]
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder_Hty.cs"
new file mode 100644
index 0000000..5216775
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_FillingOrder_Hty.cs"
@@ -0,0 +1,131 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models.Basic
+{
+ [SugarTable(nameof(Dt_FillingOrder_Hty), "浜岀淮鐮�")]
+ public class Dt_FillingOrder_Hty : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 鍝佸彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸彿")]
+ public string ArticleNum { get; set; }
+
+ /// <summary>
+ /// 鍝佸悕
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸悕")]
+ public string ArticleName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "瑙勬牸")]
+ public string Specification { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鎵瑰彿")]
+ public string batchNum { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍊�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鍊�")]
+ public string BarCode { get; set; }
+
+ /// <summary>
+ /// 娲惧伐鍗曞彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "娲惧伐鍗曞彿")]
+ public string WorkOrder { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鏁伴噺
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鏁伴噺")]
+ public decimal BarNum { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍒涘缓鏃堕棿")]
+ public string CreationTime { get; set; }
+
+ /// <summary>
+ /// 娲惧伐ID
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "娲惧伐ID")]
+ public long WorkID { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍖呰妗剁被鍨�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "浜у搧鍖呰妗剁被鍨�")]
+ public string ProductType { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鐘舵��
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鐘舵��")]
+ public int BarStatus { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍊糹d
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鏉＄爜鍊糹d")]
+ public long BarCodeID { get; set; }
+
+ /// <summary>
+ /// 鍝佸彿id
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍝佸彿id")]
+ public long ArticleNumID { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 璐у尯
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "璐у尯")]
+ public string WarehouseType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鐗╂枡缂栫爜")]
+ public string MaterialCode { get; set; }
+
+ /// <summary>
+ /// 澶囩敤1
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "澶囩敤1")]
+ public string Standby1 { get; set; }
+
+ /// <summary>
+ /// 澶囩敤2
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "澶囩敤2")]
+ public string Standby2 { get; set; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
index 998f295..5136cc4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
@@ -20,11 +20,39 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
/// <summary>
- /// 鍗曟嵁缂栧彿
+ /// 鐗╂枡鍚嶇О
/// </summary>
- [ImporterHeader(Name = "鍗曟嵁缂栧彿")]
- [ExporterHeader(DisplayName = "鍗曟嵁缂栧彿")]
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNo { get; set; }
+ [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
+ [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [ImporterHeader(Name = "鏁伴噺")]
+ [ExporterHeader(DisplayName = "鏁伴噺")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏁伴噺")]
+ public int num { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [ImporterHeader(Name = "鍗曟嵁绫诲瀷")]
+ [ExporterHeader(DisplayName = "鍗曟嵁绫诲瀷")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁绫诲瀷")]
+ public int BoundOrderType { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [ImporterHeader(Name = "鍗曟嵁鐘舵��")]
+ [ExporterHeader(DisplayName = "鍗曟嵁鐘舵��")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁鐘舵��")]
+ public int BoundOrderStatue { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鍗曞彿
+ /// </summary>
+ [ImporterHeader(Name = "鍗曟嵁鍗曞彿")]
+ [ExporterHeader(DisplayName = "鍗曟嵁鍗曞彿")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁鍗曞彿")]
+ public string BoundOrderCode { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs"
index ecce029..3dc62d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs"
@@ -21,11 +21,32 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
/// <summary>
- /// 鍗曟嵁缂栧彿
+ /// 鐗╂枡鍚嶇О
/// </summary>
- [ImporterHeader(Name = "鍗曟嵁缂栧彿")]
- [ExporterHeader(DisplayName = "鍗曟嵁缂栧彿")]
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNo { get; set; }
+ [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
+ [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [ImporterHeader(Name = "鏁伴噺")]
+ [ExporterHeader(DisplayName = "鏁伴噺")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏁伴噺")]
+ public int num { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [ImporterHeader(Name = "鍗曟嵁绫诲瀷")]
+ [ExporterHeader(DisplayName = "鍗曟嵁绫诲瀷")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁绫诲瀷")]
+ public int BoundOrderType { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [ImporterHeader(Name = "鍗曟嵁鐘舵��")]
+ [ExporterHeader(DisplayName = "鍗曟嵁鐘舵��")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁鐘舵��")]
+ public int BoundOrderStatue { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs"
index 6c7f776..02dfe1e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs"
@@ -37,19 +37,15 @@
}
//浼樺厛鍑烘弧
- public List<Dt_StockInfo> PriorityBig(int Num, int Type)
+ public List<Dt_StockInfo> PriorityBig(int Num, string Type)
{
List<Dt_StockInfo> stockInfo = new List<Dt_StockInfo>();
- List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => x.StockType == Type && !x.MaterielCode1.Equals("") && !x.MaterielCode2.Equals("") && !x.MaterielCode3.Equals("") && !x.MaterielCode4.Equals("")).ToList();
+ List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => x.MaterielName == Type && x.StockStatus == (int)StockStatusEmun.绌洪棽 && !x.MaterielCode1.Equals("") && !x.MaterielCode2.Equals("") && !x.MaterielCode3.Equals("") && !x.MaterielCode4.Equals("")).ToList();
//鍒嗛厤鏁伴噺
int k = stockInfos.Count();
if (k >= Num)
{
stockInfo.AddRange(stockInfos.Take(Num));
- }
- else
- {
- throw new Exception(string.Format("搴撳瓨鏁伴噺涓嶈冻"));
}
//閿佸畾搴撳瓨
int s = stockInfo.Count() - 1;
@@ -62,9 +58,9 @@
}
//浼樺厛鍑烘畫
- public List<Dt_StockInfo> PriorityLittle(int Num, int Type)
+ public List<Dt_StockInfo> PriorityLittle(int Num, string Type)
{
- List<Dt_StockInfo> stockInfo = BaseDal.QueryData(x => x.StockType == Type && x.MaterielCode4.Equals("")).ToList();
+ List<Dt_StockInfo> stockInfo = BaseDal.QueryData(x => x.MaterielName == Type && (x.MaterielCode4.Equals("") || x.MaterielCode4 == null) && x.StockStatus == (int)StockStatusEmun.绌洪棽).ToList();
int k = stockInfo.Count();
//鍒嗛厤鏁伴噺
@@ -75,10 +71,6 @@
{
stockInfo[i].StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
}
- }
- else
- {
- throw new Exception(string.Format("搴撳瓨鏁伴噺涓嶈冻"));
}
return stockInfo;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index 815db7a..f8d85a7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -284,6 +284,54 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
+ case "LocationStatusEnum":
+ {
+ List<object> data = new List<object>();
+ Type type = typeof(LocationStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(LocationStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(LocationStatusEnum).GetField(((LocationStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
+ case "EnableStatusEnum":
+ {
+ List<object> data = new List<object>();
+ Type type = typeof(EnableStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(EnableStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(EnableStatusEnum).GetField(((EnableStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
}
return result;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 0814e29..fca3355 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -8,6 +8,7 @@
using System.Threading.Tasks;
using Newtonsoft.Json;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OutboundOrder;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.Warehouse;
@@ -22,6 +23,7 @@
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
+using WIDESEA_Model.Models.Outbound;
using WIDESEA_Model.Models.Stock;
using WIDESEA_Model.View;
using WIDESEAWCS_DTO.Stock;
@@ -47,10 +49,11 @@
private readonly IRepository<Dt_StockInfoDetail_Hty> _IStockInfoDetailHtyRepository;
private readonly IRepository<Dt_StockInfos> _IStockInfosRepository;
private readonly IRepository<Dt_FillingOrder> _FillingOrderRepository;
+ private readonly IRepository<Dt_OutboundOrder> _OutboundOrderRepository;
//WCS婊℃《鍑哄簱淇″彿
private static bool kk = false;
- public TaskService(IRepository<Dt_Task> BaseDal, IRepository<Dt_FillingOrder> FillingOrderRepository, IRepository<Dt_StockInfos> IStockInfosRepository, ILocationInfoService ILocationInfoService, IRepository<Dt_StockInfoDetail> IStockInfoDetailRepository, IRepository<Dt_StockInfo_hty> IStockInfohtyRepository, IRepository<Dt_StockInfoDetail_Hty> IStockInfoDetailHtyRepository, IRepository<Dt_Outstockinfo> IOutstockinfoService, IStockService IStockService, IRepository<Dt_Warehouse> WarehouseService, IRepository<Dt_Outstockinfo> OutstockinfoRepository, ILocationInfoService LocationInfoService, IRepository<Dt_StockInfo> StockInfoRepository, IRepository<Dt_LocationInfo> LocationInfoRepository, IRepository<Dt_Task_Hty> Task_HtyRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRepository<Dt_OutboundOrder> OutboundOrderRepository, IRepository<Dt_FillingOrder> FillingOrderRepository, IRepository<Dt_StockInfos> IStockInfosRepository, ILocationInfoService ILocationInfoService, IRepository<Dt_StockInfoDetail> IStockInfoDetailRepository, IRepository<Dt_StockInfo_hty> IStockInfohtyRepository, IRepository<Dt_StockInfoDetail_Hty> IStockInfoDetailHtyRepository, IRepository<Dt_Outstockinfo> IOutstockinfoService, IStockService IStockService, IRepository<Dt_Warehouse> WarehouseService, IRepository<Dt_Outstockinfo> OutstockinfoRepository, ILocationInfoService LocationInfoService, IRepository<Dt_StockInfo> StockInfoRepository, IRepository<Dt_LocationInfo> LocationInfoRepository, IRepository<Dt_Task_Hty> Task_HtyRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_LocationInfoService = LocationInfoService;
_unitOfWorkManage = unitOfWorkManage;
@@ -67,17 +70,18 @@
_IStockInfoDetailHtyRepository = IStockInfoDetailHtyRepository;
_IStockInfosRepository = IStockInfosRepository;
_FillingOrderRepository = FillingOrderRepository;
+ _OutboundOrderRepository = OutboundOrderRepository;
}
public IRepository<Dt_Task> Repository => BaseDal;
//娴嬭瘯
- public WebResponseContent ceshi()
+ public string ceshi()
{
WebResponseContent content = new WebResponseContent();
- Dt_StockInfos StockInfoss = _IStockInfosRepository.QueryFirst(x => x.Id == 7);
- return content;
+ Dt_LocationInfo locations = _LocationInfoService.AllotLocationInfo(2);
+ return "123";
}
@@ -122,20 +126,25 @@
//List<MESSockInfo> MESSocks = new List<MESSockInfo>();
string materielDetailedid = stock.MaterialCode1 + DateTime.Now.ToString("mmss").ObjToInt();
-
+ string kk = stock.MaterialCode1.Replace("X", "");
//鍖哄垎璐у尯
int k = 1;
- //Dt_Warehouse warehouse = _WarehouseRepository.QueryFirst(x => x.MaterialName == "");
- ////鏌ヨ鐗╂枡浜岀淮缂栫爜
- //Dt_FillingOrder FillingOrder = _FillingOrderRepository.QueryFirst(x=>x.BarCode == stock.MaterialCode1);
- //if (warehouse.MaterialType == (int)WarehouseTypeEnum.Food)
- //{
- // k = 2;
- //}
- //else if (warehouse.MaterialType == (int)WarehouseTypeEnum.Industry)
- //{
- // k = 3;
- //}
+ //鏌ヨ鐗╂枡浜岀淮缂栫爜
+ Dt_FillingOrder FillingOrder = _FillingOrderRepository.QueryFirst(x => x.BarCode == kk);
+ if (FillingOrder == null)
+ {
+ LogLock.OutLogAOP("鎺ュ彛鏃ュ織", new string[] { "婊℃《鍏ュ簱浠诲姟鐢熸垚", $"{"浜岀淮鐮佹煡璇㈠紓甯�"}" });
+ content.Message = "浜岀淮鐮佹煡璇㈠紓甯�";
+ return content;
+ }
+ if (FillingOrder.WarehouseType.Equals("椋熷搧鍖�"))
+ {
+ k = 2;
+ }
+ else if (FillingOrder.WarehouseType.Equals("宸ヤ笟鍖�"))
+ {
+ k = 3;
+ }
//鍏ュ簱鍒嗛厤璐т綅
Dt_LocationInfo locations = _LocationInfoService.AllotLocationInfo(k);
@@ -150,7 +159,7 @@
stockInfo.MaterielCode3 = stock.MaterialCode3;
stockInfo.MaterielCode4 = stock.MaterialCode4;
stockInfo.MaterielDetailedid = materielDetailedid;
- stockInfo.StockType = (int)StockTypeEmun.姘�;
+ stockInfo.MaterielName = FillingOrder.MaterialName;
//鍒涘缓鐗╂枡璇︾粏淇℃伅
//鍒ゅ畾鍏ュ簱妯″紡
@@ -264,7 +273,7 @@
taskhty.Grade = task.Grade;
taskhty.Remark = task.Remark;
taskhty.TaskType = task.TaskType;
- taskhty.TaskState = task.TaskState;
+ taskhty.TaskState = (int)TaskStatusEnum.Task_Finish;
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
@@ -330,7 +339,7 @@
stockInfo_Hty.MaterielDetailedid = stockInfo.MaterielDetailedid;
List<Dt_StockInfoDetail_Hty> stockInfoDetail_Hty = new List<Dt_StockInfoDetail_Hty>();
int k = stockInfoDetail.Count() - 1;
- for(int i = 0; i <= k; i++)
+ for (int i = 0; i <= k; i++)
{
stockInfoDetail_Hty[i].MaterielCode = stockInfoDetail[i].MaterielCode;
stockInfoDetail_Hty[i].MaterielDetailedid = stockInfoDetail[i].MaterielDetailedid;
@@ -375,7 +384,7 @@
_unitOfWorkManage.CommitTran();
}
//鐩存帴鍑哄簱
- else if(task.TaskType == (int)TaskTypeEnum.OutDirect)
+ else if (task.TaskType == (int)TaskTypeEnum.OutDirect)
{
//鍒犻櫎搴撳瓨淇℃伅
Dt_StockInfo stockInfo = _StockInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
@@ -489,7 +498,7 @@
Dt_Task task = new Dt_Task();
//鍑哄簱鍒嗛厤鐗╂枡
Dt_LocationInfo locations = _LocationInfoService.AllotStock(1);
- if (locations ==null)
+ if (locations == null)
{
return content;
}
@@ -519,31 +528,39 @@
}
//鏍规嵁鏁伴噺鍜岀绫讳笅鍙戞弧妗跺嚭搴撲换鍔�
- public WebResponseContent ArtificialTask(int Num, int Type)
+ public WebResponseContent ArtificialTask(int Num, string Types)
{
WebResponseContent content = new WebResponseContent();
List<Dt_Task> tasks = new List<Dt_Task>();
List<Dt_LocationInfo> LocationInfo = new List<Dt_LocationInfo>();
List<Dt_StockInfo> StockInfo = new List<Dt_StockInfo>();
- if (Num > 0 && Type > 0 && kk == true)
+ if (Num > 0 && !Types.Equals("") && Types != null && kk == true)
{
Dt_Outstockinfo outstockinfo = _OutstockinfoRepository.QueryFirst(x => x.Id == 1);
//婊�
if (outstockinfo.BigOrLittle == 1)
{
//鑾峰彇骞堕攣瀹氱墿鏂�
- StockInfo = _IStockService.PriorityBig(Num, Type);
+ StockInfo = _IStockService.PriorityBig(Num, Types);
+ if (StockInfo == null || StockInfo.Count <= 0)
+ {
+ StockInfo = _IStockService.PriorityLittle(Num, Types);
+ }
}
//娈�
else
{
//鑾峰彇骞堕攣瀹氱墿鏂�
- StockInfo = _IStockService.PriorityLittle(Num, Type);
+ StockInfo = _IStockService.PriorityLittle(Num, Types);
+ if (StockInfo == null || StockInfo.Count <= 0)
+ {
+ StockInfo = _IStockService.PriorityBig(Num, Types);
+ }
}
//鍒涘缓浠诲姟
- if (StockInfo != null)
+ if (StockInfo != null && StockInfo.Count > 0)
{
//鑾峰彇骞堕攣瀹氳揣浣�
LocationInfo = _ILocationInfoService.StockLockLocation(StockInfo);
@@ -552,7 +569,7 @@
}
else
{
- return WebResponseContent.Instance.Error($"鐗╂枡涓嶈冻");
+ return content.Error("鐗╂枡涓嶈冻");
}
//寮�濮嬫暟鎹簱浜嬪姟
@@ -571,7 +588,8 @@
}
else
{
- LogLock.OutLogAOP("鎺ュ彛鏃ュ織", new string[] { "涓嬪彂鏁伴噺銆佺绫绘垨淇″彿寮傚父"});
+ LogLock.OutLogAOP("鎺ュ彛鏃ュ織", new string[] { "涓嬪彂鏁伴噺銆佺绫绘垨淇″彿寮傚父" });
+ return content.Error("涓嬪彂鏁伴噺銆佺绫绘垨淇″彿寮傚父");
}
return content;
}
@@ -729,9 +747,10 @@
//WCS婊℃《鍑哄簱淇″彿
public WebResponseContent WCSSignal(int k)
{
- WebResponseContent content=new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
//鍙互鍑�
- if (k == 1) {
+ if (k == 1)
+ {
kk = true;
}
//涓嶅彲浠ュ嚭
@@ -742,5 +761,20 @@
return content;
}
+
+ //鎵ц璁㈠崟
+ public string ExecuteOrder(int k)
+ {
+ WebResponseContent content = new WebResponseContent();
+ Dt_OutboundOrder OutboundOrder = _OutboundOrderRepository.QueryFirst(x => x.Id == k);
+ //涓嬪彂浠诲姟
+ content = ArtificialTask(OutboundOrder.num, OutboundOrder.MaterielName);
+ if (content.Message == null || content.Message.Equals(""))
+ {
+ OutboundOrder.BoundOrderStatue = (int)OutboundOrderEnum.Execute;
+ _OutboundOrderRepository.UpdateData(OutboundOrder);
+ }
+ return content.Message;
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/FillingOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/FillingOrderController.cs"
index 20d6691..295a807 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/FillingOrderController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/FillingOrderController.cs"
@@ -3,6 +3,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.MES;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models.Basic;
using WIDESEAWCS_ITaskInfoService;
@@ -20,7 +21,7 @@
//娣诲姞浜岀淮鐮佷俊鎭�
[HttpPost, HttpGet, Route("InsertFilling"), AllowAnonymous]
- public WebResponseContent InsertFilling([FromBody] FillingOrder fillingOrder)
+ public Messages InsertFilling([FromBody] FillingOrder fillingOrder)
{
return Service.InsertFilling(fillingOrder);
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/OutboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/OutboundOrderController.cs"
index f05207c..d3d0d28 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/OutboundOrderController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/OutboundOrderController.cs"
@@ -1,5 +1,8 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_DTO.MES;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models.Outbound;
using WIDESEAWCS_ITaskInfoService;
@@ -14,5 +17,12 @@
public OutboundOrderController(IOutboundOrderService service) : base(service)
{
}
+
+ //MES涓嬪彂鍑哄簱璁㈠崟
+ [HttpPost, HttpGet, Route("addOutboundOrder"), AllowAnonymous]
+ public Messages addOutboundOrder([FromBody] OutBound OutBound)
+ {
+ return Service.addOutboundOrder(OutBound);
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 80a7f5c..3f2d058 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -57,20 +57,7 @@
[HttpPost, HttpGet, Route("ArtificialTask"), AllowAnonymous]
public WebResponseContent ArtificialTask(int Num , string Types)
{
- int Type = 0;
- //杞崲
- if (Types.Equals("姘�"))
- {
- Type = (int)StockTypeEmun.姘�;
- }else if (Types.Equals("娌�"))
- {
- Type = (int)StockTypeEmun.娌�;
- }
- else
- {
- return WebResponseContent.Instance.Error($"鐗╂枡绉嶇被杈撳叆閿欒");
- }
- return Service.ArtificialTask(Num, Type);
+ return Service.ArtificialTask(Num, Types);
}
//鎵嬪姩绔嬪嵆瀹屾垚浠诲姟
@@ -89,7 +76,7 @@
//娴嬭瘯鎺ュ彛
[HttpPost, HttpGet, Route("ceshi"), AllowAnonymous]
- public WebResponseContent ceshi()
+ public string ceshi()
{
return Service.ceshi();
}
@@ -100,5 +87,12 @@
{
return Service.WCSSignal(k);
}
+
+ //鎵ц璁㈠崟
+ [HttpPost, HttpGet, Route("ExecuteOrder"), AllowAnonymous]
+ public string ExecuteOrder(int k)
+ {
+ return Service.ExecuteOrder(k);
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 820519f..cdd6c7e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -6,11 +6,13 @@
"Microsoft.AspNetCore": "Warning"
}
},
- "dics": "enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskTypeEnum,taskStatusEnum,WarehouseTypeEnum,StockInfoDetailStatusEmun,StockInfoDetailTypeEmun",
+ "dics": "enableEnum,EnableStatusEnum,LocationStatusEnum,locationTypeEnum,taskTypeEnum,taskStatusEnum,WarehouseTypeEnum,StockInfoDetailStatusEmun,StockInfoDetailTypeEmun",
"AllowedHosts": "*",
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_EXAM;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=192.168.10.203;Initial Catalog=WIDESEAWMS_EXAM;User ID=sa;Password=Ab123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_EXAM;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
--
Gitblit v1.9.3