From e3aaaa22a7cee2b7c7a33e98f843abc0cd15fb1b Mon Sep 17 00:00:00 2001 From: 刘磊 <1161824510@qq.com> Date: 星期二, 05 八月 2025 13:36:12 +0800 Subject: [PATCH] 同步 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 10 项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx | 23 +++ 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs | 20 -- 项目代码/WMS/WIDESEA_WMSClient/src/api/buttons.js | 10 + 项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 112 +++++++++--------- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 3 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 21 +++ 项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 129 +++++++++++++-------- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs | 7 + 9 files changed, 207 insertions(+), 128 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/buttons.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/buttons.js" index 60ef83d..e3fb002 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/buttons.js" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/buttons.js" @@ -194,6 +194,16 @@ onClick: function () { } + },{ + name: '纭浠诲姟', + // icon: 'el-icon-printer', + type: 'primary', + // plain: true, + // color: '#529b2e', + value: 'confirmTask', + onClick: function () { + + } } ] diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx" index ca674fc..822489d 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx" @@ -46,6 +46,29 @@ }) } } + + let confirmTask=this.buttons.find(x=>x.value=='confirmTask'); + if(confirmTask){ + confirmTask.onClick=function(){ + let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮 + if (row <= 0) { + //濡傛灉娌℃湁閫変腑琛� + this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�') + return + } + let taskNum = row[0].taskNum + this.http.get(`/api/Task/confirmTask?taskNum=${taskNum}`, {}, "姝e湪纭瀹屾垚浠诲姟").then((res) => { + //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙� + if (res.status) { + this.$Message.success('纭浠诲姟瀹屾垚'); + this.refresh(); + } else { + this.$Message.error(res.message) //閿欒鎻愮ず + this.refresh(); + } + }) + } + } //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽� // this.buttons.unshift({ // //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍 diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" index 7ebf1b2..8b51e4b 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" @@ -3,6 +3,22 @@ "WorkspaceRootPath": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\confirmtocontinuetask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\confirmtocontinuetask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\taskresult.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\taskresult.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\toagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\toagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -15,24 +31,8 @@ "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\taskresult.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\taskresult.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{4BDE58B2-5B2E-480B-932F-D63C2A7D557C}|WIDESEA_StorageBasicServices\\WIDESEA_StorageBasicServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagebasicservices\\boxing\\boxinginfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4BDE58B2-5B2E-480B-932F-D63C2A7D557C}|WIDESEA_StorageBasicServices\\WIDESEA_StorageBasicServices.csproj|solutionrelative:widesea_storagebasicservices\\boxing\\boxinginfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\toagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\toagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\basemodels\\webresponsecontent.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\basemodels\\webresponsecontent.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4BDE58B2-5B2E-480B-932F-D63C2A7D557C}|WIDESEA_StorageBasicServices\\WIDESEA_StorageBasicServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagebasicservices\\boxing\\boxinginfodetailservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -66,19 +66,19 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 8, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 6, - "Title": "WebResponseContent.cs", - "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\BaseModels\\WebResponseContent.cs", - "RelativeDocumentMoniker": "WIDESEA_Core\\BaseModels\\WebResponseContent.cs", - "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\BaseModels\\WebResponseContent.cs", - "RelativeToolTip": "WIDESEA_Core\\BaseModels\\WebResponseContent.cs", - "ViewState": "AgIAAB0AAAAAAAAAAAAYwCoAAAAiAAAAAAAAAA==", + "DocumentIndex": 0, + "Title": "confirmToContinueTask.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "ViewState": "AgIAABkAAAAAAAAAAAAQwCoAAABDAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T06:50:06.686Z", + "WhenOpened": "2025-08-04T08:20:57.171Z", "EditorCaption": "" }, { @@ -99,20 +99,20 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 2, "Title": "ToAGVService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", - "ViewState": "AgIAACUAAAAAAAAAAAAwwCoAAAAJAAAAAAAAAA==", + "ViewState": "AgIAACAAAAAAAAAAAAAwwDkAAAAcAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-04T03:13:00.285Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 3, "Title": "Add_Task.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\Add_Task.cs", "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\Add_Task.cs", @@ -126,19 +126,6 @@ { "$type": "Document", "DocumentIndex": 4, - "Title": "BoxingInfoService.cs", - "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", - "RelativeDocumentMoniker": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", - "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", - "RelativeToolTip": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", - "ViewState": "AgIAABUAAAAAAAAAAAAjwCgAAAAkAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T02:44:10.147Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, "Title": "Dt_TaskService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs", @@ -151,7 +138,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "Dt_Task_HtyService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_Task_HtyService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Dt_Task_HtyService.cs", @@ -164,7 +151,33 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, + "Title": "taskResult.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", + "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", + "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", + "ViewState": "AgIAABQAAAAAAAAAAAAAwBwAAABMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-04T05:59:15.917Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "BoxingInfoService.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", + "RelativeDocumentMoniker": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", + "RelativeToolTip": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", + "ViewState": "AgIAABUAAAAAAAAAAAAjwCgAAAAkAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-04T02:44:10.147Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "Dt_TaskService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs", @@ -173,19 +186,6 @@ "ViewState": "AgIAAFkAAAAAAAAAAAAswHEAAAArAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-04T02:44:10.127Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "taskResult.cs", - "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", - "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", - "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", - "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", - "ViewState": "AgIAABQAAAAAAAAAAAAAwDMAAAAwAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T05:59:15.917Z", "EditorCaption": "" }, { diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" index 8b51e4b..b8863fe 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,6 +3,26 @@ "WorkspaceRootPath": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\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\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{986CA639-B3B4-4D4F-B12B-3D8FBA48B2B1}|WIDESEA_IStorageTaskService\\WIDESEA_IStorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_istoragetaskservice\\task\\idt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{986CA639-B3B4-4D4F-B12B-3D8FBA48B2B1}|WIDESEA_IStorageTaskService\\WIDESEA_IStorageTaskServices.csproj|solutionrelative:widesea_istoragetaskservice\\task\\idt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\confirmtocontinuetask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\confirmtocontinuetask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -15,20 +35,8 @@ "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\toagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\partial\\add_task.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\dt_task_htyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\dt_task_htyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4BDE58B2-5B2E-480B-932F-D63C2A7D557C}|WIDESEA_StorageBasicServices\\WIDESEA_StorageBasicServices.csproj|e:\\\u5BBD\u6D77\\agvchanpingxiangmu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagebasicservices\\boxing\\boxinginfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -66,19 +74,19 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 12, "Children": [ { "$type": "Document", - "DocumentIndex": 0, - "Title": "confirmToContinueTask.cs", - "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", - "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", - "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", - "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", - "ViewState": "AgIAABkAAAAAAAAAAAAQwCoAAABDAAAAAAAAAA==", + "DocumentIndex": 2, + "Title": "IDt_TaskService.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStorageTaskService\\Task\\IDt_TaskService.cs", + "RelativeDocumentMoniker": "WIDESEA_IStorageTaskService\\Task\\IDt_TaskService.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStorageTaskService\\Task\\IDt_TaskService.cs", + "RelativeToolTip": "WIDESEA_IStorageTaskService\\Task\\IDt_TaskService.cs", + "ViewState": "AgIAAGMAAAAAAAAAAAAswHsAAAAEAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T08:20:57.171Z", + "WhenOpened": "2025-08-05T05:27:30.271Z", "EditorCaption": "" }, { @@ -99,46 +107,59 @@ }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "ToAGVService.cs", - "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", - "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", - "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", - "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", - "ViewState": "AgIAACAAAAAAAAAAAAAwwDkAAAAcAAAAAAAAAA==", + "DocumentIndex": 1, + "Title": "TaskController.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskController.cs", + "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\TaskController.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskController.cs", + "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\TaskController.cs", + "ViewState": "AgIAAB0AAAAAAAAAAAD4vywAAAAhAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T03:13:00.285Z", + "WhenOpened": "2025-08-05T05:24:13.808Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 5, + "Title": "confirmToContinueTask.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\confirmToContinueTask.cs", + "ViewState": "AgIAABQAAAAAAAAAAAAAwCwAAAANAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-04T08:20:57.171Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, "Title": "Add_Task.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\Add_Task.cs", "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\Add_Task.cs", "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\Add_Task.cs", "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\Add_Task.cs", - "ViewState": "AgIAAAMAAAAAAAAAAAAuwEMAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAB0AAAAAAAAAAAAAwDEAAAA5AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-04T03:12:52.21Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 3, "Title": "Dt_TaskService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs", "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs", "RelativeToolTip": "WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs", - "ViewState": "AgIAAHoBAAAAAAAAAAAmwJUBAAAtAAAAAAAAAA==", + "ViewState": "AgIAALcAAAAAAAAAAAAowMYAAAAqAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-04T02:19:22.164Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 8, "Title": "Dt_Task_HtyService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_Task_HtyService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Dt_Task_HtyService.cs", @@ -146,25 +167,24 @@ "RelativeToolTip": "WIDESEA_StorageTaskServices\\Task\\Dt_Task_HtyService.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T03:08:07.552Z", - "EditorCaption": "" + "WhenOpened": "2025-08-04T03:08:07.552Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 6, "Title": "taskResult.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\Partial\\taskResult.cs", - "ViewState": "AgIAABQAAAAAAAAAAAAAwBwAAABMAAAAAAAAAA==", + "ViewState": "AgIAABwAAAAAAAAAAAAQwDAAAABDAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-04T05:59:15.917Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "BoxingInfoService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", @@ -172,25 +192,36 @@ "RelativeToolTip": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoService.cs", "ViewState": "AgIAABUAAAAAAAAAAAAjwCgAAAAkAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-04T02:44:10.147Z", - "EditorCaption": "" + "WhenOpened": "2025-08-04T02:44:10.147Z" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 0, "Title": "Dt_TaskService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs", "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs", "RelativeToolTip": "WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs", - "ViewState": "AgIAAFkAAAAAAAAAAAAswHEAAAArAAAAAAAAAA==", + "ViewState": "AgIAAAgAAAAAAAAAAAAkwK0AAAApAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-04T02:44:10.127Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 7, + "Title": "ToAGVService.cs", + "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", + "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", + "ToolTip": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", + "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\ToAGVService.cs", + "ViewState": "AgIAACAAAAAAAAAAAAAwwDkAAAAcAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-04T03:13:00.285Z" + }, + { + "$type": "Document", + "DocumentIndex": 10, "Title": "BoxingInfoDetailService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoDetailService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageBasicServices\\Boxing\\BoxingInfoDetailService.cs", @@ -202,7 +233,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 11, "Title": "Dt_PalletStockInfoDetailService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Stock\\Dt_PalletStockInfoDetailService.cs", "RelativeDocumentMoniker": "WIDESEA_StorageBasicServices\\Stock\\Dt_PalletStockInfoDetailService.cs", @@ -214,7 +245,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "Dt_PalletStockInfoDetailController.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Stock\\Dt_PalletStockInfoDetailController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Stock\\Dt_PalletStockInfoDetailController.cs", @@ -226,7 +257,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 15, "Title": "IDt_PalletStockInfoDetailRepository.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStorageBasicRepository\\Stock\\IDt_PalletStockInfoDetailRepository.cs", "RelativeDocumentMoniker": "WIDESEA_IStorageBasicRepository\\Stock\\IDt_PalletStockInfoDetailRepository.cs", @@ -238,7 +269,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 13, "Title": "BoxingInfoDetailController.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Basic\\BoxingInfoDetailController.cs", "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Basic\\BoxingInfoDetailController.cs", @@ -250,7 +281,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 14, "Title": "IDt_PalletStockInfoDetailService.cs", "DocumentMoniker": "E:\\\u5BBD\u6D77\\AGVChanPingXiangMu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStorageBasicService\\Stock\\IDt_PalletStockInfoDetailService.cs", "RelativeDocumentMoniker": "WIDESEA_IStorageBasicService\\Stock\\IDt_PalletStockInfoDetailService.cs", diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs" index b693e12..ea9d010 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs" @@ -117,6 +117,13 @@ Task<WebResponseContent> CompleteAsync(int taskNum); /// <summary> + /// 浜哄伐纭浠诲姟瀹屾垚 + /// </summary> + /// <param name="taskNm"></param> + /// <returns></returns> + WebResponseContent confirmTask(int taskNm); + + /// <summary> /// 璇锋眰鍏ュ簱 /// </summary> /// <param name="saveModel"></param> diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs" index 2f7e0c1..c031418 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs" @@ -17,7 +17,7 @@ public partial class ToAGVService { /// <summary> - /// AGV鍥炶皟鎺ュ彛 + /// AGV缁х画浠诲姟鎺ュ彛 /// </summary> /// <param name="taskRespon"></param> /// <returns></returns> @@ -38,23 +38,9 @@ var task = _taskRepository.QueryFirst(x => x.AGVtaskId == taskResult.task_id); if (task == null) throw new Exception($"鏈煡浠诲姟:{taskResult.task_id}"); - if (taskResult.result.ToLower() == "task_execute") //AGV寮�濮嬫墽琛� - { - task.TaskState = (int)TaskStatusEnum.Executing; - _taskRepository.Update(task); - } + var finishTask = _taskRepository.QueryFirst(x => x.Roadway == task.Roadway && x.TaskState == (int)TaskStatusEnum.Completed /*&& x.TargetAddress == task.TargetAddress*/); + if (finishTask != null) throw new Exception("褰撳墠浣嶇疆瀛樺湪鏈汉宸ョ‘璁ゅ畬鎴愪换鍔�,涓嶅厑璁告斁璐�"); - if (taskResult.result.ToLower() == "task_complete") //AGV浠诲姟缁撴潫 - { - task.TaskState = (int)TaskStatusEnum.Completed; - - WebResponseContent responseContent = _taskService.CompleteAsync((int)task.TaskNum).Result; - if (!responseContent.Status) - { - throw new Exception(responseContent.Message); - } - //_taskRepository.Update(task); - } return content.OK(); } catch (Exception ex) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" index 6ed8638..d57a2d1 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" @@ -150,7 +150,8 @@ { var isLocationUpdate = await _locationRepository.UpdateDataAsync(loc); //鏇存柊搴撲綅 var isPalletHty = await _palletStockInfo_HtyRepository.AddDataAsync(stockInfo_Hty); //娣诲姞鍘嗗彶搴撳瓨璁板綍 - var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟 + //var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟 + await BaseDal.UpdateDataAsync(task); //鍙栨秷鍒犻櫎浠诲姟锛屾敼涓哄畬鎴愮姸鎬侊紱骞禬MS鐣岄潰鐢变汉宸ョ‘璁ゅ畬鎴� var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟 var isDelete = await _palletStockInfoRepository.DeleteDataAsync(stock); //鍒犻櫎搴撳瓨 await DeleteStockInfoDetailsAsync(stock.StockInfoDetails); //鍒犻櫎搴撳瓨鏄庣粏 diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" index f0812fe..10fd331 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" @@ -171,4 +171,25 @@ #endregion 鑾峰彇璐т綅 #endregion 搴撲綅鍒嗛厤 + public WebResponseContent confirmTask(int taskNum) + { + WebResponseContent content = new WebResponseContent(); + try + { + var taskInfo = BaseDal.QueryFirst(x => x.TaskNum == taskNum); + if (taskInfo != null) + { + BaseDal.DeleteData(taskInfo); + } + + content.OK("纭瀹屾垚"); + } + catch (Exception ex) + { + content.Error($"纭寮傚父:{ex.Message}"); + } + + return content; + } + } \ No newline at end of file diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs" index 91186ac..d6e191a 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs" @@ -39,11 +39,11 @@ /// </summary> /// <param name="saveModel">浠诲姟鍙�</param> /// <returns>鎴愬姛鎴栧け璐�</returns> - //[HttpGet, Route("CompleteTaskByStation"), AllowAnonymous] - //public async Task<WebResponseContent> CompleteTaskByStation(int taskNum) - //{ - // return await _taskService.CompleteTaskByStation(taskNum); - //} + [HttpGet, Route("confirmTask"), AllowAnonymous] + public WebResponseContent confirmTask(int taskNum) + { + return _taskService.confirmTask(taskNum); + } /// <summary> /// 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴� -- Gitblit v1.9.3