From 19c4282ae9bad01293a7d4a4d5fe572fbc742c18 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 九月 2024 14:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs
---
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
index a3d4c97..68d186f 100644
--- a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
+++ b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
@@ -8,7 +8,7 @@
* RGV浣嶇疆鏄惁涓庣～鍖栫綈姝ｅ
*/
public static boolean steAndJarNowRow(short steNowRow , Integer jarNo){
- return (steNowRow==(short) 1 && (jarNo == 2 || jarNo == 4 || jarNo == 5 || jarNo == 6)) || (steNowRow==(short)3 && (jarNo == 1 || jarNo == 3));
+ return (steNowRow==(short) 1 && (jarNo == 2 || jarNo == 4)) || (steNowRow==(short)3 && (jarNo == 1 || jarNo == 3)) || (steNowRow==(short)2 && (jarNo == 5 || jarNo == 6));
}
/**
@@ -21,29 +21,31 @@
return 3;
case 2:
case 4:
+ return 1;
case 5:
case 6:
- return 1;
+ return 2;
}
return 2;
}
- /**
- * RGV浣嶇疆姝ｅ鑾峰彇
- */
- public static boolean getRgvJarNowRow(Integer staNo,short nowRow){
- switch (staNo){
- case 615:
- case 622:
- case 628:
- case 627:
- return nowRow==(short) 1;
- case 612:
- case 619:
- return nowRow==(short) 2;
- }
- return false;
- }
+// /**
+// * RGV浣嶇疆姝ｅ鑾峰彇
+// */
+// public static boolean getRgvJarNowRow(Integer staNo,short nowRow){
+// switch (staNo){
+// case 615:
+// case 622:
+// return nowRow==(short) 1;
+// case 628:
+// case 627:
+// return nowRow==(short) 2;
+// case 612:
+// case 619:
+// return nowRow==(short) 2;
+// }
+// return false;
+// }
/**
* RGV浣嶇疆姝ｅ鑾峰彇
@@ -52,9 +54,10 @@
switch (staNo){
case 615:
case 622:
+ return 1;
case 628:
case 627:
- return 1;
+ return 2;
case 612:
case 619:
return 3;
@@ -70,11 +73,11 @@
case 1:
case 2:
case 5:
- return 2;
+ return 5;
case 3:
case 4:
case 6:
- return 4;
+ return 6;
}
return 0;
}
@@ -108,7 +111,7 @@
return 1;
case 5:
case 6:
- return 1;
+ return 2;
}
return 0;
}
--
Gitblit v1.9.1