From 1529f573995edae406968bb7527377d18a9664c8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 十二月 2024 10:33:28 +0800
Subject: [PATCH] 修改表格样式

---
 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