From 1092553a73104036db71acb087327d7e0ca501a0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 六月 2025 17:30:35 +0800
Subject: [PATCH] bug修复;下发任务给rcs携带货架码

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

diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index d531487..86f6fdc 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -90,6 +90,15 @@
                 return r;
             }
         }
+        try {
+            if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
+                if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
+                    log.info("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗f墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         if (agvWrkMast.getIoType().equals(121)) {
             try {
                 if (agvWrkMast.getWrkSts().equals(12L)) {
@@ -173,17 +182,7 @@
     end {
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-            try {
-                if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
-                    if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
-                        agvWrkMast.setTakeNone(agvWrkMast.getBarcode() + "!=" + param.getPodCode());
-                        log.info("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗f墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
-                        log.error("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗f墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
-                    }
-                }
-            } catch (Exception e) {
 
-            }
             //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
             agvWrkMast.setWrkSts(205L);
 
@@ -367,6 +366,15 @@
         }
 
     }
+
+    public static void main(String[] args) {
+        try {
+            String s = null;
+            System.out.println(s.equals("1"));
+        }catch (Exception e){
+
+        }
+    }
 }
 
 

--
Gitblit v1.9.1