From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 08:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/common/service/CommonService.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 00559b3..ed4ce5f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -150,6 +150,7 @@
}
}catch (Exception e){
+ e.printStackTrace();
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
}
return null;
@@ -362,6 +363,7 @@
}
// 鏇存柊搴撲綅鎺掑彿
if (Cools.isEmpty(locMast)){
+ rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
}
@@ -870,7 +872,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; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
@@ -878,17 +880,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)) {
@@ -959,15 +963,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