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/task/LocMoveAllScheduler.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
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)){
--
Gitblit v1.9.1