From e58e9ba5347a681cd535115c1f83e4788f39a224 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 12 九月 2025 15:09:09 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/common/model/OutLocDto.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 77e050b..2282503 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -47,10 +47,18 @@
                 if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
                     continue;
                 }
-                if (next.getCount() > locDetl.getAnfme()) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+                if (!Cools.isEmpty(locDetl.getAnfme())) {
+                    if (next.getCount() > locDetl.getAnfme()) {
+                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+                    }
                 }
-                if (next.getCount().equals(locDetl.getAnfme())) {
+                if (!locDetl.getMatnr().equalsIgnoreCase("绌虹")){
+                    if (next.getCount().equals(locDetl.getAnfme())) {
+                        sameNumber++;
+                        iterator.remove();
+                        break;
+                    }
+                }else {
                     sameNumber++;
                     iterator.remove();
                     break;

--
Gitblit v1.9.1