From 252bfe6c268c95444525c16c95845a4ee8d10fd5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 三月 2025 16:46:24 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

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 762386d..e64b67a 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -433,11 +433,17 @@
                     //鐩爣绔欑偣
                     if (agvWrkMast.getLocNo().startsWith("QO") && agvWrkMast.getLocNo().endsWith("F4") && Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)) == 30) {
                         if (!agvWrkMast.getSourceLocNo().endsWith("02F1")) {
-                            AgvLocMast locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG,true);
-                            if (locByFloor != null) {
+                            AgvLocMast locByFloor = null;
+                            try {
+                                locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG, true);
+                            } catch (Exception e) {
+
+                            }
+                            if (locByFloor != null && locByFloor.getLocNo().endsWith("02F1")) {
                                 AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
                                 agvLocMast.setLocSts("O");
                                 agvLocMast.setModiTime(now);
+                                agvLocMast.setBarcode("");
                                 agvLocMastService.updateById(agvLocMast);
                                 wrkMast.setLocNo(locByFloor.getLocNo());
                             } else {

--
Gitblit v1.9.1