From 40631d025469ac3fb60a57dfab1d9022cb0298a6 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 25 三月 2025 16:57:46 +0800
Subject: [PATCH] 站点退回操作,防止改成空库位
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 8 +++-----
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index f78f672..f7a4967 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -224,6 +224,8 @@
case 10:
// 鎷f枡鍏ュ簱浠诲姟
case 53:
+ // 绔欑偣閫�鍥�
+ case 58:
// 鐩樼偣鍐嶅叆搴�
case 57:
AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 648ab24..be5f5dd 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -28,8 +28,6 @@
import java.util.*;
import java.util.stream.Collectors;
-import static org.reflections.Reflections.log;
-
@Slf4j
@Service
public class AgvWrkMastHandler extends AbstractHandler<String> {
@@ -256,7 +254,7 @@
});
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
- byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+ byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
if (byDevNo != null) {
if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
@@ -280,7 +278,7 @@
}
});
// 鏇存柊绔欑偣 + 搴撲綅鐘舵�� 婧愬簱浣嶆槸绔欑偣
- byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+ byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
if (byDevNo != null) {
if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
@@ -292,7 +290,7 @@
break;
case 58:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+ //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
break;
case 108:
case 114:
--
Gitblit v1.9.1