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/java/com/zy/asrs/entity/CheckOrderDetl.java | 4 ++++
src/main/java/com/zy/asrs/controller/CheckOrderController.java | 4 +++-
src/main/webapp/static/js/checkOrder/checkOrder.js | 35 ++++++++++++++++++++++-------------
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckOrderController.java b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
index 7819cd5..c677b88 100644
--- a/src/main/java/com/zy/asrs/controller/CheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
@@ -112,6 +112,7 @@
for (LocDetl locDetl : param.getLocDetlList()) {
CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
checkOrderDetl.sync(locDetl);
+ checkOrderDetl.setLocDetlId(locDetl.getId());
checkOrderDetl.setOrderId(checkOrder.getId());
checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
checkOrderDetl.setMatnr(locDetl.getMatnr());
@@ -157,6 +158,7 @@
for (CheckOrderDetl checkOrderDetl : param.getCheckOrderDetls()) {
CheckOrderDetl checkOrderDetl1 = new CheckOrderDetl();
checkOrderDetl1.sync(checkOrderDetl);
+ checkOrderDetl1.setLocDetlId(checkOrderDetl.getLocDetlId()==null?checkOrderDetl.getId():checkOrderDetl.getLocDetlId());
checkOrderDetl1.setOrderId(checkOrder.getId());
checkOrderDetl1.setOrderNo(checkOrder.getOrderNo());
checkOrderDetl1.setMatnr(checkOrderDetl.getMatnr());
@@ -167,7 +169,7 @@
checkOrderDetl1.setQty(checkOrderDetl.getQty());
checkOrderDetl1.setWorkQty(checkOrderDetl.getWorkQty());
checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
- checkOrderDetl.setZpallet(checkOrderDetl.getZpallet());
+ checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
if (!checkOrderDetlService.insert(checkOrderDetl1)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
diff --git a/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
index d4dde36..d1672f4 100644
--- a/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
@@ -50,6 +50,10 @@
@TableField("order_id")
private Long orderId;
+ @ApiModelProperty(value= "搴撳瓨鏄庣粏id")
+ @TableField("loc_detl_id")
+ private Long locDetlId;
+
/**
* 鍗曟嵁缂栧彿
*/
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