From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/static/js/order/out.js | 102 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 1ec550c..1ebda0a 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,17 +32,28 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '瑙勬牸', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '绠卞彿'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
+ // ,{field: 'matnr', align: 'center',title: '瑙勬牸', width: 160}
+ // ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ // ,{field: 'batch', align: 'center',title: '绠卞彿'}
+ // ,{field: 'specs', align: 'center',title: '鎺ュご'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'brand', align: 'center',title: '鍖呰缁勫彿'}
+ ,{field: 'supp', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
+ ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'finishStatus', align: 'center', title: '鏄惁瀹屾垚', templet: function(d){
+ if (d.qty === 0 && d.enableQty === 0) {
+ return '<span style="color:green;font-weight:bold;">瀹屾垚</span>';
+ } else {
+ return '<span style="color:red;">鏈畬鎴�</span>';
+ }
+ }}
+
+
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
+ // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ // ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
// ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
// ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
@@ -156,19 +167,28 @@
limit: Number.MAX_VALUE,
cellMinWidth: 100,
cols: [[
- // {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
- {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '绠卞彿', align: 'center'},
+ // {type: 'checkbox', merge: ['brand'],width: 100},
+ // {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+ {field: 'unit', title: '绠卞彿', align: 'center',hide:false},
{field: 'model', title: '鍗峰彿', align: 'center', hide: false},
- {field: 'specs', title: '鎺ュご', align: 'center'},
- {field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true},
- {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
- {field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
- {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
- {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {
+ field: 'threeCode',
+ align: 'center',
+ title: '鍚堟牸鍚�',
+ hide: false,
+ templet: function(d) {
+ return d.threeCode ? d.threeCode : '寰呭垽';
+ }
+ },
+ // {field: 'specs', title: '鎺ュご', align: 'center'},
+ {field: 'brand', align: 'center',title: '鍖呰缁勫彿', merge: true, hide: false},
+ // {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
+ // {field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
+ // {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ // {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
- // {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+ {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
// {type: 'checkbox', merge: ['locNo']},
]],
done: function (res) {
@@ -198,6 +218,52 @@
}
modifySta(stoPreTabData);
});
+ form.on('submit(checkModifySta)', function () {
+ if (!tableCache || tableCache.length === 0) {
+ layer.msg("娌℃湁鍙鐞嗙殑鏁版嵁", {icon: 7});
+ return false;
+ }
+
+ let updatedRows = [];
+
+ for (let i = 0; i < tableCache.length; i++) {
+ let row = tableCache[i];
+ let locNo = row.locNo;
+ if (!locNo || locNo.length < 2) continue;
+
+ let rowPrefix = parseInt(locNo.substring(0, 2), 10);
+ let newStaNo;
+
+ if (rowPrefix >= 17 && rowPrefix <= 24) {
+ newStaNo = 3092;
+ } else if (rowPrefix >= 9 && rowPrefix <= 16) {
+ newStaNo = 3102;
+ } else if (rowPrefix >= 1 && rowPrefix <= 8) {
+ newStaNo = 3095;
+ }
+
+ if (newStaNo) {
+ row.staNo = newStaNo;
+ updatedRows.push({index: i, staNo: newStaNo});
+ }
+ }
+
+ // 閲嶈浇琛ㄦ牸鏁版嵁
+ stoPreTabIdx.reload({data: tableCache});
+
+ // 鏇存柊涓嬫媺妗嗛鑹插拰鍊�
+ updatedRows.forEach(item => {
+ $('div[lay-id=stoPreTab] tr[data-index="' + item.index + '"] .order-sta-select').val(item.staNo);
+ });
+ layui.form.render('select');
+ updatedRows.forEach(item => {
+ $('div[lay-id=stoPreTab] tr[data-index="' + item.index + '"] .layui-select-title input').css("color", "blue");
+ });
+
+ layer.msg("鍑哄簱绔欑偣鍧囧垎宸插畬鎴�", {icon: 1});
+ return false;
+ });
+
// 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨
function modifySta(stoPreTabData) {
// 鍑哄簱绔欏彇浜ら泦
--
Gitblit v1.9.1