From d7c7cbbe2ba964b92e31e36d15c6941b4328b9b4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 16:31:38 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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..b15f057 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -89,34 +89,29 @@
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)){
ReturnT<String> result = locMoveAllHandler.start(locMastStart, locMastEnd, basCrnp.getCrnNo());
if (!result.isSuccess()) {
--
Gitblit v1.9.1