From d41349dff95bbc34d6e34997bb8c68eb0d8dc46a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十一月 2024 14:14:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b8ed426..15c7957 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -548,29 +548,32 @@
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
- .eq("lev1",locTypeDto.getLocType1())
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1", true));
}else if (locMastWrk.getBay1() >=4 && locMastWrk.getBay1()<=12){
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
- .eq("lev1",locTypeDto.getLocType1())
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1", false));
}else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
- .eq("lev1",locTypeDto.getLocType1())
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1", true));
}
if (Cools.isEmpty(locMasts)) {
continue;
}
for (LocMast locMastGro1 : locMasts) {
+ if (locMastGro1.getBay1() == 2){
+ continue;
+ }
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
break;
}
- if (locMastGro1.getLocSts().equals("O") || locMastGro1.getLocSts().equals("S")){
+ if (locMastGro1.getLocSts().equals("O")){
locMast = locMastGro1;
break;
}
--
Gitblit v1.9.1