From 6b09ae784e33e7abd33ac480a819d961d289bdff Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 02 一月 2025 09:07:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    1 +
 src/main/java/com/zy/asrs/controller/CrnController.java     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 2763ae7..83d3de3 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -120,7 +120,7 @@
             vo.setStatusType(crnProtocol.modeType.desc);   //  妯″紡鐘舵��
             vo.setStatus(crnProtocol.getStatusType().desc);     //  鐘舵��
             vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿");  //  鏈夌墿
-            if (crnProtocol.getCrnNo()>=3 && crnProtocol.getCrnNo()<=5){
+            if (!Cools.isEmpty(crnProtocol.getCrnNo()) && crnProtocol.getCrnNo()>=3 && crnProtocol.getCrnNo()<=5){
                 vo.setStatus(crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE)? crnProtocol.getStatusTypeTwo().desc:crnProtocol.getStatusType().desc);     //  鐘舵��
                 vo.setLoading(crnProtocol.getLoaded()==0? crnProtocol.getLoadedTwo()==1?"鏈夌墿":"鏃犵墿" : "鏈夌墿");  //  鏈夌墿
             }
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2e7b800..2d14568 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8045,6 +8045,7 @@
                                                     log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
                                                             wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSON(steProtocol),sign);
                                                 }
+                                                Thread.sleep(500);
                                                 return true;
                                             }
                                         }

--
Gitblit v1.9.1