From 1a09dfc5c18e86456322eac9bd372439a26f6571 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 13:45:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/CommonService.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 75f735c..9cc149f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -372,17 +372,12 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = null;
- if (Utils.isNorth(sourceStaNo)){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("lev1",true).orderBy("bay1",false));
- }else {
+
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
.orderBy("lev1",true).orderBy("bay1",true));
- }
+
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -876,7 +871,7 @@
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
+ if (!Cools.isEmpty(matnr) && !Cools.isEmpty(batch) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
//鏌ヨ鐩镐技宸ヤ綔妗ｆ
List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
@@ -884,17 +879,19 @@
for (WrkMast wrkMast:wrkMasts){
LocMast locMastWrk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
List<LocMast> locMasts = new ArrayList<>();
- if (locMastWrk.getBay1() >=5 && locMastWrk.getBay1()<=6){
+ if (locMastWrk.getBay1() >=3 && locMastWrk.getBay1()<=6){
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("gro1", locMastWrk.getGro1())
+ .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("gro1", locMastWrk.getGro1())
+ .eq("bay1", locMastWrk.getBay1())
.eq("crn_no", 7)
.eq("loc_type1",locTypeDto.getLocType1())
+ .eq("lev1",locMastWrk.getLev1())
.orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts)) {
@@ -965,15 +962,15 @@
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
List<LocMast> locMasts1 = null;
- if (nearRow == 6){
+ if (nearRow == 3 && curRow == 6){
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("gro1", locMast1.getGro1())
+ .ge("bay1",3).le("bay1",6)
.eq("crn_no",7)
.eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",true));
}else {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("gro1", locMast1.getGro1())
+ .eq("bay1", nearRow)
.eq("crn_no",7)
.eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",false));
--
Gitblit v1.9.1