From ccc39836716ba323c946cddc78a62049731ebb46 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:43:33 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/asrs/controller/SiteController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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..c5a32ab 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");   // 鍙叆
@@ -152,7 +145,16 @@
                     vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 闇�姹�1
                     vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 绌烘澘淇″彿
                     vo.setStaNo(staProtocol.getStaNo());                // 鐩爣绔�
-                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�");     //楂樹綆搴撲綅
+                    if (staProtocol.isHigh()){
+                        vo.setLocType1("瓒呴珮搴撲綅");
+                    }else if (staProtocol.isLow()){
+                        vo.setLocType1("楂樺簱浣�");
+                    }else if (staProtocol.isMid()){
+                        vo.setLocType1("涓簱浣�");
+                    }else if (staProtocol.isLower()){
+                        vo.setLocType1("浣庡簱浣�");
+                    }
+//                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�");     //楂樹綆搴撲綅
                     return R.ok().add(vo);
                 }
             }

--
Gitblit v1.9.1