From a454c4e3e56ed63a7676348f260a240fa18be481 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 14:02:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index ce98c40..3c29dc3 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -70,7 +70,6 @@
}
// 鎸佷箙鏁版嵁
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()); // 绔欑偣缂栧彿
@@ -78,13 +77,7 @@
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
- for (BasRgv basRgv: basRgvs){
- if (basRgv.getRgvNo() == devp.getDevNo()){
- vo.setWorkNo(basRgv.getWrkNo1()); // 宸ヤ綔鍙�
- }else {
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- }
- }
+ vo.setWorkNo(staProtocol.getWorkNo());
vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
--
Gitblit v1.9.1