From aee6386344123c250b3ddfa3efa9a7e3ff8f6cbb Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 16 九月 2025 09:43:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

---
 src/main/java/com/zy/asrs/controller/TVController.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 1cc149f..65dd4ce 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -374,12 +374,8 @@
                 continue;
             }
             HashMap<String, Object> map = new HashMap<>();
-            if (Cools.isEmpty(shuttleProtocol.getErrorCode())) {
-                continue;
-            }
-            int i = Integer.parseInt(shuttleProtocol.getErrorCode());
-            if (i > 0) {
-                BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(i);
+            if (!Cools.isEmpty(shuttleProtocol.getErrorCode()) && Integer.parseInt(shuttleProtocol.getErrorCode()) > 0 && !Cools.isEmpty(shuttleProtocol.getErrorCode())) {
+                BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(Integer.parseInt(shuttleProtocol.getErrorCode()));
                 String errName = basShuttleErr == null ? "鏈煡寮傚父" : basShuttleErr.getErrName();
                 //鏁呴殰涓�
                 map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�

--
Gitblit v1.9.1