From 3f5921a1ddfa0b51fb289355e2612f04b1d423f6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 一月 2024 08:42:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/RouteUtils.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index cba980b..b7af940 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -14,7 +14,7 @@
 
     //闂2  鍛ㄤ繆鏉�
     public static final List<Integer> MERGE_STA_NO_One = new ArrayList<Integer>() {{
-//        add(116);add(117);
+        add(113);add(119);
     }};
 
     public static final List<Integer> MERGE_STA_NO_TWO = new ArrayList<Integer>() {{
@@ -232,6 +232,28 @@
         return getRouteIntersection(getRoute(a, c), getRoute(b, c), RouteCollectCountType.DEDUPLICATIONUNION);
     }
 
+    public static Short CrnStaEnd(Integer endSta,Integer souSta) {
+        switch (endSta) {
+            case 100:
+                if (souSta == 118){
+                    return (short)119;
+                }
+                return (short)149;
+            case 102:
+            case 111:
+                return 149;
+            default:
+                return endSta.shortValue();
+        }
+    }
+
+    public static  Short SouStaEnd(Integer endSta,Integer souSta){
+       if (souSta == 159) {
+           return (short)161;
+       }
+       return souSta.shortValue();
+    }
+
 
 
     public static void main(String[] arge){

--
Gitblit v1.9.1