From b879053cc8414be35ea60e4c1667039053e3f6e5 Mon Sep 17 00:00:00 2001 From: duyongjia <adu_555@163.com> Date: 星期五, 27 十二月 2024 20:51:26 +0800 Subject: [PATCH] 增加余料回库功能 --- 项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 186 +++++---- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 2 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 3 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API请求/2024-12-27/入库任务下发241227.txt | 45 ++ 项目资料/其他文档/接收余料退回信息.txt | 42 ++ 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs | 10 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/WIDESEA_InboundService.csproj | 1 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 1 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_MainReturnInventory.cs | 148 +++++++ 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 125 +++-- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 6 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReturnInventoryDetail.cs | 83 ++++ 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IMainReturnInventoryRepository.cs | 15 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReturnInventoryDetailRepository.cs | 22 + 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 27 + 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 3 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReturnInventoryDetailRepository.cs | 15 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 1 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 25 项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 378 +++++++++++++----- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs | 6 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/MainReturnInventoryRepository.cs | 22 + 22 files changed, 894 insertions(+), 272 deletions(-) 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 fc46e15..e8d98da 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,20 +3,28 @@ "WorkspaceRootPath": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\project\\nanningbyd\\\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:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\project\\nanningbyd\\\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:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|D:\\project\\NanNingBYD\\\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:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\taskenumhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\taskenumhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_tasks\\conveyorlinejob\\wmsapiinvoke.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -33,10 +41,6 @@ { "AbsoluteMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|solutionrelative:wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|D:\\project\\NanNingBYD\\\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:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_taskinfoservice\\taskexecutedetailservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -101,7 +105,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 3, + "SelectedChildIndex": 7, "Children": [ { "$type": "Bookmark", @@ -114,79 +118,45 @@ { "$type": "Document", "DocumentIndex": 1, - "Title": "CommonStackerCraneJob.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", - "ViewState": "AQIAADcAAAAAAAAAAADgv20AAAAYAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-25T02:17:42.698Z" - }, - { - "$type": "Document", - "DocumentIndex": 0, "Title": "TaskService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs", "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs", - "ViewState": "AQIAAPoBAAAAAAAAAAAUwA4CAAATAAAA", + "ViewState": "AQIAAGkAAAAAAAAAAAArwHYAAAAZAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-22T12:51:10.644Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 5, "Title": "CommonConveyorLineJob.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs", - "ViewState": "AQIAAG0AAAAAAAAAAADgv4IAAAAkAAAA", + "ViewState": "AQIAAHYAAAAAAAAAAAAAAIIAAAAkAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-22T12:53:19.096Z" + "WhenOpened": "2024-12-22T12:53:19.096Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, - "Title": "BYDJob.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\BYDJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\BYDJob.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\BYDJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\BYDJob.cs", - "ViewState": "AQIAABQAAAAAAAAAAAAAAB0AAAAlAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-13T08:21:28.448Z" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "WMSApiInvoke.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", - "ViewState": "AQIAAB0AAAAAAAAAAAAkwCoAAABJAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-16T14:04:37.795Z" - }, - { - "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 2, "Title": "TaskController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", - "ViewState": "AQIAACAAAAAAAAAAAAAowAAAAAAAAAAA", + "ViewState": "AQIAAA4AAAAAAAAAAAAswBgAAAAMAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-23T06:58:45.612Z" + "WhenOpened": "2024-12-23T06:58:45.612Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "ITaskService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs", @@ -198,7 +168,71 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 3, + "Title": "TaskTypeEnum.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", + "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", + "ViewState": "AQIAAAsAAAAAAAAAAAAIwBoAAAAXAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-21T03:14:08.483Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "CommonStackerCraneJob.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs", + "ViewState": "AQIAAFgAAAAAAAAAAAAnwGYAAAAQAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-25T02:17:42.698Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "TaskEnumHelper.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskEnumHelper.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskEnumHelper.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskEnumHelper.cs", + "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskEnumHelper.cs", + "ViewState": "AQIAACMAAAAAAAAAAAAmwCUAAAAKAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T12:26:14.261Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "WMSApiInvoke.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\WMSApiInvoke.cs", + "ViewState": "AQIAAB0AAAAAAAAAAAAkwCoAAABJAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-16T14:04:37.795Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "BYDJob.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\BYDJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\BYDJob.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\BYDJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\BYDJob.cs", + "ViewState": "AQIAABQAAAAAAAAAAAAAAB0AAAAlAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-13T08:21:28.448Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, "Title": "appsettings.json", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", @@ -210,7 +244,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 11, "Title": "StackerCraneDBName.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\StackerCraneDBName.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\StackerCraneDBName.cs", @@ -222,19 +256,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, - "Title": "TaskTypeEnum.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", - "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskTypeEnum.cs", - "ViewState": "AQIAAAkAAAAAAAAAAIA8wBQAAAATAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-21T03:14:08.483Z" - }, - { - "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 10, "Title": "TaskExecuteDetailService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskExecuteDetailService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskExecuteDetailService.cs", @@ -246,7 +268,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 12, "Title": "TaskStatusGroup.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusGroup.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusGroup.cs", @@ -258,7 +280,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 14, "Title": "HttpManager.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\HttpManager.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\HttpManager.cs", @@ -270,7 +292,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 13, "Title": "Dt_OutboundOrderDetailBYD.cs", "DocumentMoniker": "C:\\models\\Dt_OutboundOrderDetailBYD.cs", "ToolTip": "C:\\models\\Dt_OutboundOrderDetailBYD.cs", @@ -280,7 +302,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 17, "Title": "StackerCarneTaskDTO.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\StackerCarneTaskDTO.cs", "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\StackerCarneTaskDTO.cs", @@ -292,7 +314,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "LocationGroupDTO.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_DTO\\LocationGroupDTO.cs", "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\LocationGroupDTO.cs", @@ -304,7 +326,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 15, "Title": "Program.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Program.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", @@ -316,7 +338,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "ITaskExecuteDetailService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskExecuteDetailService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskExecuteDetailService.cs", @@ -328,7 +350,7 @@ }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 19, "Title": "CustomProfile.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Filter\\CustomProfile.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Filter\\CustomProfile.cs", @@ -340,7 +362,7 @@ }, { "$type": "Document", - "DocumentIndex": 21, + "DocumentIndex": 22, "Title": "Sys_LogService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Sys_LogService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_LogService.cs", @@ -352,7 +374,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 20, "Title": "StackerCraneTaskCommand.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\StackerCraneTaskCommand.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\StackerCraneTaskCommand.cs", @@ -364,7 +386,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "Sys_LogController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\System\\Sys_LogController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\System\\Sys_LogController.cs", @@ -376,7 +398,7 @@ }, { "$type": "Document", - "DocumentIndex": 22, + "DocumentIndex": 23, "Title": "Sys_Role.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs", diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" index ee27386..948c160 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" @@ -14,12 +14,22 @@ /// </summary> [Description("鍏ュ簱")] Inbound = 200, + /// <summary> /// 绌鸿溅鍏ュ簱 /// </summary> [Description("绌烘墭鍏ュ簱")] InInventory = 204, + /// <summary> + /// 鍥炲簱 + /// </summary> + [Description("鍥炲簱")] + InPick = 205, + + + + } public enum TaskOutboundTypeEnum diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" index 86786fe..8134981 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" @@ -95,28 +95,31 @@ } Dt_Task task = _mapper.Map<Dt_Task>(item); task.Creater = "WMS"; - //绌鸿溅鍏ュ簱 - if (item.TaskType == (int)TaskInboundTypeEnum.InInventory) - { - task.TaskType= (int)TaskInboundTypeEnum.InInventory; - task.TaskState= (int)TaskInStatusEnum.InNew; - - } - else if(item.TaskType==(int)TaskOutboundTypeEnum.OutInventory) + if(item.TaskType==(int)TaskOutboundTypeEnum.OutInventory) { task.TaskType=(int)TaskOutboundTypeEnum.OutInventory; task.TaskState=(int)TaskOutStatusEnum.OutNew; + } + else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound) + { + task.TaskType = (int)TaskOutboundTypeEnum.Outbound; + task.TaskState = (int)TaskOutStatusEnum.OutNew; } else if (item.TaskType == (int)TaskInboundTypeEnum.Inbound) { task.TaskType = (int)TaskInboundTypeEnum.Inbound; task.TaskState = (int)TaskInStatusEnum.InNew; } - else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound) + else if (item.TaskType == (int)TaskInboundTypeEnum.InInventory) { - task.TaskType = (int)TaskOutboundTypeEnum.Outbound; - task.TaskState = (int)TaskOutStatusEnum.OutNew; + task.TaskType = (int)TaskInboundTypeEnum.InInventory; + task.TaskState = (int)TaskInStatusEnum.InNew; + } + else if (item.TaskType == (int)TaskInboundTypeEnum.InPick) + { + task.TaskType = (int)TaskInboundTypeEnum.InPick; + task.TaskState = (int)TaskInStatusEnum.InNew; } tasks.Add(task); } diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" index 031608c..224c882 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" @@ -64,7 +64,7 @@ { StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task); int isIn = commonStackerCrane.Communicator.Read<byte>("DB106.12.0"); - if(task.TaskType == (int)TaskOutboundTypeEnum.Outbound&&isIn==1)//濡傛灉鍦ㄥ叆搴撲腑锛屼笉鍏佽涓嬪彂鍑哄簱浠诲姟 + if((task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) &&isIn==1)//濡傛灉鍦ㄥ叆搴撲腑锛屼笉鍏佽涓嬪彂鍑哄簱浠诲姟 { return Task.CompletedTask; } 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 25e5e8a..030d5ee 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" @@ -3,16 +3,40 @@ "WorkspaceRootPath": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_basicservice\\service\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\service\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_taskinfoservice\\partialtaskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\partialtaskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\pdacontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\pdacontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}|WIDESEA_InboundService\\WIDESEA_InboundService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_inboundservice\\service\\inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}|WIDESEA_InboundService\\WIDESEA_InboundService.csproj|solutionrelative:widesea_inboundservice\\service\\inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{CE0DB91F-5A68-448E-A419-4C26B5039F51}|WIDESEA_ITaskInfoService\\WIDESEA_ITaskInfoService.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{CE0DB91F-5A68-448E-A419-4C26B5039F51}|WIDESEA_ITaskInfoService\\WIDESEA_ITaskInfoService.csproj|solutionrelative:widesea_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_core\\enums\\stockenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\enums\\stockenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|D:\\project\\NanNingBYD\\\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:{D8C9593B-B31C-4650-8F44-962E9096A0CF}|WIDESEA_SystemService\\WIDESEA_SystemService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_systemservice\\sys_jobservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D8C9593B-B31C-4650-8F44-962E9096A0CF}|WIDESEA_SystemService\\WIDESEA_SystemService.csproj|solutionrelative:widesea_systemservice\\sys_jobservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\inbound\\inboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\inbound\\inboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}|WIDESEA_InboundService\\WIDESEA_InboundService.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_inboundservice\\service\\inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}|WIDESEA_InboundService\\WIDESEA_InboundService.csproj|solutionrelative:widesea_inboundservice\\service\\inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}|WIDESEA_IInboundService\\WIDESEA_IInboundService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_iinboundservice\\iinboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -23,8 +47,36 @@ "RelativeMoniker": "D:0:0:{9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}|WIDESEA_InboundService\\WIDESEA_InboundService.csproj|solutionrelative:widesea_inboundservice\\base\\inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{D8C9593B-B31C-4650-8F44-962E9096A0CF}|WIDESEA_SystemService\\WIDESEA_SystemService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_systemservice\\sys_jobservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{D8C9593B-B31C-4650-8F44-962E9096A0CF}|WIDESEA_SystemService\\WIDESEA_SystemService.csproj|solutionrelative:widesea_systemservice\\sys_jobservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}|WIDESEA_IInboundService\\WIDESEA_IInboundService.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_iinboundservice\\iinboundservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}|WIDESEA_IInboundService\\WIDESEA_IInboundService.csproj|solutionrelative:widesea_iinboundservice\\iinboundservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_inboundrepository\\returninventorydetailrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|solutionrelative:widesea_inboundrepository\\returninventorydetailrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}|WIDESEA_IInboundRepository\\WIDESEA_IInboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_iinboundrepository\\ireturninventorydetailrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}|WIDESEA_IInboundRepository\\WIDESEA_IInboundRepository.csproj|solutionrelative:widesea_iinboundrepository\\ireturninventorydetailrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}|WIDESEA_IInboundRepository\\WIDESEA_IInboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_iinboundrepository\\imainreturninventoryrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}|WIDESEA_IInboundRepository\\WIDESEA_IInboundRepository.csproj|solutionrelative:widesea_iinboundrepository\\imainreturninventoryrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}|WIDESEA_IInboundRepository\\WIDESEA_IInboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_iinboundrepository\\iinboundorderrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}|WIDESEA_IInboundRepository\\WIDESEA_IInboundRepository.csproj|solutionrelative:widesea_iinboundrepository\\iinboundorderrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_inboundrepository\\inboundorderrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|solutionrelative:widesea_inboundrepository\\inboundorderrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_inboundrepository\\inboundorder_htyrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|solutionrelative:widesea_inboundrepository\\inboundorder_htyrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|d:\\project\\nanningbyd\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_inboundrepository\\inboundrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}|WIDESEA_InboundRepository\\WIDESEA_InboundRepository.csproj|solutionrelative:widesea_inboundrepository\\inboundrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_wmsserver\\controllers\\system\\sys_jobcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -33,18 +85,6 @@ { "AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_taskinfoservice\\partialtaskservice_outbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\partialtaskservice_outbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|D:\\project\\NanNingBYD\\\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:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_core\\enums\\stockenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\enums\\stockenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_taskinfoservice\\partialtaskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\partialtaskservice_inbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{992DA9CB-143C-426B-B27D-E4DA3B863A99}|LogLibrary\\LogLibrary.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\loglibrary\\log\\log.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -71,10 +111,6 @@ "RelativeMoniker": "D:0:0:{9144117D-3D55-4250-9CF5-C6A8D8A07062}|WIDESEA_BasicRepository\\WIDESEA_BasicRepository.csproj|solutionrelative:widesea_basicrepository\\locationinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_basicservice\\service\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\service\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\widesea_wmsserver\\controllers\\outbound\\outboundorderdetailcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\outbound\\outboundorderdetailcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -94,7 +130,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 6, + "SelectedChildIndex": 7, "Children": [ { "$type": "Bookmark", @@ -106,85 +142,254 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 7, "Title": "InboundOrderController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Inbound\\InboundOrderController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Inbound\\InboundOrderController.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Inbound\\InboundOrderController.cs", "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Inbound\\InboundOrderController.cs", - "ViewState": "AQIAACAAAAAAAAAAAAAowCcAAAAUAAAA", + "ViewState": "AQIAACAAAAAAAAAAAADgvy4AAAAbAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-27T05:31:09.976Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "Sys_JobService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_SystemService\\Sys_JobService.cs", "RelativeDocumentMoniker": "WIDESEA_SystemService\\Sys_JobService.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_SystemService\\Sys_JobService.cs", "RelativeToolTip": "WIDESEA_SystemService\\Sys_JobService.cs", - "ViewState": "AQIAANEAAAAAAAAAAAAYwAICAAAIAAAA", + "ViewState": "AQIAAFgAAAAAAAAAAAAAANwBAABRAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-25T02:07:37.985Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "InboundOrderService.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Base\\InboundOrderService.cs", - "RelativeDocumentMoniker": "WIDESEA_InboundService\\Base\\InboundOrderService.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Base\\InboundOrderService.cs", - "RelativeToolTip": "WIDESEA_InboundService\\Base\\InboundOrderService.cs", - "ViewState": "AQIAAFsAAAAAAAAAAAAewE8AAAAxAAAA", + "DocumentIndex": 5, + "Title": "TaskController.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", + "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", + "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", + "ViewState": "AQIAACEAAAAAAAAAAAAgwC4AAAARAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-27T05:15:51.127Z", + "WhenOpened": "2024-12-25T02:15:33.346Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "InboundOrderService.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Service\\InboundOrderService.cs", - "RelativeDocumentMoniker": "WIDESEA_InboundService\\Service\\InboundOrderService.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Service\\InboundOrderService.cs", - "RelativeToolTip": "WIDESEA_InboundService\\Service\\InboundOrderService.cs", - "ViewState": "AQIAAN0AAAAAAAAAAAAqwPUAAAAwAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-25T06:15:04.235Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "Title": "PDAController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\PDAController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\PDAController.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\PDAController.cs", "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\PDAController.cs", - "ViewState": "AQIAAHkAAAAAAAAAAAAowIIAAAAJAAAA", + "ViewState": "AQIAAMUAAAAAAAAAAAAMwM4AAAAtAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-27T05:33:45.286Z", + "WhenOpened": "2024-12-27T08:02:48.408Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "PartialTaskService_Inbound.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", + "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", + "RelativeToolTip": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", + "ViewState": "AQIAAHgAAAAAAAAAAAAMwIQAAABaAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-25T02:07:38.085Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "LocationInfoService.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\LocationInfoService.cs", + "RelativeDocumentMoniker": "WIDESEA_BasicService\\Service\\LocationInfoService.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\LocationInfoService.cs*", + "RelativeToolTip": "WIDESEA_BasicService\\Service\\LocationInfoService.cs*", + "ViewState": "AQIAAE0AAAAAAAAAAAAqwGAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-25T02:07:38.07Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "Title": "ITaskService.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_ITaskInfoService\\ITaskService.cs", + "RelativeDocumentMoniker": "WIDESEA_ITaskInfoService\\ITaskService.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_ITaskInfoService\\ITaskService.cs", + "RelativeToolTip": "WIDESEA_ITaskInfoService\\ITaskService.cs", + "ViewState": "AQIAAB0AAAAAAAAAAAAawCgAAAAIAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T11:46:12.058Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "StockEnum.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\StockEnum.cs", + "RelativeDocumentMoniker": "WIDESEA_Core\\Enums\\StockEnum.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\StockEnum.cs", + "RelativeToolTip": "WIDESEA_Core\\Enums\\StockEnum.cs", + "ViewState": "AQIAAD8AAAAAAAAAAAAuwD0AAAAMAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-25T07:20:16.67Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "InboundOrderService.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Service\\InboundOrderService.cs", + "RelativeDocumentMoniker": "WIDESEA_InboundService\\Service\\InboundOrderService.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Service\\InboundOrderService.cs", + "RelativeToolTip": "WIDESEA_InboundService\\Service\\InboundOrderService.cs", + "ViewState": "AQIAAMAAAAAAAAAAAAAMwMMAAAAJAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T08:15:19.913Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 12, + "Title": "ReturnInventoryDetailRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\ReturnInventoryDetailRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_InboundRepository\\ReturnInventoryDetailRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\ReturnInventoryDetailRepository.cs", + "RelativeToolTip": "WIDESEA_InboundRepository\\ReturnInventoryDetailRepository.cs", + "ViewState": "AQIAAAYAAAAAAAAAAAAAABAAAAAkAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T08:01:37.737Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, "Title": "IInboundOrderService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundService\\IInboundOrderService.cs", "RelativeDocumentMoniker": "WIDESEA_IInboundService\\IInboundOrderService.cs", "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundService\\IInboundOrderService.cs", "RelativeToolTip": "WIDESEA_IInboundService\\IInboundOrderService.cs", - "ViewState": "AQIAABIAAAAAAAAAAAD4vyAAAAAFAAAA", + "ViewState": "AQIAABcAAAAAAAAAAIA8wCAAAAAvAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-27T05:21:15.365Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 10, + "Title": "InboundOrderService.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Base\\InboundOrderService.cs", + "RelativeDocumentMoniker": "WIDESEA_InboundService\\Base\\InboundOrderService.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundService\\Base\\InboundOrderService.cs", + "RelativeToolTip": "WIDESEA_InboundService\\Base\\InboundOrderService.cs", + "ViewState": "AQIAAJUAAAAAAAAAAAAewDgAAAAqAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T05:15:51.127Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "IInboundService.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundService\\IInboundService.cs", + "RelativeDocumentMoniker": "WIDESEA_IInboundService\\IInboundService.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundService\\IInboundService.cs", + "RelativeToolTip": "WIDESEA_IInboundService\\IInboundService.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAsAAABAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T08:10:26.396Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "IReturnInventoryDetailRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundRepository\\IReturnInventoryDetailRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_IInboundRepository\\IReturnInventoryDetailRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundRepository\\IReturnInventoryDetailRepository.cs", + "RelativeToolTip": "WIDESEA_IInboundRepository\\IReturnInventoryDetailRepository.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAsAAABcAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T07:59:28.141Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 14, + "Title": "IMainReturnInventoryRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundRepository\\IMainReturnInventoryRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_IInboundRepository\\IMainReturnInventoryRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundRepository\\IMainReturnInventoryRepository.cs", + "RelativeToolTip": "WIDESEA_IInboundRepository\\IMainReturnInventoryRepository.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAsAAABYAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T07:57:10.344Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 15, + "Title": "IInboundOrderRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundRepository\\IInboundOrderRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_IInboundRepository\\IInboundOrderRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IInboundRepository\\IInboundOrderRepository.cs", + "RelativeToolTip": "WIDESEA_IInboundRepository\\IInboundOrderRepository.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T07:56:43.453Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 16, + "Title": "InboundOrderRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\InboundOrderRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_InboundRepository\\InboundOrderRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\InboundOrderRepository.cs", + "RelativeToolTip": "WIDESEA_InboundRepository\\InboundOrderRepository.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAjAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T07:53:13.843Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 17, + "Title": "InboundOrder_HtyRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\InboundOrder_HtyRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_InboundRepository\\InboundOrder_HtyRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\InboundOrder_HtyRepository.cs", + "RelativeToolTip": "WIDESEA_InboundRepository\\InboundOrder_HtyRepository.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T07:52:50.822Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 18, + "Title": "InboundRepository.cs", + "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\InboundRepository.cs", + "RelativeDocumentMoniker": "WIDESEA_InboundRepository\\InboundRepository.cs", + "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_InboundRepository\\InboundRepository.cs", + "RelativeToolTip": "WIDESEA_InboundRepository\\InboundRepository.cs", + "ViewState": "AQIAAAsAAAAAAAAAAAAIwAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-27T07:52:30.902Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 20, "Title": "PartialTaskService_Outbound.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Outbound.cs", "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\PartialTaskService_Outbound.cs", @@ -197,7 +402,7 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 19, "Title": "Sys_JobController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\System\\Sys_JobController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\System\\Sys_JobController.cs", @@ -210,45 +415,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, - "Title": "PartialTaskService_Inbound.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", - "RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", - "RelativeToolTip": "WIDESEA_TaskInfoService\\PartialTaskService_Inbound.cs", - "ViewState": "AQIAAEYAAAAAAAAAAAAIwFAAAAA1AAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-25T02:07:38.085Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 8, - "Title": "TaskController.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", - "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", - "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\TaskInfo\\TaskController.cs", - "ViewState": "AQIAACsAAAAAAAAAAAAswC4AAAARAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-25T02:15:33.346Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 9, - "Title": "StockEnum.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\StockEnum.cs", - "RelativeDocumentMoniker": "WIDESEA_Core\\Enums\\StockEnum.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\StockEnum.cs", - "RelativeToolTip": "WIDESEA_Core\\Enums\\StockEnum.cs", - "ViewState": "AQIAADgAAAAAAAAAAAAYwDcAAAAMAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-25T07:20:16.67Z" - }, - { - "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 23, "Title": "StockInfoRepository.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockRepository\\StockInfoRepository.cs", "RelativeDocumentMoniker": "WIDESEA_StockRepository\\StockInfoRepository.cs", @@ -260,7 +427,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 22, "Title": "LocationInfoController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\LocationInfoController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\LocationInfoController.cs", @@ -273,7 +440,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 21, "Title": "Log.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\LogLibrary\\Log\\Log.cs", "RelativeDocumentMoniker": "LogLibrary\\Log\\Log.cs", @@ -285,7 +452,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 24, "Title": "OrderEnum.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Enums\\OrderEnum.cs", "RelativeDocumentMoniker": "WIDESEA_Core\\Enums\\OrderEnum.cs", @@ -297,7 +464,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 25, "Title": "OutboundOrderDetailService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_OutboundService\\Service\\OutboundOrderDetailService.cs", "RelativeDocumentMoniker": "WIDESEA_OutboundService\\Service\\OutboundOrderDetailService.cs", @@ -310,7 +477,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 26, "Title": "LocationInfoRepository.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicRepository\\LocationInfoRepository.cs", "RelativeDocumentMoniker": "WIDESEA_BasicRepository\\LocationInfoRepository.cs", @@ -323,20 +490,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, - "Title": "LocationInfoService.cs", - "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\LocationInfoService.cs", - "RelativeDocumentMoniker": "WIDESEA_BasicService\\Service\\LocationInfoService.cs", - "ToolTip": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\Service\\LocationInfoService.cs", - "RelativeToolTip": "WIDESEA_BasicService\\Service\\LocationInfoService.cs", - "ViewState": "AQIAAEwAAAAAAAAAAAAAAF4AAAAUAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-25T02:07:38.07Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 27, "Title": "OutboundOrderDetailController.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Outbound\\OutboundOrderDetailController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Outbound\\OutboundOrderDetailController.cs", @@ -349,7 +503,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 28, "Title": "IOutboundOrderDetailService.cs", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IOutboundService\\IOutboundOrderDetailService.cs", "RelativeDocumentMoniker": "WIDESEA_IOutboundService\\IOutboundOrderDetailService.cs", @@ -361,7 +515,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 29, "Title": "appsettings.json", "DocumentMoniker": "D:\\project\\NanNingBYD\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json", diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" index 48335f6..2a6d6be 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" @@ -90,10 +90,11 @@ { return EmptyAssignLocation(roadwayInfo.RoadwayNo,palletCode); } - else if (inboundType == TaskTypeEnum.Inbound.ObjToInt()) + else if (inboundType == TaskTypeEnum.Inbound.ObjToInt()|| inboundType == TaskTypeEnum.PalletReturnInbound.ObjToInt()) { return StoredAssignLocation(roadwayInfo.RoadwayNo,palletCode); } + } catch (Exception ex) { diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" index 7bf5507..4a897a8 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" @@ -82,10 +82,10 @@ PalletInbound = 204, /// <summary> - /// 鍥炵┖ + /// 鍥炲簱 /// </summary> - //[Description("鍥炵┖")] - //PalletReturnInbound = 205, + [Description("鍥炲簱")] + PalletReturnInbound = 205, /// <summary> /// 绉诲簱 diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IMainReturnInventoryRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IMainReturnInventoryRepository.cs" new file mode 100644 index 0000000..5a3f454 --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IMainReturnInventoryRepository.cs" @@ -0,0 +1,15 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Core.BaseRepository; +using WIDESEA_Model.Models; +using WIDESEA_Model.Models.Inbound; + +namespace WIDESEA_IInboundRepository +{ + public interface IMainReturnInventoryRepository : IRepository<Dt_MainReturnInventory> + { + } +} diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReturnInventoryDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReturnInventoryDetailRepository.cs" new file mode 100644 index 0000000..3988e4b --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReturnInventoryDetailRepository.cs" @@ -0,0 +1,15 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Core.BaseRepository; +using WIDESEA_Model.Models; +using WIDESEA_Model.Models.Inbound; + +namespace WIDESEA_IInboundRepository +{ + public interface IReturnInventoryDetailRepository : IRepository<Dt_ReturnInventoryDetail> + { + } +} 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 392b203..85168a4 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" @@ -38,6 +38,7 @@ WebResponseContent GenerateInboundTask(string stationCode, int taskType, string palletCode); WebResponseContent PalletInboundRequest(string stationCode, string palletCode); WebResponseContent InboundRequest(string stationCode, string palletCode); + WebResponseContent ReturnInboundRequest(string stationCode, string palletCode); WebResponseContent TaskCompleted(int taskNum); WebResponseContent TaskCancel(int taskNum); WebResponseContent UpdateTaskStatus(int taskNum); diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/MainReturnInventoryRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/MainReturnInventoryRepository.cs" new file mode 100644 index 0000000..d3ab559 --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/MainReturnInventoryRepository.cs" @@ -0,0 +1,22 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Core.BaseRepository; +using WIDESEA_IInboundRepository; +using WIDESEA_Model.Models; +using WIDESEA_Model.Models.Inbound; + +namespace WIDESEA_InboundRepository +{ + public class MainReturnInventoryRepository : RepositoryBase<Dt_MainReturnInventory>, IMainReturnInventoryRepository + { + private readonly IUnitOfWorkManage _unitOfWorkManage; + + public MainReturnInventoryRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage) + { + _unitOfWorkManage = unitOfWorkManage; + } + } +} diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReturnInventoryDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReturnInventoryDetailRepository.cs" new file mode 100644 index 0000000..e93eef3 --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReturnInventoryDetailRepository.cs" @@ -0,0 +1,22 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Core.BaseRepository; +using WIDESEA_IInboundRepository; +using WIDESEA_Model.Models; +using WIDESEA_Model.Models.Inbound; + +namespace WIDESEA_InboundRepository +{ + public class ReturnInventoryDetailRepository : RepositoryBase<Dt_ReturnInventoryDetail>, IReturnInventoryDetailRepository + { + private readonly IUnitOfWorkManage _unitOfWorkManage; + + public ReturnInventoryDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage) + { + _unitOfWorkManage = unitOfWorkManage; + } + } +} diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" index 2d22c30..a3680f4 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" @@ -37,12 +37,14 @@ private IInboundOrderDetailService _inboundOrderDetailService; private ILabelMasterRepository _labelMasterRepository; + private IMainReturnInventoryRepository _mainReturnInventoryRepository; + private IReturnInventoryDetailRepository _ReturnInventoryDetailRepository; private readonly ISys_JobService _sys_JobService; public IInboundOrderRepository Repository => BaseDal; - public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IBasicService basicService, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService,ILabelMasterRepository labelMasterRepository,ISys_JobService sys_JobService) : base(BaseDal) + public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IBasicService basicService, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService,ILabelMasterRepository labelMasterRepository,ISys_JobService sys_JobService, IMainReturnInventoryRepository mainReturnInventoryRepository, IReturnInventoryDetailRepository returnInventoryDetailRepository) : base(BaseDal) { _mapper = mapper; _unitOfWorkManage = unitOfWorkManage; @@ -52,6 +54,8 @@ _inboundOrderDetailService = inboundOrderDetailService; _labelMasterRepository = labelMasterRepository; _sys_JobService = sys_JobService; + _mainReturnInventoryRepository = mainReturnInventoryRepository; + _ReturnInventoryDetailRepository = returnInventoryDetailRepository; } /// <summary> diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" index 3d4527a..f5f428e 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" @@ -1,4 +1,6 @@ 锘縰sing AutoMapper; +using LogLibrary.Log; +using Newtonsoft.Json; using SqlSugar; using System; using System.Collections.Generic; @@ -18,10 +20,12 @@ using WIDESEA_IBasicService; using WIDESEA_IInboundRepository; using WIDESEA_IInboundService; +using WIDESEA_InboundRepository; using WIDESEA_IStockService; using WIDESEA_ITaskInfoRepository; using WIDESEA_Model; using WIDESEA_Model.Models; +using WIDESEA_Model.Models.Inbound; using WIDESEA_Model.Models.System.Request; namespace WIDESEA_InboundService @@ -139,12 +143,11 @@ /// </summary> /// <param name="materielGroupDTO"></param> /// <returns></returns> - public WebResponseContent ReturnMaterielGroup(MaterielGroupDTO materielGroupDTO) + public WebResponseContent ReturnMaterielGroup(MaterielGroupDTO materielGroupDTO, ReturnInventoryRequest inventoryRequest) { WebResponseContent content = new WebResponseContent(); try { - materielGroupDTO.OrderNo = GetOrderNo(); Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode); (bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, stockInfo); if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2); @@ -153,68 +156,32 @@ stockInfo = new Dt_StockInfo(); stockInfo.PalletCode = materielGroupDTO.PalletCode; stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(); - stockInfo.Creater = "绔嬪簱WMS"; + stockInfo.Creater = "WMS"; stockInfo.Details = new List<Dt_StockInfoDetail>(); } List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>(); - List<Dt_LabelMaster> notExistLabels = new List<Dt_LabelMaster>(); - foreach (var lablel in materielGroupDTO.SerialNumbers) - { - Dt_LabelMaster labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == lablel); - if (labmaster == null) - { - //閫氳繃鏉$爜鎺ュ彛鍚屾鏉$爜涓绘暟鎹� - var res = _sys_JobService.GetLabMaster(lablel); - if (res != null && res.Status) - { - labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == lablel); - if (labmaster == null) - { - notExistLabels.Add(labmaster); - } - } - else - { - return content = WebResponseContent.Instance.Error("缁勭洏鏉$爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!"); - } - } - if (labmaster != null) - { - //涓绘暟鎹潯鐮佺姸鎬佸厑璁哥粍鐩橈細01宸叉敹鏂欏緟璐ㄦ锛�02宸叉敹鏂欐棤闇�璐ㄦ锛�03寰呰繘浠撳凡璐ㄦ锛�09宸蹭笅鏋讹紱 - //涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏锛�00鍒涘缓锛�04宸茶川妫�寰呴��璐э紝05鏀舵枡鎴块��璐э紝06搴撴埧閫�璐э紝07宸茶繘浠擄紝08宸蹭笂鏋讹紝10宸插嚭搴擄紝11宸插喕缁擄紝12宸查攣瀹氾紝20鍏抽棴鐨勶紱 - if (labmaster.LABEL_STATUS == "00" || labmaster.LABEL_STATUS == "04" || labmaster.LABEL_STATUS == "05" || labmaster.LABEL_STATUS == "06" || labmaster.LABEL_STATUS == "07" || labmaster.LABEL_STATUS == "08" || labmaster.LABEL_STATUS == "10" || labmaster.LABEL_STATUS == "11" || labmaster.LABEL_STATUS == "12" || labmaster.LABEL_STATUS == "20") - { - return content = WebResponseContent.Instance.Error("涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏!鏉$爜鐘舵�侊細" + labmaster.LABEL_STATUS); - } - } - } - if (notExistLabels.Count == 0) - { - foreach (var item in materielGroupDTO.SerialNumbers) - { - Dt_LabelMaster labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == item); - Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail(); - dt_StockInfoDetail.Status = 0; - dt_StockInfoDetail.OrderNo = materielGroupDTO.OrderNo; - dt_StockInfoDetail.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0; - dt_StockInfoDetail.MaterielCode = labmaster.MATNR; - dt_StockInfoDetail.MaterielName = labmaster.MAKTX; - dt_StockInfoDetail.BatchNo = labmaster.BATCH; - dt_StockInfoDetail.SerialNumber = labmaster.LABEL_NO; - dt_StockInfoDetail.StockQuantity = int.Parse(labmaster.BOX_QTY); - dt_StockInfoDetail.OutboundQuantity = 0; - dt_StockInfoDetail.Creater = "System"; - stockInfoDetails.Add(dt_StockInfoDetail); - stockInfo.Details.AddRange(stockInfoDetails); - } - content = MaterielGroupUpdateData(stockInfo); - } - else + foreach (var item in inventoryRequest.DATA) { - content = WebResponseContent.Instance.Error("缁勭洏鏉$爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!"); + + Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail(); + dt_StockInfoDetail.Status = 0; + dt_StockInfoDetail.OrderNo = materielGroupDTO.OrderNo; + dt_StockInfoDetail.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0; + dt_StockInfoDetail.MaterielCode = item.MATNR; + dt_StockInfoDetail.MaterielName = ""; + dt_StockInfoDetail.BatchNo = ""; + dt_StockInfoDetail.SerialNumber = item.LABEL_NO; + dt_StockInfoDetail.StockQuantity = int.Parse(item.QTY); + dt_StockInfoDetail.OutboundQuantity = 0; + dt_StockInfoDetail.Creater = "WMS"; + stockInfoDetails.Add(dt_StockInfoDetail); + stockInfo.Details.AddRange(stockInfoDetails); } + content = MaterielGroupUpdateData(stockInfo); + + } catch (Exception ex) @@ -235,16 +202,58 @@ /// <returns></returns> public ReturnInventoryResponse returnInventory(ReturnInventoryRequest inventoryRequest) { + string inparam = JsonConvert.SerializeObject(inventoryRequest); + new LogFactory().GetLog("WMS鎺ュ彛").InfoFormat(true, "returnInventory", "浣欐枡閫�鍥炰俊鎭�", $"{inparam}"); ReturnInventoryResponse response= new ReturnInventoryResponse(); MaterielGroupDTO materielGroupDTO = new MaterielGroupDTO(); materielGroupDTO.PalletCode = inventoryRequest.TPNUM; materielGroupDTO.OrderNo = inventoryRequest.IZLID; //閫�璐у叆搴撴寚浠� List<string> SerialNumbers = new List<string>(); + //淇濆瓨鍥為��鏁版嵁鍒版湰鍦� + Dt_MainReturnInventory dt_MainReturnInventory = new Dt_MainReturnInventory(); + dt_MainReturnInventory.WH_NUMBER= inventoryRequest.WH_NUMBER; + dt_MainReturnInventory.BUSINESS_CODE = inventoryRequest.BUSINESS_CODE; + dt_MainReturnInventory.BUSINESS_NAME = inventoryRequest.BUSINESS_NAME; + dt_MainReturnInventory.WERKS = inventoryRequest.WERKS; + dt_MainReturnInventory.LGORT = inventoryRequest.LGORT; + dt_MainReturnInventory.TOTAL_RETURN_QTY=inventoryRequest.TOTAL_RETURN_QTY; + dt_MainReturnInventory.RETURN_NO = inventoryRequest.RETURN_NO; + dt_MainReturnInventory.RETURN_ITEM_NO = inventoryRequest.RETURN_ITEM_NO; + dt_MainReturnInventory.TPNUM = inventoryRequest.TPNUM; + dt_MainReturnInventory.YLZD1 = inventoryRequest.YLZD1; + dt_MainReturnInventory.YLZD2 = inventoryRequest.YLZD2; + dt_MainReturnInventory.YLZD3 = inventoryRequest.YLZD3; + dt_MainReturnInventory.YLZD4 = inventoryRequest.YLZD4; + dt_MainReturnInventory.YLZD5 = inventoryRequest.YLZD5; + dt_MainReturnInventory.IZLID = inventoryRequest.IZLID; + dt_MainReturnInventory.SYSNOD = inventoryRequest.SYSNOD; + dt_MainReturnInventory.MO_NO = inventoryRequest.MO_NO; foreach (ReturnInventory item in inventoryRequest.DATA) { + Dt_ReturnInventoryDetail dt_ReturnInventoryDetail = new Dt_ReturnInventoryDetail(); + dt_ReturnInventoryDetail.LABEL_NO = item.LABEL_NO; + dt_ReturnInventoryDetail.SOBKZ = item.SOBKZ; + dt_ReturnInventoryDetail.UNIT = item.UNIT; + dt_ReturnInventoryDetail.LGORT = item.LGORT; + dt_ReturnInventoryDetail.QTY = item.QTY; + dt_ReturnInventoryDetail.LIFNR = item.LIFNR; + dt_ReturnInventoryDetail.F_LGORT = item.F_LGORT; + dt_ReturnInventoryDetail.MATNR = item.MATNR; + _ReturnInventoryDetailRepository.AddData(dt_ReturnInventoryDetail); SerialNumbers.Add(item.LABEL_NO); } - ReturnMaterielGroup(materielGroupDTO); + materielGroupDTO.SerialNumbers = SerialNumbers; + _mainReturnInventoryRepository.AddData(dt_MainReturnInventory); + WebResponseContent content = ReturnMaterielGroup(materielGroupDTO, inventoryRequest); + if(content.Status) + { + response.MSGTY = "S"; + } + else + { + response.MSGTY = "E"; + response.MSGTX = content.Message; + } return response; } /// <summary> diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/WIDESEA_InboundService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/WIDESEA_InboundService.csproj" index 9a01f27..13ddc4f 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/WIDESEA_InboundService.csproj" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/WIDESEA_InboundService.csproj" @@ -7,6 +7,7 @@ </PropertyGroup> <ItemGroup> + <ProjectReference Include="..\LogLibrary\LogLibrary.csproj" /> <ProjectReference Include="..\WIDESEA_IBasicService\WIDESEA_IBasicService.csproj" /> <ProjectReference Include="..\WIDESEA_IInboundService\WIDESEA_IInboundService.csproj" /> <ProjectReference Include="..\WIDESEA_IStockService\WIDESEA_IStockService.csproj" /> diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_MainReturnInventory.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_MainReturnInventory.cs" new file mode 100644 index 0000000..9cfd621 --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_MainReturnInventory.cs" @@ -0,0 +1,148 @@ +锘縰sing SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Model.Models.Inbound +{ + + /// <summary> + /// + ///</summary> + [SugarTable("Dt_MainReturnInventory")] + public class Dt_MainReturnInventory + { + + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "WH_NUMBER")] + public string? WH_NUMBER { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "BUSINESS_NAME")] + public string? BUSINESS_NAME { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "WERKS")] + public string? WERKS { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "LGORT")] + public string? LGORT { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "TOTAL_RETURN_QTY")] + public string? TOTAL_RETURN_QTY { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "BUSINESS_CODE")] + public string? BUSINESS_CODE { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "RETURN_NO")] + public string? RETURN_NO { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "RETURN_ITEM_NO")] + public string? RETURN_ITEM_NO { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "TPNUM")] + public string? TPNUM { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "YLZD5")] + public string? YLZD5 { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "IZLID")] + public string? IZLID { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "SYSNOD")] + public string? SYSNOD { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "MO_NO")] + public string? MO_NO { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "YLZD3")] + public string? YLZD3 { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "YLZD4")] + public string? YLZD4 { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "YLZD1")] + public string? YLZD1 { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "YLZD2")] + public string? YLZD2 { get; set; } + + + } + +} diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReturnInventoryDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReturnInventoryDetail.cs" new file mode 100644 index 0000000..877af72 --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReturnInventoryDetail.cs" @@ -0,0 +1,83 @@ +锘縰sing SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_Model.Models.Inbound +{ + /// <summary> + /// + ///</summary> + [SugarTable("Dt_ReturnInventoryDetail")] + public class Dt_ReturnInventoryDetail + { + + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "LABEL_NO")] + public string? LABEL_NO { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "SOBKZ")] + public string? SOBKZ { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "UNIT")] + public string? UNIT { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "LGORT")] + public string? LGORT { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "QTY")] + public string? QTY { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "LIFNR")] + public string? LIFNR { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "F_LGORT")] + public string? F_LGORT { get; set; } + + /// <summary> + /// 澶� 娉�: + /// 榛樿鍊�: + ///</summary> + [SugarColumn(ColumnName = "MATNR")] + public string? MATNR { get; set; } + + + } +} diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" index 3127b46..2c2445f 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" @@ -89,6 +89,31 @@ return content; } + + /// <summary> + /// 鐗╂枡鍥炲簱 + /// </summary> + /// <param name="stationCode">璧峰鍦板潃</param> + /// <param name="palletCode">鎵樼洏缂栧彿</param> + /// <returns>杩斿洖澶勭悊缁撴灉</returns> + public WebResponseContent ReturnInboundRequest(string stationCode, string palletCode) + { + WebResponseContent content = new WebResponseContent(); + try + { + Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(palletCode); + (bool, string) result = CheckRequestInbound(stationCode, palletCode, true, stockInfo); + if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2); + content = AssignLocUpdateData(stationCode, TaskTypeEnum.PalletReturnInbound.ObjToInt(), palletCode, true, stockInfo); + } + catch (Exception ex) + { + content = WebResponseContent.Instance.Error($"{ex.Message}"); + } + return content; + } + + /// <summary> /// 鍏ュ簱鍒嗛厤璐т綅鍙婂鐞嗘暟鎹� /// </summary> @@ -121,7 +146,7 @@ TaskStatus = InTaskStatusEnum.InNew.ObjToInt(), TaskType = taskType, Depth= locationInfo.Depth, - Creater="WMS" + Creater="System" }; BaseDal.AddData(task); int beforeStatus = locationInfo.LocationStatus; diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" index 176c5dc..2b0a357 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" @@ -43,6 +43,7 @@ [HttpPost, Route("returnInventory"), AllowAnonymous] public ReturnInventoryResponse returnInventory([FromBody] ReturnInventoryRequest inventoryRequest) { + return Service.returnInventory(inventoryRequest); } } diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" index 483d7fb..4c6cbb2 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" @@ -204,8 +204,7 @@ [HttpGet, Route("MaterielInBoundReturnConfirm"), AllowAnonymous] public WebResponseContent MaterielInBoundReturnConfirm( string PalletCode) { - - return null; + return _taskService.ReturnInboundRequest("R01-001-023-001", PalletCode); } diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2024-12-27/\345\205\245\345\272\223\344\273\273\345\212\241\344\270\213\345\217\221241227.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2024-12-27/\345\205\245\345\272\223\344\273\273\345\212\241\344\270\213\345\217\221241227.txt" new file mode 100644 index 0000000..77daa77 --- /dev/null +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/API\350\257\267\346\261\202/2024-12-27/\345\205\245\345\272\223\344\273\273\345\212\241\344\270\213\345\217\221241227.txt" @@ -0,0 +1,45 @@ +2024/12/27 20:00:22.395 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":95,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T19:59:51.2592391+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."} +------------------------------- + +2024/12/27 20:03:25.436 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":96,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:02:54.7833644+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."} +------------------------------- + +2024/12/27 20:05:13.41 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":97,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:04:07.6921101+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."} +------------------------------- + +2024/12/27 20:07:18.456 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":98,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:06:47.8613265+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."} +------------------------------- + +2024/12/27 20:08:34.612 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":99,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:08:03.5793251+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."} +------------------------------- + +2024/12/27 20:14:39.756 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":100,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:14:09.0261636+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."} +------------------------------- + +2024/12/27 20:23:47.222 +璇锋眰鎴愬姛 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":101,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:23:44.0431048+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"{\"status\":true,\"code\":0,\"message\":\"鎴愬姛\",\"data\":null,\"devMessage\":null}"} +------------------------------- + +2024/12/27 20:44:33.597 +璇锋眰寮傚父 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":102,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:44:04.3193016+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"","閿欒":"An error occurred while sending the request."} +------------------------------- + +2024/12/27 20:48:37.492 +璇锋眰鎴愬姛 +{"璇锋眰鎶ユ枃":[{"TaskId":0,"TaskNum":103,"PalletCode":"BTP0505","Roadway":"R01","TaskType":205,"TaskStatus":200,"SourceAddress":"R01-001-023-001","TargetAddress":"R01-001-002-001","CurrentAddress":"R01-001-023-001","NextAddress":"R01-001-002-001","Depth":1,"OrderNo":null,"Grade":2,"SourceKey":0,"Dispatchertime":null,"Remark":null,"Creater":"System","CreateDate":"2024-12-27T20:48:34.5787554+08:00","Modifier":null,"ModifyDate":null}],"鎺ユ敹鎶ユ枃":"{\"status\":true,\"code\":0,\"message\":\"鎴愬姛\",\"data\":null,\"devMessage\":null}"} +------------------------------- + diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\345\205\266\344\273\226\346\226\207\346\241\243/\346\216\245\346\224\266\344\275\231\346\226\231\351\200\200\345\233\236\344\277\241\346\201\257.txt" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\345\205\266\344\273\226\346\226\207\346\241\243/\346\216\245\346\224\266\344\275\231\346\226\231\351\200\200\345\233\236\344\277\241\346\201\257.txt" new file mode 100644 index 0000000..510a7d4 --- /dev/null +++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\345\205\266\344\273\226\346\226\207\346\241\243/\346\216\245\346\224\266\344\275\231\346\226\231\351\200\200\345\233\236\344\277\241\346\201\257.txt" @@ -0,0 +1,42 @@ +/api/InboundOrder/returnInventory +{ + "WH_NUMBER": "GX25", + "BUSINESS_NAME": "40", + "WERKS": "GX25", + "LGORT": "0035", + "TOTAL_RETURN_QTY": "2", + "BUSINESS_CODE": "00", + "RETURN_NO": "RTHZ25000023883", + "RETURN_ITEM_NO": "1", + "TPNUM": "1", + "YLZD5": "", + "IZLID": "RFHZ25000000246", + "SYSNOD": "", + "MO_NO": "", + "YLZD3": "", + "YLZD4": "", + "YLZD1": "", + "YLZD2": "", + "DATA": [ + { + "LABEL_NO": "BQHZ250001645115", + "SOBKZ": "Z", + "UNIT": "IN", + "LGORT": "0034", + "QTY": "1", + "LIFNR": "116576", + "F_LGORT": "W001", + "MATNR": "13593603-00" + }, + { + "LABEL_NO": "BQHZ250001645116", + "SOBKZ": "Z", + "UNIT": "IN", + "LGORT": "0034", + "QTY": "1", + "LIFNR": "116576", + "F_LGORT": "W001", + "MATNR": "13593603-00" + } + ] +} \ No newline at end of file -- Gitblit v1.9.3