From e883d7e4bf057f7a2ed7cc001fe27083d82baa22 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 16 四月 2024 19:17:44 +0800
Subject: [PATCH] 优化NG下料位任务触发逻辑
---
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
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.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.vue"
index f495eaa..3904ac0 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.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.vue"
@@ -30,38 +30,56 @@
sortName: "ID"
});
const editFormFields = ref({"agv_fromaddress":"","agv_toaddress":"","agv_tasktype":"","agv_grades":"","agv_code":""});
- const editFormOptions = ref([[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"text","required":true}],
- [{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"text","required":true}],
- [{"dataKey":"task_grade","data":[],"title":"浠诲姟绛夌骇","required":true,"field":"agv_grade","type":"select"}],
- [{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","required":true,"field":"agv_tasktype","type":"select"}]
+ const editFormOptions = ref([[{
+ title: "NG涓嬫枡浣�",
+ required: false,
+ field: "agv_fromaddress",
+ type: "select",
+ data: [
+ { key: "X01001003", value: "1鍗曞厓NG涓嬫枡浣�" },
+ { key: "X02001003", value: "2鍗曞厓NG涓嬫枡浣�" },
+ { key: "X03001002", value: "3鍗曞厓NG涓嬫枡浣�" }
+ ]
+ },
+ // {"title":"NG涓嬫枡浣�","field":"agv_fromaddress","type":"text","required":true}
+ ],
+
+ // [{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"text","required":true}],
+ // [{"dataKey":"task_grade","data":[],"title":"浠诲姟绛夌骇","required":true,"field":"agv_grade","type":"select"}],
+ // [{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","required":true,"field":"agv_tasktype","type":"select"}]
// [{"dataKey":"agv_code","data":[],"title":"AGV缂栧彿","required":true,"field":"agv_code","type":"select"}]
]);
- const searchFormFields = ref({"agv_tasknum":"","agv_fromaddress":"","agv_toaddress":"","agv_code":[],"agv_taskstate":[],"agv_materielid":"","agv_createtime":"","agv_barcode":"","agv_materbarcode":""});
- const searchFormOptions = ref([[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"}],[{"dataKey":"agv_code","data":[],"title":"AGV缂栧彿","field":"agv_code","type":"selectList"},{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"selectList"},{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"}],[{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"},{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"}]]);
+ const searchFormFields = ref({"agv_tasknum":"","agv_fromaddress":"","agv_toaddress":"","agv_tasktype":[],"agv_taskstate":[],"agv_materielid":"","agv_createtime":"","agv_barcode":"","agv_materbarcode":""});
+ const searchFormOptions = ref([
+ [{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"}],
+ [{"title":"宸ュ崟鍙�","field":"jobID","type":"like"},{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","field":"agv_tasktype","type":"selectList"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}],
+ // [{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"},{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"}]
+ ]);
const columns = ref([{field:'agv_id',title:'浠诲姟Id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'agv_tasknum',title:'浠诲姟缂栧彿',type:'string',sort:true,width:110,require:true,align:'left',sort:true},
+ {field:'agv_tasknum',title:'浠诲姟缂栧彿',type:'string',sort:true,width:110,require:true,align:'left'},
{field:'agv_fromaddress',title:'璧风偣鍦板潃',type:'string',width:110,align:'left'},
{field:'agv_toaddress',title:'缁堢偣鍦板潃',type:'string',width:110,align:'left'},
- {field:'agv_code',title:'AGV缂栧彿',type:'string',bind:{ key:'agv_code',data:[]},width:110,require:true,align:'left'},
+ // {field:'agv_code',title:'AGV缂栧彿',type:'string',bind:{ key:'agv_code',data:[]},width:110,require:true,align:'left'},
{field:'agv_taskstate',title:'浠诲姟鐘舵��',type:'string',bind:{ key:'Taskstates',data:[]},width:110,require:true,align:'left'},
- {field:'agv_worktype',title:'AGV宸ヤ綔绫诲瀷',type:'int',width:110,align:'left'},
- {field:'agv_materielid',title:'鐗╂枡绫诲瀷',type:'string',width:110,require:true,align:'left'},
+ {field:'jobID',title:'宸ヤ綔浠ゅ彿',type:'string',width:160,align:'left'},
+ // {field:'agv_materielid',title:'鐗╂枡绫诲瀷',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_materielid',title:'鍥惧彿',type:'string',width:110,require:true,align:'left'},
{field:'bindSN',title:'杞﹁疆SN鍙�',type:'string',width:110,align:'left'},
- {field:'agv_qty',title:'鏁伴噺',type:'int',width:110,require:true,align:'left'},
- {field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',sort:true,width:150,require:true,align:'left',sort:true},
- {field:'agv_realesstime',title:'鎵ц鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
- {field:'agv_finishedtime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'agv_qty',title:'鏁伴噺',type:'int',width:60,require:true,align:'left'},
+ // {field:'agv_finishedtime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'agv_tasktype',title:'浠诲姟绫诲瀷',type:'string',bind:{ key:'agv_tasktypes',data:[]},width:110,require:true,align:'left'},
- {field:'agv_remark',title:'澶囨敞',type:'string',width:120,align:'left'},
{field:'agv_grade',title:'浠诲姟绛夌骇',type:'int',bind:{ key:'task_grade',data:[]},sort:true,width:110,align:'left'},
- {field:'agv_userid',title:'鍒涘缓鑰�',type:'string',width:110,align:'left'},
- {field:'agv_barcode',title:'鎵樼洏鐮�',type:'string',width:110,require:true,align:'left'},
- {field:'agv_materbarcode',title:'鐗╂枡鐮�',type:'string',width:110,align:'left'},
+ {field:'agv_TrayStatus',title:'鎵樼洏鐘舵��',type:'string',bind:{ key:'tray_status',data:[]},width:80,align:'left'},
+ {field:'agv_Traytype',title:'鎵樼洏绫诲瀷',type:'string',bind:{ key:'tray_types',data:[]},width:80,align:'left'},
+ {field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',sort:true,width:150,require:true,align:'left',sort:true},
+ {field:'agv_realesstime',title:'涓嬪彂鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'agv_executingBeginTime',title:'璧峰鐐规墽琛屼腑',type:'datetime',width:150,align:'left',sort:true},
{field:'agv_executingEndTime',title:'璧峰鐐瑰畬鎴�',type:'datetime',width:150,align:'left',sort:true},
{field:'agv_completeBeginTime',title:'鐩殑鐐规墽琛屼腑',type:'datetime',width:150,align:'left',sort:true},
- {field:'unitag',title:'unitag',type:'guid',width:110,align:'left'},
- {field:'ID',title:'涓婚敭',type:'int',width:80,hidden:true,readonly:true,require:true,align:'left'}]);
+ {field:'agv_userid',title:'鍒涘缓鑰�',type:'string',width:110,align:'left'},
+ {field:'agv_remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ // {field:'unitag',title:'unitag',type:'guid',width:110,align:'left'}
+ ]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
--
Gitblit v1.9.3