From 326142c3254fcd2256c86e7db9e491666b868f6f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 12 九月 2020 09:28:28 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 5e79f59..4554412 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -128,7 +128,7 @@
             /**
              * 鍫嗗灈鏈虹姸鎬佸垽鏂�
              */
-            if (crnProtocol.getAlarm() > 0) {
+            if (crnProtocol.getAlarm1() > 0) {
                 vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
             } else {
                 if (crnProtocol.getTaskNo()>0) {

--
Gitblit v1.9.1