From df1126c300d0f6a51ed573a497e52f08dbeb0d5d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 11:57:43 +0800
Subject: [PATCH] Merge branch 'refs/heads/phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/common/model/OutLocDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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..e75f276 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -47,6 +47,15 @@
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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
--
Gitblit v1.9.1