From c42346453608186971fad5e80ffd08fd58d38d06 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:42:45 +0800
Subject: [PATCH] 完善erp对接
---
src/main/java/com/zy/common/service/CommonService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e0f8845..d5f2fd1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -887,14 +887,12 @@
.ge("bay1", 3).le("bay1", 6)
.eq("crn_no", 7)
.eq("loc_type1", locTypeDto.getLocType1())
- .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", true));
} else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", locMastWrk.getBay1())
.eq("crn_no", 7)
.eq("loc_type1", locTypeDto.getLocType1())
- .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts)) {
@@ -984,12 +982,18 @@
for (LocMast locMastGro1 : locMasts1) {
if (locMastGro1.getLocSts().equals("F")) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
- if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)) {
- break;
+ if (!Cools.isEmpty(locDetl.getSku())){
+ if (!locDetl.getMatnr().equals(matnr) || !locDetl.getSku().equals(batch)) {
+ continue;
+ }
+ }else {
+ if (!locDetl.getMatnr().equals(matnr)) {
+ continue;
+ }
}
}
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
- break;
+ continue;
}
if (locMastGro1.getLocSts().equals("O")) {
locMast = locMastGro1;
--
Gitblit v1.9.1