From a4db6bcb5b733ff77b803ea460568219507d7300 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 26 六月 2023 15:16:34 +0800
Subject: [PATCH] 提升机信号读取矫正
---
src/main/java/com/zy/asrs/controller/SiteController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 941bc9f..6bf8805 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -71,11 +71,6 @@
map2.put("modeVal", devpThread.charge1);
map2.put("modeDesc", devpThread.charge1?"鍏呯數涓�":"鍏抽棴");
res.add(map2);
- Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 3);
- map3.put("modeVal", devpThread.charge2);
- map3.put("modeDesc", devpThread.charge2?"鍏呯數涓�":"鍏抽棴");
- res.add(map3);
}
return R.ok().add(res);
}
@@ -151,6 +146,8 @@
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setLiftArrival(staProtocol.isLiftArrival()?"Y":"N"); // 鎻愬崌鏈哄埌浣嶄俊鍙�
+ vo.setShuttleTakeEnable(staProtocol.isShuttleTakeEnable()?"Y":"N"); // 绌挎杞﹀彲鍙栦俊鍙�
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
--
Gitblit v1.9.1