From 396dfb3eba1725868ab2e01d7c1af5e64bf108d3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 30 三月 2025 21:18:04 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/controller/AgvOpenController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index f7a4967..1c738a7 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -232,6 +232,12 @@
                     String locSts = "O";
                     if (byDevNo != null) {
                         assert log != null;
+                        if (!Cools.isEmpty(agvWrkMast.getBarcode())) {
+                            AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", agvWrkMast.getBarcode()));
+                            if (!Cools.isEmpty(agvBasDevp) && agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getDevNo().equals(byDevNo.getDevNo())) {
+                                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(), locSts, "", null);
+                            }
+                        }
                         log.info("鏂欐灦绂诲紑鏃跺綋鍓嶇珯鐐圭姸鎬�:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                         if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
                             log.info("鏂欐灦绂诲紑鏃跺綋鍓嶇珯鐐圭姸鎬佷繚鎸佷笉鍙�1:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
@@ -242,6 +248,7 @@
                             locSts = "O";
                             agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                         }
+
                     }
                     break;
             }

--
Gitblit v1.9.1