From 7eb9b6f8c60a244e1a96597319c7b54963ba6612 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 07 一月 2025 09:03:09 +0800
Subject: [PATCH] 优化MES库存同步逻辑及AGV告警字段
---
src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js
index b9255a6..0a45078 100644
--- a/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js
@@ -1,23 +1,27 @@
var pageCurr;
+
function getCol() {
var cols = [
- {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+ {field: 'anfme', align: 'center', title: 'WMS搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+ , {field: 'anfme2', align: 'center', title: 'MES搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+ , {field: 'matnr', align: 'center', title: '缂栫爜'}
+ , {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
];
- arrRemove(detlCols, "field", "anfme");
- arrRemove(detlCols,"field","suppCode");
- arrRemove(detlCols, "field", "zpallet");
- arrRemove(detlCols, "field", "orderNo");
- arrRemove(detlCols, "field", "threeCode");
- arrRemove(detlCols, "field", "deadTime");
- arrRemove(detlCols, "field", "batch");
- cols.push.apply(cols, detlCols);
+ // arrRemove(detlCols, "field", "anfme");
+ // arrRemove(detlCols,"field","suppCode");
+ // arrRemove(detlCols, "field", "zpallet");
+ // arrRemove(detlCols, "field", "orderNo");
+ // arrRemove(detlCols, "field", "threeCode");
+ // arrRemove(detlCols, "field", "deadTime");
+ // arrRemove(detlCols, "field", "batch");
+ //cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
return cols;
}
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -28,7 +32,7 @@
tableIns = table.render({
elem: '#locDetlStatis',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/agv/locDetl/statis/auth',
+ url: baseUrl + '/agv/locDetl/statis/auth',
page: true,
limit: 20,
limits: [20, 30, 50, 100, 200, 500],
@@ -51,17 +55,17 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
res.data[_index][data.value] = 'Y';
- }else{
+ } else {
res.data[_index][data.value] = 'N';
}
});
@@ -69,9 +73,9 @@
* 鏄剧ず搴撳瓨鎬绘暟閲�
*/
$.ajax({
- url: baseUrl+"/agv/locDetl/count",
+ url: baseUrl + "/agv/locDetl/count",
headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
$("#countNum").text(res.data + '涓�');
@@ -84,7 +88,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locDetlStatis)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -96,9 +100,9 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -107,11 +111,11 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(locDetlStatis)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
case 'exportAll':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -119,7 +123,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -128,19 +132,19 @@
};
var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/agv/locDetl/statis/export",
+ url: baseUrl + "/agv/locDetl/statis/export",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.close(loadIndex);
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -149,9 +153,9 @@
});
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -159,7 +163,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -167,18 +171,18 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/agv/locDetl/export/auth",
+ url: baseUrl + "/agv/locDetl/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -190,7 +194,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locDetlStatis)', function(obj){
+ table.on('tool(locDetlStatis)', function (obj) {
var data = obj.data;
switch (obj.event) {
// 璇︽儏
@@ -202,11 +206,12 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
setFormVal(layer.getChildFrame('#detail', index), data, true);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
}
@@ -244,13 +249,13 @@
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
(child ? parent.tableIns : tableIns).reload({
@@ -260,14 +265,14 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
- curr: pageCurr-1
+ curr: pageCurr - 1
}
});
pageCurr -= 1;
@@ -279,13 +284,13 @@
function detailScreen(index) {
var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
+ var height = detail.height() + 60;
+ if (height > ($(window).height() * 0.9)) {
+ height = ($(window).height() * 0.8);
}
layer.style(index, {
// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
+ height: height + 'px'
});
}
--
Gitblit v1.9.1