From 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 二月 2025 08:15:58 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/common/model/OutLocDto.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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..3aea2f4 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -47,8 +47,17 @@
if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
continue;
}
+ if(!Cools.eq(next.getLocDetl().getSuppCode(),locDetl.getSuppCode())){
+ continue;
+ }
+ if(!Cools.eq(next.getLocDetl().getThreeCode(),locDetl.getThreeCode())){
+ continue;
+ }
+ if(!Cools.eq(next.getLocDetl().getDeadTime(),locDetl.getDeadTime())){
+ continue;
+ }
if (next.getCount() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("鏁伴噺瓒呰繃搴撳瓨鏁伴噺");
}
if (next.getCount().equals(locDetl.getAnfme())) {
sameNumber++;
--
Gitblit v1.9.1