From 4ccff12cf03a050f060b40180873ecd459b2333f Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 10 四月 2025 12:34:38 +0800
Subject: [PATCH] #
---
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/asrs/task/handler/LocMoveAllHandler.java | 2 +-
3 files changed, 12 insertions(+), 16 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();
--
Gitblit v1.9.1