From a6ef5e6ffa2895fe2ea3ecb6f580482335089cc7 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 25 八月 2022 15:19:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CrnController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..0595d90 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -126,9 +126,9 @@
             vo.setForkOffset(crnProtocol.getForkPosType().desc);    // 璐у弶浣嶇疆
             vo.setLiftPos(crnProtocol.getLiftPosType().desc);
             vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
-            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
-            if (crnProtocol.getAlarm() > 0) {
-                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
+            if (crnProtocol.getAlarm1() > 0) {
+                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                 vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
             }
         }

--
Gitblit v1.9.1