From c3d749bdf7b8d79fa35bc60a1c200bf85b6ec328 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 三月 2024 09:28:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index b0abae8..ce98c40 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -7,7 +7,9 @@
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -38,6 +40,8 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private BasRgvService basRgvService;
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
@@ -66,13 +70,21 @@
}
// 鎸佷箙鏁版嵁
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
for (BasDevp devp : basDevps) {
SiteTableVo vo = new SiteTableVo();
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
+
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ for (BasRgv basRgv: basRgvs){
+ if (basRgv.getRgvNo() == devp.getDevNo()){
+ vo.setWorkNo(basRgv.getWrkNo1()); // 宸ヤ綔鍙�
+ }else {
+ vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ }
+ }
vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
@@ -83,6 +95,7 @@
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
+
return R.ok().add(list);
}
--
Gitblit v1.9.1