From 74951023b54f1789d1244fe923219d467487d771 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期一, 26 一月 2026 09:03:42 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/webapp/static/js/task/task.js | 94 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/js/task/task.js b/src/main/webapp/static/js/task/task.js
index 618cef1..a9620a7 100644
--- a/src/main/webapp/static/js/task/task.js
+++ b/src/main/webapp/static/js/task/task.js
@@ -22,18 +22,18 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 115}
+ , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 105}
, {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: '浼樺厛绾�'}
- , {field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷'}
+ , {field: 'ioPri', align: 'center', title: '浼樺厛绾�', width: 80}
+ , {field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷', width: 120}
, {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�', hide: true}
- , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'}
- , {field: 'staNo$', align: 'center', title: '鐩爣绔�'}
- , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�'}
- , {field: 'locNo', align: 'center', title: '鐩爣搴撲綅'}
- , {field: 'barcode', align: 'center', title: '鏉＄爜'}
+ , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯', width: 120}
+ , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120}
+ , {field: 'staNo$', 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: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
@@ -171,7 +171,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 +182,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 +193,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);
})
@@ -220,6 +220,10 @@
shadeClose: true
}, function () {
});
+ break;
+ // 鍛煎彨AGV
+ case 'callAgv':
+ callAgvMove(data);
break;
}
});
@@ -318,6 +322,74 @@
layDateRender();
+ // 鍛煎彨AGV鎼繍
+ function callAgvMove(data) {
+ var defaultOrgSite = data.sourceStaNo || '';
+ var defaultTarSite = data.staNo || '';
+ var defaultBarcode = data.barcode || '';
+
+ layer.open({
+ type: 1,
+ title: '鍛煎彨AGV鎼繍 - 宸ヤ綔鍙凤細' + data.wrkNo,
+ area: ['450px', '400px'],
+ shadeClose: true,
+ content: '<form class="layui-form" style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label"><span style="color: red;">*</span>婧愮珯鐐癸細</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" name="orgSite" value="' + defaultOrgSite + '" placeholder="璇疯緭鍏ユ簮绔欑偣" class="layui-input" lay-verify="required">' +
+ '</div></div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label"><span style="color: red;">*</span>鐩爣绔欑偣锛�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" name="tarSite" value="' + defaultTarSite + '" placeholder="璇疯緭鍏ョ洰鏍囩珯鐐�" class="layui-input" lay-verify="required">' +
+ '</div></div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label"><span style="color: red;">*</span>鎵樼洏鐮侊細</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" name="barcode" value="' + defaultBarcode + '" placeholder="璇疯緭鍏ユ墭鐩樼爜" class="layui-input" lay-verify="required">' +
+ '</div></div>' +
+ '<div class="layui-form-item" style="text-align: center; margin-top: 30px;">' +
+ '<button class="layui-btn" lay-submit lay-filter="callAgvSubmit">纭鍛煎彨</button>' +
+ '<button type="button" class="layui-btn layui-btn-primary" onclick="layer.closeAll()">鍙栨秷</button>' +
+ '</div></form>',
+ success: function(layero, index) {
+ form.render();
+ form.on('submit(callAgvSubmit)', function(formData) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl + "/mobile/cache/agv/call",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ orgSite: formData.field.orgSite,
+ tarSite: formData.field.tarSite,
+ barcode: formData.field.barcode
+ }),
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function(res) {
+ layer.close(loadIndex);
+ if (res.code === 200) {
+ layer.close(index);
+ layer.msg('鍛煎彨AGV鎴愬姛', {icon: 1});
+ tableReload();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg || '鍛煎彨AGV澶辫触', {icon: 2});
+ }
+ },
+ error: function() {
+ layer.close(loadIndex);
+ layer.msg('缃戠粶璇锋眰澶辫触', {icon: 2});
+ }
+ });
+ return false;
+ });
+ }
+ });
+ }
+
});
// 鍏抽棴鍔ㄤ綔
--
Gitblit v1.9.1