From 69be0f1761a382c6c485f054d1f39dee1ecb2fac Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 11:28:01 +0800
Subject: [PATCH] #cs1

---
 src/main/java/com/zy/asrs/utils/RouteUtils.java             |   35 ++++++++++++++++++++++++++++++++++-
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   14 ++------------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1370609..e5df217 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3608,17 +3608,6 @@
     public synchronized boolean rgvIoExecute(Integer sign) {
         boolean rgvIoExecuteSign = false;
         try{
-            int rgvPoi = 101;
-            for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
-                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
-                RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
-                if (rgvProtocol == null) {
-                    continue;
-                }
-                if (rgvProtocol.getRgvNo()==1){
-                    rgvPoi = rgvProtocol.getRgvPosI();
-                }
-            }
             for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
                 // 鑾峰彇灏忚溅淇℃伅
                 boolean signWork = false;
@@ -4647,7 +4636,8 @@
             BasRgvMap basRgvMapOther = basRgvMapMapper.selectById(rgvNoOther);
             List<Integer> integers = RouteUtils.RouteMapCurrentFar(fallMerge, basRgvMapCurrent.getLockStartRoute());
             Integer lockEndRoute = RouteUtils.RouteMapOtherFarStnNo(integers, basRgvMapCurrent.getLockStartRoute());//鍙︿竴鍙板皬杞﹀彲娲诲姩鏈�杩滀綅缃�
-            basRgvMapOther.setEndRoute(lockEndRoute);
+            Integer lockEndRouteL = RouteUtils.RouteIndexFarMasL(rgvNoOther, lockEndRoute);//鍙︿竴鍙板皬杞﹀彲娲诲姩鏈�杩滀綅缃�
+            basRgvMapOther.setEndRoute(lockEndRouteL);
             basRgvMapMapper.updateById(basRgvMapOther);
             return true;
         }catch (Exception e){
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 50c76a9..27d50c9 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -148,7 +148,40 @@
             }
         }
     }
-
+    /*
+     * 鑾峰彇骞叉秹鏈�杩滅珯鐐�
+     * */
+    public static Integer RouteIndexFarMasL(int rgvNo,Integer staNo){
+        if (rgvNo==1){
+            switch (staNo){
+                case 101:
+                case 102:
+                case 104:
+                case 122:
+                case 105:
+                case 107:
+                case 118:
+                    return staNo;
+                default:
+                    return 108;
+            }
+        }else {
+            switch (staNo){
+                case 117:
+                case 116:
+                case 171:
+                case 1142:
+                case 114:
+                case 123:
+                case 113:
+                case 121:
+                case 111:
+                    return staNo;
+                default:
+                    return 110;
+            }
+        }
+    }
 
     // 鑾峰彇褰撳墠灏忚溅鏈璧扮殑璺嚎闆嗗悎
     public static List<Integer> getRoute(Integer groupStart,Integer groupEnd){

--
Gitblit v1.9.1