From 1e6b4d88290ccd79b51bed3acb805750a0ea7d01 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 15:25:23 +0800
Subject: [PATCH] 记录输送线异常日志
---
src/main/webapp/static/js/locDetl/locDetl.js | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 101 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 90e8841..b70068b 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,16 +1,17 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {type: 'checkbox'},
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�', width: 100}
+ ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', width: 100, sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿',width: 110, sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 60}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', width: 100}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'model', align: 'center',title: '妗剁被鍨�'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
@@ -20,12 +21,13 @@
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: false}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍑�閲�'}
+ ,{field: 'manLength', align: 'center',title: '姣涢噸'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'volume', align: 'center',title: '缃愯閲�', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
@@ -35,12 +37,21 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
-
+ ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',hide: true,
+ templet: function(d) {
+ // 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
+ if (d.frozen$ === '宸插喕缁�') {
+ return '<span style="color: #34a8de;">' +d.frozen$ + '</span>';
+ } else {
+ return '<span">' +d.frozen$ + '</span>';
+ }
+ }}
];
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
)
return cols;
}
@@ -211,6 +222,78 @@
}
});
});
+ break;
+ // 鍐荤粨
+ case 'frozen':
+ let frozenData = checkStatus.data;
+ console.log(frozenData)
+ if (frozenData.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍐荤粨搴撳瓨鍚�?', function(){
+ let requestData = frozenData.map(obj => ({
+ locNo: obj.locNo,
+ matnr: obj.matnr,
+ batch: obj.batch
+ })
+ );
+ $.ajax({
+ url: baseUrl+"/locDetl/frozenInventory",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(requestData),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ // 瑙ｅ喕
+ case 'unfreeze':
+ let unfreezeData = checkStatus.data;
+ console.log(unfreezeData)
+ if (unfreezeData.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾瑙ｅ喕搴撳瓨鍚�?', function(){
+ let requestData = unfreezeData.map(obj => ({
+ locNo: obj.locNo,
+ matnr: obj.matnr,
+ batch: obj.batch
+ })
+ );
+ $.ajax({
+ url: baseUrl+"/locDetl/unfreezeInventory",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(requestData),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
break;
}
});
@@ -455,6 +538,11 @@
tableReload(false);
});
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
// 鏃堕棿閫夋嫨鍣�
layDate.render({
elem: '#modiTime\\$',
--
Gitblit v1.9.1