From 4c0beb31805be4277a1e9cb65331effda6d339b4 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 27 三月 2024 09:44:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/SiteController.java | 8 -------- 1 files changed, 0 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..e6b9711 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,6 @@ 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.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩 vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿 vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆 -- Gitblit v1.9.1