From 23a2e30f0f70c1f526a04bffda38fd124ed47630 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 14:51:52 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/controller/SiteController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index ee27010..f5aaa7f 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -36,6 +37,8 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private MainServiceImpl mainService;
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
@@ -58,6 +61,7 @@
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
+ FyDevpThread xx = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
for (DevpSlave devp : slaveProperties.getDevp()) {
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
station.putAll(devpThread.getStation());
@@ -75,14 +79,19 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setInEnable(mainService.isInEnable(xx, devp.getDevNo()) ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(mainService.isOutEnable(xx, devp.getDevNo()) ? "Y" : "N"); // 鍙嚭
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(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ //vo.setLocType1(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
+ vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
+ if (staProtocol.getSiteId() == 1031 || staProtocol.getSiteId() == 1032) {
+ vo.setOutInModel((staProtocol.getOutInModel() != null && staProtocol.getOutInModel() == 1) ? "鍑�" : "鍏�");
+
+ }
}
return R.ok().add(list);
}
--
Gitblit v1.9.1