From f7359e4c48b19293798798f8226463519bcdd659 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 19 十二月 2024 11:08:56 +0800
Subject: [PATCH] 优化AGV工作处理及上报逻辑
---
src/main/webapp/static/js/agvBasDevp/basDevp.js | 76 ++++++++++----------------------------
1 files changed, 20 insertions(+), 56 deletions(-)
diff --git a/src/main/webapp/static/js/agvBasDevp/basDevp.js b/src/main/webapp/static/js/agvBasDevp/basDevp.js
index 75c55ac..fc55079 100644
--- a/src/main/webapp/static/js/agvBasDevp/basDevp.js
+++ b/src/main/webapp/static/js/agvBasDevp/basDevp.js
@@ -20,8 +20,7 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'stationCode', align: 'center',sort:true,title: '宸ヤ綔绔欑紪鍙�'}
- ,{field: 'devNo', align: 'center',sort:true,title: '宸ヤ綔浣嶇紪鍙�',width:150}
+ ,{field: 'devNo', align: 'center',sort:true,title: '鎺ラ┏浣嶅彿',width:150}
// ,{field: 'decDesc', align: 'center',title: '璁惧鎻忚堪'}
// ,{field: 'devMk', align: 'center',title: '澶囨敞'}
,{field: 'inEnable', align: 'center',title: '鍙叆', templet:function(row){
@@ -36,57 +35,19 @@
html += ">";
return html;
}}
- ,{field: 'autoing', align: 'center',title: '鑷姩', templet:function(row){
+ ,{field: 'locSts$', align: 'center',title: '鎺ラ┏浣嶇姸鎬�'}
+ //,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', edit:true, style:'color: blue;font-weight: bold'}
+ ,{field: 'floor', align: 'center',title: '妤�'}
+ //,{field: 'locType1$', align: 'center',title: '楂樹綆'}
+ ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
+ ,{field: 'locType1$', align: 'center',title: '鎺ラ┏浣嶇被鍨�'}
+ ,{field: 'locType2', align: 'center',title: "璐ф灦绫诲瀷"}
+ ,{field: 'autoing', align: 'center',title: '鑷姩璋冩嫧', templet:function(row){
var html = "<input value='autoing' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.autoing === 'Y'){html += " checked ";}
html += ">";
return html;
}}
- // ,{field: 'loading', align: 'center',title: '鏈夌墿', templet:function(row){
- // var html = "<input value='loading' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.loading === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'canining', align: 'center',title: '鑳藉叆', templet:function(row){
- // var html = "<input value='canining' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.canining === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'canouting', align: 'center',title: '鑳藉嚭', templet:function(row){
- // var html = "<input value='canouting' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.canouting === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'fronting', align: 'center',title: ''}
- // ,{field: 'rearing', align: 'center',title: ''}
- // ,{field: 'uping', align: 'center',title: ''}
- // ,{field: 'downing', align: 'center',title: ''}
- // ,{field: 'inreq1', align: 'center',title: '闇�姹�1', templet:function(row){
- // var html = "<input value='inreq1' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.inreq1 === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- ,{field: 'cacheShelves', align: 'center',title: '鏄惁缂撳瓨璐ф灦', templet:function(row){
- var html = "<input value='cacheShelves' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.cacheShelves === 'Y'){html += " checked ";}
- html += ">";
- return html;
- }}
- ,{field: 'locSts$', align: 'center',title: '璐т綅鐘舵��'}
- //,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', edit:true, style:'color: blue;font-weight: bold'}
- ,{field: 'floor', align: 'center',title: '妤�'}
- //,{field: 'locType1$', align: 'center',title: '楂樹綆'}
- ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
- // ,{field: 'inQty', align: 'center',title: '鍏ュ簱鏆傚瓨'}
- // ,{field: 'row1', align: 'center',title: ''}
- // ,{field: 'ioTime$', align: 'center',title: ''}
- // ,{field: 'area', align: 'center',title: ''}
- // ,{field: 'inOk', align: 'center',title: ''}
- // ,{field: 'outOk', align: 'center',title: ''}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
@@ -385,7 +346,7 @@
layer.msg("姝ょ珯鐐圭殑鐘舵�佷笉瀛樺湪鐗╂枡");
return;
}
- locDetlToLayer(data.barcode);
+ locDetlToLayer(data.devNo,data.barcode);
break;
case 'unbind':
// locDetl(data.locNo);
@@ -393,7 +354,7 @@
layer.msg("姝ょ珯鐐规殏鏈粦瀹氫换浣曟潯鐮�");
return;
}
- layer.confirm('纭畾瑙ｇ粦'+(data.devNo)+'绔欑偣鐨勬墭鐩樼爜锛�', function(){
+ layer.confirm('纭畾瑙ｇ粦'+(data.devNo)+'绔欑偣鐨勮揣鏋剁爜锛�', function(){
$.ajax({
url: baseUrl+"/agv/basDevp/unbind/auth",
headers: {'token': localStorage.getItem('token')},
@@ -515,9 +476,9 @@
cacheShelves: $('#cacheShelves').val(),
decDesc: $('#decDesc').val(),
devMk: $('#devMk').val(),
- inEnable: $('#inEnable').val(),
- outEnable: $('#outEnable').val(),
- autoing: $('#autoing').val(),
+ inEnable: $('#inEnable').next().hasClass('layui-form-checked') ? "Y" : "N",
+ outEnable: $('#outEnable').next().hasClass('layui-form-checked') ? "Y" : "N",
+ autoing: $('#autoing').next().hasClass('layui-form-checked') ? "Y" : "N",
loading: $('#loading').val(),
canining: $('#canining').val(),
canouting: $('#canouting').val(),
@@ -546,9 +507,11 @@
maxWt: $('#maxWt').val(),
grossWt: $('#grossWt').val(),
cartPos: $('#cartPos').val(),
+ floor: $('#floor').val(),
+ locType1: $('#locType1').val(),
+ locType2: $('#locType2').val(),
};
- console.log(data);
$.ajax({
url: baseUrl+"/agv/basDevp/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
@@ -572,8 +535,9 @@
}
// iframe鐗╂枡璇︽儏
- function locDetlToLayer(val) {
- barcode = val;
+ function locDetlToLayer(val1,val2) {
+ devNo = val1;
+ barcode = val2;
layer.open({
type: 2,
title: '绔欑偣鏄庣粏',
--
Gitblit v1.9.1