From a144c412981c49658c951db098a701a58f8e1ee3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 13:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/utils/Utils.java | 9 ++-------
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 20 ++++++++------------
src/main/java/com/zy/asrs/entity/Mat.java | 6 +++---
src/main/java/com/zy/common/service/CommonService.java | 16 +++++++++-------
src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java | 2 +-
5 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bee0346..18e4fed 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -59,8 +59,8 @@
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty(value = "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ExcelProperty(value = "鐗╂枡缂栫爜")
private String matnr;
@@ -68,7 +68,7 @@
* 鍟嗗搧鍚嶇О
*/
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty(value = "鍟嗗搧鍚嶇О")
+ @ExcelProperty(value = "鐗╂枡鍚嶇О")
private String maktx;
/**
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index d8de3ea..6015e93 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -89,31 +89,27 @@
if (Cools.isEmpty(locMastStart)) {
continue;
}
- if (!Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
+ if (Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastStart.getLocNo());
LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
- if (locNo != null && !locNo.getLocSts().equals("O")) {
+ if (locNo != null && locNo.getLocSts().equals("D")) {
locMastStart = locNo;
}
}
LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
.eq("crn_no", basCrnp.getCrnNo())
- .eq("loc_type1", locMastStart.getLocType1())
+ //.eq("loc_type1", locMastStart.getLocType1())
.ne("modi_user", 77)
- .orderBy("row1", true));//鐩爣
+ .orderBy("lev1", true));//鐩爣
if (Cools.isEmpty(locMastEnd)) {
continue;
}
- if (!Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastEnd.getLocNo());
+ if (Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
+ String shallowLocNo = Utils.getDeepLoc(slaveProperties, locMastEnd.getLocNo());
LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
- if (locNo != null && locNo.getLocSts().equals("O")) {
-
- } else {
- locMastEnd.setModiUser(77L);
- locMastService.updateById(locMastEnd);
- continue;
+ if (locNo != null && locNo.getModiUser() != 77L && locNo.getLocSts().equals("O")) {
+ locMastEnd = locNo;
}
}
// if (Cools.isEmpty(locMastStart) || Cools.isEmpty(locMastEnd)){
diff --git a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
index f76ba71..c30ecf0 100644
--- a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
@@ -33,7 +33,7 @@
LocMast locMastEndNew = null;
- workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 66L);
+ workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 77L);
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 43ab53a..6cc2302 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -528,16 +528,11 @@
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
case 1:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[1] = 6; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 4:
- necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 5:
+ case 6:
necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 00559b3..70b6b64 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -870,7 +870,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 +878,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 +961,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