From dfafabacf23bf22181d7c3f3665e684be7921f7d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 八月 2024 16:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/controller/SiteController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index 08107b6..3fe8c23 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -50,8 +50,8 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<String, Object> map2 = new HashMap<>();
map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf2F.id);
- map2.put("modeDesc", devpThread.ioModeOf2F.desc);
+ map2.put("modeVal", devpThread.ioModeOf101.id);
+ map2.put("modeDesc", devpThread.ioModeOf101.desc);
res.add(map2);
}
return R.ok().add(res);
@@ -83,6 +83,7 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setWorkNo(staProtocol.getWorkNo());
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
--
Gitblit v1.9.1