From 78489da7e2185f53faaec9356fa1a8997cedab70 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 28 五月 2025 08:46:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index c189878..a8f376d 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -41,20 +41,20 @@
private BasDevpService basDevpService;
- @GetMapping("/io/mode/info/site")
- @ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
- public R ioMode() {
- List<Map<String, Object>> res = new ArrayList<>();
- for (DevpSlave devp : slaveProperties.getDevp()) {
- 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);
- res.add(map2);
- }
- return R.ok().add(res);
- }
+// @GetMapping("/io/mode/info/site")
+// @ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
+// public R ioMode() {
+// List<Map<String, Object>> res = new ArrayList<>();
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// 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);
+// res.add(map2);
+// }
+// return R.ok().add(res);
+// }
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
@@ -84,8 +84,8 @@
vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
+ vo.setLocType1(staProtocol.isWeight() ? "閲�" : "杞�"); //楂樹綆搴撲綅
+// vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
@@ -160,7 +160,7 @@
vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 闇�姹�1
vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
- vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ vo.setLocType1(staProtocol.isWeight() ? "閲�" : "杞�");
return R.ok().add(vo);
}
}
--
Gitblit v1.9.1