From e22cafd7f7ce99f5faccffb61ba8280e81fd3015 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 一月 2024 11:04:27 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index fd99eb5..aa66a4e 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -16,15 +16,19 @@
     }};
 
     public static final List<Integer> MERGE_STA_NO_TWO = new ArrayList<Integer>() {{
-        add(116);add(117);
+        add(113);add(123);add(114);add(1142);
     }};
 
     public static final List<Integer> MERGE_STA_NO_THREE = new ArrayList<Integer>() {{
-        add(116);add(117);
+        add(107);add(118);add(108);add(119);
     }};
 
     public static final List<Integer> MERGE_STA_NO_FOUR = new ArrayList<Integer>() {{
-        add(116);add(117);
+        add(110);add(120);add(111);add(121);
+    }};
+
+    public static final List<Integer> MERGE_STA_NO_FIVE = new ArrayList<Integer>() {{
+        add(113);add(123);add(114);add(1142);
     }};
 
 //    姝e簭
@@ -324,15 +328,16 @@
             case 28:
                 return 116;
             default:
-                return 0;
+                return 1142;
         }
     }
 
     public static short RgvPosStaTwo(Short posId){
         switch (posId.intValue()){
             case 1:
-            case 2:
                 return 116;
+            case 2:
+                return 1142;
             case 3:
             case 4:
                 return 114;
@@ -371,7 +376,7 @@
             case 28:
                 return 104;
             default:
-                return 0;
+                return 104;
         }
     }
 

--
Gitblit v1.9.1