From 469d8ceb95ed82f09fd4c1bddbbe672689bc8d82 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 09 四月 2025 19:52:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/AgvCommonService.java | 4 ++--
src/main/java/com/zy/asrs/utils/LocUtils.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 4 +++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 9d3dd0e..812886a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -1008,7 +1008,7 @@
List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", param.getLocNo()));
List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();
-
+ String barcode = null;
// 淇敼鏁伴噺
Iterator<AgvLocDetl> iterator = locDetls.iterator();
while (iterator.hasNext()) {
@@ -1095,6 +1095,7 @@
locDetl.setThreeCode(adjust.getThreeCode());
locDetl.setDeadTime(adjust.getDeadTime());
locDetl.setSuppCode(adjust.getSuppCode());
+ barcode = adjust.getSuppCode();
if (!agvLocDetlService.insert(locDetl)) {
throw new CoolException("娣诲姞" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
}
@@ -1127,6 +1128,7 @@
if (locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O")) {
if (count > 0) {
locMast.setLocSts("F");
+ locMast.setBarcode(barcode);
}
}
locMast.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/utils/LocUtils.java b/src/main/java/com/zy/asrs/utils/LocUtils.java
index ed83fb8..76d8425 100644
--- a/src/main/java/com/zy/asrs/utils/LocUtils.java
+++ b/src/main/java/com/zy/asrs/utils/LocUtils.java
@@ -60,14 +60,14 @@
* @param floor
* @return
*/
- public AgvLocMast getLocNoRuleByFloor(int type, Integer floor) {
+ public AgvLocMast getLocNoRuleByFloor6(int type, Integer floor) {
try {
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_sts", "O").eq("loc_type1", type);
if (floor == 4) {
- wrapper.orderBy("lev1", false).orderBy("row1", true);
+ wrapper.eq("floor", 1).eq("lev1", 2).orderBy("bay1", false);
} else {
- wrapper.orderBy("lev1", true);
+ wrapper.orderBy("floor", false).orderBy("lev1", true);
}
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 103b8b3..0f60a40 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -134,7 +134,7 @@
// } else {
// //涓嶅姩杩欎釜閫昏緫
if (type == 6) {
- locMast = locUtils.getLocNoRuleByFloor(type, floor);
+ locMast = locUtils.getLocNoRuleByFloor6(type, floor);
} else {
locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
}
@@ -352,7 +352,7 @@
try {
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_sts", "O").eq("loc_type1", type);
- wrapper.eq("floor", floor).eq("lev1", lev1);
+ wrapper.eq("floor", floor).eq("lev1", lev1).orderBy("bay1", true);
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
--
Gitblit v1.9.1