From 887dbc46b49b57eedd03d2daeaa6c3f57c540f3f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 19 十一月 2025 09:17:20 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/checkOrder/checkOrder.js | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/static/js/checkOrder/checkOrder.js b/src/main/webapp/static/js/checkOrder/checkOrder.js
index a121b06..24eca2d 100644
--- a/src/main/webapp/static/js/checkOrder/checkOrder.js
+++ b/src/main/webapp/static/js/checkOrder/checkOrder.js
@@ -319,22 +319,31 @@
// 鍏ㄥ眬鍑芥暟锛岀敤浜庢帴鏀朵粠搴撳瓨鏌ヨ椤甸潰杩斿洖鐨勬暟鎹�
window.addCheckOrderTableData = function(data) {
// 澶勭悊閫変腑鐨勫簱瀛樻暟鎹�
+ var addedCount = 0;
+ var duplicateCount = 0;
for (var i = 0; i < data.length; i++) {
- // 娣诲姞鏂扮殑鏄庣粏鏁版嵁
- // xxDataList.push({
- // id: data[i].id || (Date.now() + '_' + i),
- // locNo: data[i].locNo,
- // matnr: data[i].matnr,
- // maktx: data[i].maktx,
- // batch: data[i].batch,
- // specs: data[i].specs,
- // anfme: data[i].anfme || 0,
- // workQty: 0,
- // memo: ''
- // });
- xxDataList.push({...data[i]})
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄧ浉鍚岀殑鍟嗗搧缂栫爜鍜屾壒鍙�
+ var isDuplicate = false;
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].locNo === data[i].locNo && xxDataList[j].matnr === data[i].matnr && xxDataList[j].batch === data[i].batch) {
+ isDuplicate = true;
+ duplicateCount++;
+ break;
+ }
+ }
+ // 濡傛灉涓嶉噸澶嶏紝鍒欐坊鍔犲埌鍒楄〃
+ if (!isDuplicate) {
+ xxDataList.push({...data[i]});
+ addedCount++;
+ }
}
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ // 鎻愮ず娣诲姞缁撴灉
+ if (duplicateCount > 0) {
+ layer.msg('鎴愬姛娣诲姞 ' + addedCount + ' 鏉℃暟鎹紝' + duplicateCount + ' 鏉￠噸澶嶆暟鎹凡蹇界暐', {icon: 1});
+ } else if (addedCount > 0) {
+ layer.msg('鎴愬姛娣诲姞 ' + addedCount + ' 鏉℃暟鎹�', {icon: 1});
+ }
};
$('#matAddBtnComment').click(function () {
--
Gitblit v1.9.1