From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/webapp/static/js/task/task.js | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/js/task/task.js b/src/main/webapp/static/js/task/task.js
index 6235ea8..df4e346 100644
--- a/src/main/webapp/static/js/task/task.js
+++ b/src/main/webapp/static/js/task/task.js
@@ -22,20 +22,23 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 105}
- , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', width: 160}
+ , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true}
+ , {field: 'taskNo', align: 'center', title: 'AGV浠诲姟鍙�', sort: true}
+ // , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', width: 160}
, {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��', width: 150}
, {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�', width: 150}
, {field: 'ioPri', align: 'center', title: '浼樺厛绾�', width: 80}
, {field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷'}
, {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�', hide: true}
- , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'}
- , {field: 'staNo$', align: 'center', title: '鐩爣绔�', width: 120}
- , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120}
- , {field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120}
+ , {field: 'sourceStaNo', align: 'center', title: '婧愮珯'}
+ , {field: 'staNo', align: 'center', title: '鐩爣绔�', width: 120}
+ // , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120}
+ // , {field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120}
, {field: 'barcode', align: 'center', title: '鏉＄爜', width: 110}
- , {field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true}
- , {field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true}
+ // , {field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true}
+ // , {field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true}
+ , {field: 'modiUser$', align: 'center', title: '鍒涘缓浜哄憳'}
+ , {field: 'appeTime$', align: 'center', title: '鍒涘缓鏃堕棿'}
, {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true, width: 160}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 200}
@@ -171,7 +174,7 @@
title: '宸ヤ綔鍙凤細' + data.wrkNo,
shadeClose: true
}, function () {
- http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
+ http.post(baseUrl + "/task/control", {workNo: data.wrkNo, type: 2}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
@@ -182,7 +185,7 @@
title: '宸ヤ綔鍙凤細' + data.wrkNo,
shadeClose: true
}, function () {
- http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
+ http.post(baseUrl + "/task/control", {workNo: data.wrkNo, type: 2}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
@@ -193,7 +196,7 @@
// 鎷ｆ枡鍏ュ簱
case 'pick':
layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
- http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 3}, function (res) {
+ http.post(baseUrl + "/task/control", {workNo: data.wrkNo, type: 3}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
--
Gitblit v1.9.1