From bdf8e9ee1711d3dde0f060ec4eaf20b8a9543ecf Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 23 六月 2024 18:40:58 +0800
Subject: [PATCH] 优化任务完成逻辑
---
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue | 2 +-
代码管理/WMS/WMS_Client/package.json | 6 +++---
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/package.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/package.json"
index 7d93292..2e83fbf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/package.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/package.json"
@@ -3,11 +3,11 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "serve": "vue-cli-service serve",
- "build": "vue-cli-service build",
+ "serve": " SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+ "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint"
- },
+},
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@microsoft/signalr": "^6.0.4",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
index 020ebe9..51f9b8a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
@@ -36,7 +36,7 @@
[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"}],
[{"title":"宸ヤ綔浠ゅ彿","field":"jobID","type":"like"},{"title":"鍥惧彿","field":"agv_materielid","type":"like"},{"title":"杞﹁疆SN鍙�","field":"bindSN","type":"like"}],
[{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"selectList"},{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","field":"agv_tasktype","type":"selectList"},{"dataKey":"operatetypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}],
- [{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"date"},{"title":"瀹屾垚鏃堕棿","field":"agv_finishedtime","type":"date"},{"title":"鎿嶄綔鏃堕棿","field":"agv_completedate","type":"date"}]
+ [{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"},{"title":"瀹屾垚鏃堕棿","field":"agv_finishedtime","type":"datetime"},{"title":"鎿嶄綔鏃堕棿","field":"agv_completedate","type":"datetime"}]
]);
const columns = ref([{field:'hty_pkid',title:'鍘嗗彶浠诲姟ID',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'agv_id',title:'浠诲姟ID',type:'guid',width:110,hidden:true,require:true,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
index acc2855..f7996da 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
@@ -79,11 +79,10 @@
remark = remark + "缁堢偣宸插畬鎴�";
task.agv_finishedtime = DateTime.Now;
+ HandleTask.Updateinventory(task);
#region 鍚屾MES鍑哄叆搴撲俊鎭�
HandleTask_Mes.UploadMESInfo(task);
#endregion
-
- HandleTask.Updateinventory(task);
HandleTask.AutoUpdateHCJState(task);
HandleTask.AddHtyTask(task);
}
--
Gitblit v1.9.3