From 64b896950b855df50236a6aa06f1653cfd3b9bb9 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 18 三月 2024 16:03:49 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/RouteUtils.java | 20 +++++++++++++++++++- 1 files changed, 19 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 a4e9594..1d633f3 100644 --- a/src/main/java/com/zy/asrs/utils/RouteUtils.java +++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java @@ -28,7 +28,23 @@ }}; public static final List<Integer> MERGE_STA_NO_FIVE = new ArrayList<Integer>() {{ - add(113);add(123);add(114);add(1142); + add(104);add(122);add(105); + }}; + + public static final List<Integer> MERGE_STA_NO_SIX = new ArrayList<Integer>() {{ + + }}; + + public static final List<Integer> MERGE_STA_NO_SEVEN = new ArrayList<Integer>() {{ + + }}; + + public static final List<Integer> MERGE_STA_NO_EIGHT = new ArrayList<Integer>() {{ + + }}; + + public static final List<Integer> MERGE_STA_NO_NINE = new ArrayList<Integer>() {{ +// add(108);add(119);add(110);add(120); }}; // 姝e簭 @@ -66,6 +82,8 @@ staFall = MERGE_STA_NO_THREE; }else if (MERGE_STA_NO_FOUR.contains(staNo)){ staFall = MERGE_STA_NO_FOUR; + }else if (MERGE_STA_NO_FIVE.contains(staNo)){ + staFall = MERGE_STA_NO_FIVE; }else { return staNo; } -- Gitblit v1.9.1