分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-06-23 bdf8e9ee1711d3dde0f060ec4eaf20b8a9543ecf
优化任务完成逻辑
已修改3个文件
11 ■■■■ 文件已修改
代码管理/WMS/WMS_Client/package.json 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/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",
´úÂë¹ÜÀí/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'},
´úÂë¹ÜÀí/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);
                }