From d2ff39c5136f101ce372e4702a5e27357b3b6977 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 12 十月 2023 09:54:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 4 +++-
1 files changed, 3 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 17e93cd..b8e24d5 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -290,7 +290,7 @@
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- vo.setWrkStatus(crnProtocol.getStatusType().desc); // 浠诲姟鐘舵��
+ vo.setWrkStatus(crnProtocol.getStatusType().id); // 浠诲姟鐘舵��
vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
@@ -303,6 +303,8 @@
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
+ vo.setInEnable(basCrnp.getInEnable());
+ vo.setOutEnable(basCrnp.getOutEnable());
}
return R.ok().add(list);
}
--
Gitblit v1.9.1