From d2b19008230941c105b57b8f7b49b291560f2cfb Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 19 八月 2024 11:09:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/SteController.java     |    6 ++++--
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index ff96025..415685f 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -120,11 +120,13 @@
             if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
                 vo.setChargeStatus(steProtocol.getChargeStatus()==1?"鉁�":"脳");
             }
-            if(steProtocol.getAlarm() > 0){
+            if(Cools.isEmpty(steProtocol.getAlarm())){
+                vo.setAlarm1("鏈煡寮傚父");
+            } else if(!Cools.isEmpty(steProtocol.getAlarm()) && steProtocol.getAlarm() > 0){
                 BasSteErr steErr = basSteErrMapper.selectById(steProtocol.getAlarm());
                 vo.setAlarm1(steErr==null?"鏈煡寮傚父":steErr.getErrName());
             }
-            vo.setAlarm2(steProtocol.getAlarm0().toString());
+            vo.setAlarm2(Cools.isEmpty(steProtocol.getAlarm0())? "鏈煡":steProtocol.getAlarm0().toString());
         }
         return R.ok().add(list);
     }
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 3d8479a..8837902 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3578,6 +3578,7 @@
             SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
             SteProtocol steProtocol = steThread.getSteProtocol();
             if (steProtocol == null) { continue; }
+            if (Cools.isEmpty(steProtocol.loca)) continue;
             if (steProtocol.loca==0) continue;
             if (steProtocol.getWaiting() && steProtocol.getTaskNo() == 0){
                 News.info("ste[id={}] 鏀跺埌绛夊緟WCS纭淇″彿锛屼絾鏄换鍔″彿(鍦板潃V824)涓�0", steProtocol.getSteNo());
@@ -4883,6 +4884,7 @@
                             staNos = new int[]{112,113,114};
                             for (int staNo : staNos){
                                 StaProtocol staProtocol = devpThread.getStation().get(staNo);
+                                if (Cools.isEmpty(staProtocol)) continue;
                                 if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo()>0){
                                     sign = false;
                                 }
@@ -4912,6 +4914,7 @@
                             staNos = new int[]{212,213,214};
                             for (int staNo : staNos){
                                 StaProtocol staProtocol = devpThread.getStation().get(staNo);
+                                if (Cools.isEmpty(staProtocol)) continue;
                                 if (!staProtocol.isAutoing() || staProtocol.isLoading()){
                                     sign = false;
                                 }

--
Gitblit v1.9.1