From d6ccd5253bd826e9b112c5d39b193d6d45a74725 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 十一月 2024 11:15:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 7e9701e..b8ed426 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -548,16 +548,19 @@
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
+ .eq("lev1",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())
.orderBy("bay1", false));
}else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
+ .eq("lev1",locTypeDto.getLocType1())
.orderBy("bay1", true));
}
if (Cools.isEmpty(locMasts)) {
@@ -616,6 +619,7 @@
.eq("bay1", nearRow)
.eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
@@ -637,17 +641,20 @@
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",true));
- if(locMasts1.size() == 3 || (curRow>20 && locMasts1.size() == 2)){
+ if(locMast1.getBay1()>= 4 && locMast1.getBay1()<=12){
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",false));
}
}else {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",false));
}
if (Cools.isEmpty(locMasts1)) {
@@ -671,37 +678,6 @@
- }
- }
-
- //鏈壘鍒� 鍏佽娣锋枡
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
-
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (Cools.isEmpty(locMast2)) {
- LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast3)) {
- locMast = locMast3;
- break;
- }
- } else {
- if ((locMast2.getLocSts().equals("F") && staDescId == 1) || (locMast2.getLocSts().equals("D") && staDescId == 10)){
- LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast3)) {
- locMast = locMast3;
- break;
- }
- }
- }
- }
}
}
}
--
Gitblit v1.9.1