From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 10:20:25 +0800
Subject: [PATCH] java 优化库位检索逻辑，添加AGV工作明细服务，修复定时任务
---
src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js | 118 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js b/src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js
index 1622be7..f4a9663 100644
--- a/src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js
+++ b/src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js
@@ -1,29 +1,30 @@
var pageCurr;
var pageLimit;
+
function getCol() {
var cols = [
- {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿','width': 180}
+ {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�'}
+ , {field: 'modiTime$', align: 'center', title: '宸ヤ綔鏃堕棿', 'width': 180}
];
cols.push(
//{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
- {field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '宸ヤ綔绫诲瀷'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'});
- arrRemove(detlCols, 'field', 'zpallet');
+ {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��'}
+ , {field: 'ioType$', align: 'center', title: '宸ヤ綔绫诲瀷'}
+ , {field: 'locNo', align: 'center', title: '鐩爣搴撲綅'}
+ // ,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
+ // ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
+ , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�'});
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
+ cols.push({field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
+ , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
)
return cols;
}
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
+}).use(['table', 'laydate', 'form', 'admin'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -35,7 +36,7 @@
tableIns = table.render({
elem: '#wrkMastDetlLog',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMastDetlLog/list/auth',
+ url: baseUrl + '/wrkMastDetlLog/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -105,25 +106,31 @@
'count': res.data.total,
'data': res.data.records,
'limit': res.data.size,
+ 'countData': res.count
}
},
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;
- pageLimit=res.limit;
+ pageCurr = curr;
+ pageLimit = res.limit;
limit();
+ var d ="褰撻〉鎬绘暟閲�:";
+ Object.keys(res.countData).forEach(key => {
+ d = d + key + "锛�" + res.countData[key]+"; ";
+ });
+ $("#countData").text(d);
}
});
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(wrkMastDetlLog)', 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;
@@ -137,23 +144,23 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(wrkMastDetlLog)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
+ switch (obj.event) {
case 'addData':
showEditModel();
break;
case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ admin.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);
@@ -161,11 +168,11 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
var param = {
@@ -176,18 +183,18 @@
'size': pageLimit
};
$.ajax({
- url: baseUrl+"/wrkMastDetlLog/export/auth",
+ url: baseUrl + "/wrkMastDetlLog/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, {icon: 2})
}
@@ -199,7 +206,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(wrkMastDetlLog)', function(obj){
+ table.on('tool(wrkMastDetlLog)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -224,19 +231,19 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/wrkMastDetlLog/"+(mData?'update':'add')+"/auth",
+ url: baseUrl + "/wrkMastDetlLog/" + (mData ? 'update' : 'add') + "/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -258,17 +265,17 @@
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/wrkMastDetlLog/delete/auth",
+ url: baseUrl + "/wrkMastDetlLog/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg(res.msg, {icon: 1});
tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2});
}
@@ -295,43 +302,44 @@
setTimeout(function () {
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ , type: 'datetime'
+ , range: true
});
layDate.render({
elem: '#ioTime\\$',
type: 'datetime',
- value: data!==undefined?data['ioTime\\$']:null
+ value: data !== undefined ? data['ioTime\\$'] : null
});
layDate.render({
elem: '#modiTime\\$',
type: 'datetime',
- value: data!==undefined?data['modiTime\\$']:null
+ value: data !== undefined ? data['modiTime\\$'] : null
});
layDate.render({
elem: '#appeTime\\$',
type: 'datetime',
- value: data!==undefined?data['appeTime\\$']:null
+ value: data !== undefined ? data['appeTime\\$'] : null
});
}, 300);
}
+
layDateRender();
});
// 鍏抽棴鍔ㄤ綔
-$(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;
});
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
}
--
Gitblit v1.9.1