From e630f90300fe49872a8935a978f09424ff7441cb Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期五, 08 十一月 2024 14:53:36 +0800
Subject: [PATCH] 按堆垛机号查看物料明细
---
src/main/java/com/zy/common/service/CommonService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..b4cb578 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -548,25 +548,28 @@
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;
}
--
Gitblit v1.9.1