From 68d7be0814e89ef811c2e7c435dff7af64ea60c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 十二月 2024 10:11:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 5f9db53..d78d351 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -884,9 +884,10 @@
Set<String> processedProcessIds = new HashSet<>();
for (FinishedOperateLog finishedOperateLog : finishedOperateLogList) {
String OrderId = finishedOperateLog.getOrderId();
+ String Remarks = finishedOperateLog.getRemarks();
// 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� OrderId锛屽鏋滃鐞嗚繃鍒欒烦杩�
- if (processedProcessIds.contains(OrderId)) {
+ if (processedProcessIds.contains(OrderId) && processedProcessIds.contains(Remarks)) {
continue;
}
@@ -899,6 +900,7 @@
list.add(itemmap);
processedProcessIds.add(OrderId);
+ processedProcessIds.add(Remarks);
}
}
map.put("data", list);
--
Gitblit v1.8.0