From 19c66ba052a7fb26c4d27deaa75ae46479eee342 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 01 四月 2024 10:36:44 +0800
Subject: [PATCH] 优化堆垛逻辑和入库逻辑
---
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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_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 bb30c47..513b593 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"
@@ -32,33 +32,39 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({"agv_tasknum":"","agv_materielid":"","agv_createtime":"","agv_taskstate":"","agv_fromaddress":"","agv_toaddress":"","agv_operatetype":"","agv_barcode":"","agv_materbarcode":""});
- const searchFormOptions = ref([[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"},{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"select"}],[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"},{"dataKey":"Taskstates","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}],[{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}]]);
+ 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":"杞﹁疆SN鍙�","field":"bindSN","type":"like"},{"dataKey":"operatetypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}]
+ ]);
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'},
{field:'agv_tasknum',title:'浠诲姟缂栧彿',type:'string',sort:true,width:110,require:true,align:'left',sort:true},
{field:'agv_materielid',title:'鐗╂枡绫诲瀷',type:'string',width:110,require:true,align:'left'},
- {field:'agv_qty',title:'鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',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_taskstate',title:'浠诲姟鐘舵��',type:'string',bind:{ key:'Taskstates',data:[]},width:110,require:true,align:'left'},
- {field:'agv_tasktype',title:'浠诲姟绫诲瀷',type:'string',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_operatetype',title:'鎿嶄綔绫诲瀷',type:'string',bind:{ key:'Taskstates',data:[]},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:'bindSN',title:'杞﹁疆SN鍙�',type:'string',width:110,align:'left'},
+ {field:'agv_qty',title:'鏁伴噺',type:'int',width:110,require:true,align:'left'},
+ {field:'agv_taskstate',title:'浠诲姟鐘舵��',type:'string',bind:{ key:'Taskstates',data:[]},width:110,require:true,align:'left'},
+ {field:'agv_tasktype',title:'浠诲姟绫诲瀷',type:'string',bind:{ key:'agv_tasktypes',data:[]},width:110,require:true,align:'left'},
+ {field:'agv_grade',title:'浠诲姟绛夌骇',bind:{ key:'task_grade',data:[]},type:'int',width:110,align:'left'},
+ {field:'agv_userid',title:'鍒涘缓鑰�',type:'string',width:110,align:'left'},
+ {field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',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_operatetype',title:'鎿嶄綔绫诲瀷',type:'string',bind:{ key:'operatetypes',data:[]},width:110,require:true,align:'left'},
{field:'agv_compeletor',title:'鎿嶄綔鑰�',type:'string',width:110,require:true,align:'left'},
{field:'agv_completedate',title:'鎿嶄綔鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'agv_grade',title:'浠诲姟绛夌骇',type:'int',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_code',title:'AGV缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'agv_worktype',title:'AGV宸ヤ綔绫诲瀷',type:'int',width:110,require:true,align:'left'},
- {field:'agv_materbarcode',title:'鐗╂枡鐮�',type:'string',width:110,align:'left'},
+ // {field:'agv_barcode',title:'鎵樼洏鐮�',type:'string',width:110,require:true,align:'left'},
+ // {field:'agv_code',title:'AGV缂栧彿',type:'string',width:110,require:true,align:'left'},
+ // {field:'agv_worktype',title:'AGV宸ヤ綔绫诲瀷',type:'int',width:110,require:true,align:'left'},
+ {field:'agv_materbarcode',title:'鐗╂枡缂栫爜',type:'string',width:110,align:'left'},
{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:'agv_remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'ID',title:'涓婚敭',type:'int',width:80,hidden:true,readonly:true,require:true,align:'left'}]);
+ {field:'agv_remark',title:'澶囨敞',type:'string',width:220,align:'left'}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
--
Gitblit v1.9.3