From b26747b7561d34e77038ff99f0a50fcfce05c8c6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 16 五月 2023 11:15:24 +0800
Subject: [PATCH] realtimeWatch crn

---
 src/main/java/com/zy/asrs/controller/CrnController.java |    2 +-
 1 files changed, 1 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 579cc5a..183353b 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -119,7 +119,7 @@
             vo.setWorkNo(crnProtocol.getTaskNo());  //  浠诲姟鍙�
             vo.setStatusType(crnProtocol.modeType.desc);   //  妯″紡鐘舵��
             vo.setStatus(crnProtocol.getStatusType().desc);     //  鐘舵��
-            vo.setLoading(( Cools.isEmpty(crnProtocol.getLoaded()) && crnProtocol.getLoaded()==1)?"鏈夌墿":"鏃犵墿");  //  鏈夌墿
+            vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿");  //  鏈夌墿
             vo.setBay(crnProtocol.getBay());    //  鍒�
             vo.setLev(crnProtocol.getLevel());  //  灞�
 

--
Gitblit v1.9.1