From 5a8616e1b51f7ac0ca5972f3f773ef22c3579fdd Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 13 三月 2026 14:10:47 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js | 2
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2
src/main/webapp/static/js/saas/locDetl.js | 2
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 144 +++++++++++++++++++++---------------------------
src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js | 2
6 files changed, 68 insertions(+), 86 deletions(-)
diff --git a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
index 7640c3d..7d6ede4 100644
--- a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
+++ b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
@@ -49,7 +49,7 @@
,{field: 'threeCode', align: 'center',title: ''}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'suppCode', align: 'center',title: ''}
- ,{field: 'beBatch', align: 'center',title: ''}
+ // ,{field: 'beBatch', align: 'center',title: ''}
,{field: 'deadTime', align: 'center',title: ''}
,{field: 'deadWarn', align: 'center',title: ''}
,{field: 'source', align: 'center',title: ''}
diff --git a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
index 5abe697..0a1123f 100644
--- a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
+++ b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
@@ -50,7 +50,7 @@
,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'}
+ // ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�'}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
,{field: 'source$', align: 'center',title: '鍒惰喘'}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index c9b5b73..a594802 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -28,7 +28,7 @@
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'standby1', align: 'center',title: 'po', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ // ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 45fbbb1..d3d48f6 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -29,7 +29,7 @@
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ // ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index 353a1b2..7b87094 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -284,6 +284,7 @@
</el-table-column>
<el-table-column prop="anfme" label="erp涓嬪彂鏁伴噺" min-width="80" align="center"></el-table-column>
<el-table-column prop="sortingAnfme" label="寰呬笅鍙戞暟閲�" min-width="80" align="center"></el-table-column>
+ <el-table-column prop="beBatch" label="宸蹭笅鍙戞暟閲�" min-width="80" align="center"></el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100" align="center" :formatter="formatStatusB"></el-table-column>-->
<el-table-column prop="inspect" label="鐘舵��" min-width="100" align="center" :formatter="formatStatusC"></el-table-column>
<!-- 淇敼涓哄垹闄ゅ垪 -->
@@ -860,89 +861,70 @@
confirmReport(orderNo, done) {
this.reportLoading = true;
- // // 鏀堕泦瑕佷笂鎶ョ殑鏁版嵁
- // const reportData = this.tableDataB.map(item => {
- // const itemKey = this.getItemKey(item);
- // return {
- // orderNo: groupOrderNo, // 缁勮揣鍗曞彿
- // matnr: item.matnr, // 鍟嗗搧缂栧彿
- // maktx: item.maktx, // 鍟嗗搧鍚嶇О
- // standby1: item.standby1, // 瀹㈡埛PO
- // standby2: item.standby2, // UPC
- // standby3: item.standby3, // 瀹㈡埛SKU
- // boxType3: item.boxType3, // 閲囪喘鍗曞彿
- // anfme: this.modifiedQuantities[itemKey] || item.anfme, // 鏁伴噺(浣跨敤淇敼鍚庣殑鏁伴噺)
- // erpAnfme: item.erpAnfme, // ERP涓嬫灦鏁伴噺
- // status: item.status, // 鐘舵��
- // batch: item.batch, // 绠卞彿
- // // 鍏朵粬蹇呰鍙傛暟
- // modified: this.modifiedQuantities[itemKey] !== undefined // 鏍囪鏄惁淇敼
- // };
- // });
- //
- // // 鏀堕泦鍒犻櫎璁板綍
- // const deleteData = this.deletedRecords.map(record => ({
- // orderNo: groupOrderNo,
- // matnr: record.matnr,
- // maktx: record.maktx,
- // standby1: record.standby1,
- // standby2: record.standby2,
- // standby3: record.standby3,
- // boxType3: record.boxType3,
- // anfme: record.anfme,
- // erpAnfme: record.erpAnfme,
- // status: record.status,
- // batch: record.batch,
- // deleteTime: record.deleteTime
- // }));
- //
- // // 鏋勫缓鎻愪氦鏁版嵁
- // const submitData = {
- // orderNo: groupOrderNo,
- // details: reportData,
- // deletedDetails: deleteData,
- // totalCount: reportData.length,
- // modifiedCount: Object.keys(this.modifiedQuantities).length,
- // deletedCount: deleteData.length
- // };
+ // 鍏堝皢姣忔潯鏄庣粏鐨� 寰呬笅鍙戞暟閲� 鍐欏叆 beBatch 瀛楁
+ const updates = (this.tableDataB || []).map(item => {
+ const beBatchVal = Math.floor(parseFloat(item.sortingAnfme || 0));
+ return new Promise((resolve) => {
+ $.ajax({
+ url: baseUrl + "/order/pakin/orderDetl/update/auth",
+ headers: { 'token': localStorage.getItem('token') },
+ data: {
+ id: item.id,
+ beBatch: beBatchVal
+ },
+ method: 'POST',
+ success: (res) => {
+ if (res.code === 200 || res.success) {
+ this.$set(item, 'beBatch', beBatchVal);
+ resolve({ ok: true });
+ } else {
+ resolve({ ok: false, msg: res.msg || '鏇存柊澶辫触' });
+ }
+ },
+ error: () => resolve({ ok: false, msg: '缃戠粶寮傚父' })
+ });
+ });
+ });
- // 璋冪敤鍚庡彴API涓婃姤鏁版嵁
- $.ajax({
- url: baseUrl + "/order/pakin/actual/shipment/order/report/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- orderNo: orderNo // 浼犻�掕鍗曞彿
- },
- method: 'POST',
- success: (res) => {
+ Promise.all(updates).then(results => {
+ const failed = results.find(r => !r.ok);
+ if (failed) {
this.reportLoading = false;
- if (typeof done === 'function') {
- done();
- }
- if (res.code === 200 || res.success) {
- this.$message({
- message: `璁㈠崟鍙� ${orderNo} 涓嬪彂鎴愬姛`,
- type: 'success',
- duration: 5000,
- dangerouslyUseHTMLString: true
- });
- // 涓嬪彂鎴愬姛鍚庡叧闂脊绐楀苟鍒锋柊鏁版嵁
- setTimeout(() => {
- this.closeDetailDialog();
- this.getTableDataA(); // 鍒锋柊涓昏〃鏁版嵁
- }, 1500);
- } else {
- this.$message.error(res.msg || '涓嬪彂澶辫触');
- }
- },
- error: (error) => {
- this.reportLoading = false;
- if (typeof done === 'function') {
- done();
- }
- console.error('涓嬪彂澶辫触:', error);
- this.$message.error('涓嬪彂澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
+ if (typeof done === 'function') done();
+ this.$message.error(failed.msg || '鍚屾beBatch澶辫触');
+ return;
}
+ // 鍚屾瀹屾垚鍚庤皟鐢ㄥ悗鍙癆PI杩涜涓嬪彂
+ $.ajax({
+ url: baseUrl + "/order/pakin/actual/shipment/order/report/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: { orderNo: orderNo },
+ method: 'POST',
+ success: (res) => {
+ this.reportLoading = false;
+ if (typeof done === 'function') done();
+ if (res.code === 200 || res.success) {
+ this.$message({
+ message: `璁㈠崟鍙� ${orderNo} 涓嬪彂鎴愬姛`,
+ type: 'success',
+ duration: 5000,
+ dangerouslyUseHTMLString: true
+ });
+ setTimeout(() => {
+ this.closeDetailDialog();
+ this.getTableDataA();
+ }, 1500);
+ } else {
+ this.$message.error(res.msg || '涓嬪彂澶辫触');
+ }
+ },
+ error: (error) => {
+ this.reportLoading = false;
+ if (typeof done === 'function') done();
+ console.error('涓嬪彂澶辫触:', error);
+ this.$message.error('涓嬪彂澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
+ }
+ });
});
},
@@ -1162,4 +1144,4 @@
});
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index ea97a1d..1f9a378 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,7 +64,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="SKU" autocomplete="off">
+ <input class="layui-input" type="text" name="standby3" placeholder="SKU" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1