From 9781420b252caedfbefdadf4661428702b1a6540 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 20 四月 2024 15:08:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 6a11135..22d0b62 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -233,14 +233,13 @@
}
public static Short CrnStaEnd(Integer endSta,Integer souSta) {
- if (souSta == 118){
- return (short)119;
- }
switch (endSta) {
case 100:
- return (short)149;
case 102:
case 111:
+ if (souSta == 118){
+ return (short)119;
+ }
return 149;
default:
return endSta.shortValue();
--
Gitblit v1.9.1