From 44de068cf2e04fc3e9c6fa7f44e0c1a4d241f989 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 20:30:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 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..3e2b9fe 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,11 +111,24 @@
return 1;
case 5:
case 6:
- return 1;
+ return 2;
}
return 0;
}
+ /**
+ * 鑾峰彇A-B璺嚎 鎵�闇�缁忚繃纭寲缃�
+ */
+ public static Integer[] getSteJarNoAB(Integer jarNo){
+ switch (jarNo){
+ case 5:
+ return new Integer[]{1,2};
+ case 6:
+ return new Integer[]{3,4};
+ }
+ return new Integer[]{jarNo,jarNo};
+ }
+
public static void main(String[] args) {
}
--
Gitblit v1.9.1