From aed93f604e42ad77d686182107e271c690c5de27 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 25 三月 2025 10:54:51 +0800
Subject: [PATCH] #库位数量回调
---
src/main/java/com/zy/asrs/controller/SiteController.java | 14 +++++++++++++-
1 files changed, 13 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..acdda6d 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 = "鍏ュ嚭搴撴ā寮�")
@@ -69,10 +73,10 @@
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()); // 宸ヤ綔鍙�
vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
@@ -83,6 +87,7 @@
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
+
return R.ok().add(list);
}
@@ -248,6 +253,13 @@
vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ /*
+ * 瀹滅瀹氬埗 150绔欑偣寮傚父淇℃伅锛氬ぇ鎵樼洏鐩殑绔欓敊璇�
+ * */
+ if (entry.getKey()==150){
+ vo.setPlcDesc("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
+ vo.setError("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
+ }
list.add(vo);
}
if (staProtocol.isFrontErr()){
--
Gitblit v1.9.1