From 42ba7926de5f21a2856e4c7b9c5ce148413b6cbe Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 13 九月 2025 12:54:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/model/OutLocDto.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 810abac..2282503 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -40,17 +40,25 @@
for (LocDetl locDetl : locDetls) {
Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator();
while (iterator.hasNext()) {
- LocDetl next = iterator.next().getLocDetl();
- if (!next.getMatnr().equals(locDetl.getMatnr())) {
+ LocDetlDto next = iterator.next();
+ if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) {
continue;
}
- if (!Cools.eq(next.getBatch(), locDetl.getBatch())) {
+ if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
continue;
}
- if (next.getAnfme() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ if (!Cools.isEmpty(locDetl.getAnfme())) {
+ if (next.getCount() > locDetl.getAnfme()) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
}
- if (next.getAnfme().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