From 059d267826649cd90c8d56145b6a66a42fc73248 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 19 七月 2024 15:26:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
index 22d1cfa..fa0b4fb 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)) || (steNowRow==(short)3 && (jarNo == 1 || jarNo == 3));
+ return (steNowRow==(short) 1 && (jarNo == 2 || jarNo == 4 || jarNo == 5 || jarNo == 6)) || (steNowRow==(short)3 && (jarNo == 1 || jarNo == 3));
}
/**
@@ -57,7 +57,7 @@
return 1;
case 612:
case 619:
- return 2;
+ return 3;
}
return 0;
}
@@ -69,15 +69,31 @@
switch (jarNo){
case 1:
case 2:
+ case 5:
return 2;
case 3:
case 4:
- case 5:
case 6:
return 4;
}
return 0;
}
+ /**
+ * 鑾峰彇姝ｅ鍐峰嵈妲界～鍖栫綈
+ */
+ public static Integer getBJarNo(Integer jarNo){
+ switch (jarNo){
+ case 1:
+ case 2:
+ case 5:
+ return 5;
+ case 3:
+ case 4:
+ case 6:
+ return 6;
+ }
+ return 0;
+ }
public static void main(String[] args) {
--
Gitblit v1.9.1