From 5083cee752a524dc48a899d55a5d53dd233c8b84 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期二, 14 一月 2025 14:19:03 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/CrnController.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index 4d02d12..83d3de3 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -120,6 +120,10 @@ vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵�� vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵�� vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿 + 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?"鏈夌墿":"鏃犵墿" : "鏈夌墿"); // 鏈夌墿 + } vo.setBay(crnProtocol.getBay()); // 鍒� vo.setLev(crnProtocol.getLevel()); // 灞� -- Gitblit v1.9.1