From 2fc41a25a6acfad60e1ec6fa1234f98efb0b3a82 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 八月 2024 17:57:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
index 874258a..a3d4c97 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));
}
/**
@@ -69,10 +69,10 @@
switch (jarNo){
case 1:
case 2:
+ case 5:
return 2;
case 3:
case 4:
- case 5:
case 6:
return 4;
}
@@ -95,6 +95,24 @@
return 0;
}
+ /**
+ * 鑾峰彇纭寲缃怰GV浣嶇疆
+ */
+ public static Integer getJarNoEndRow(Integer jarNo){
+ switch (jarNo){
+ case 1:
+ case 3:
+ return 3;
+ case 2:
+ case 4:
+ return 1;
+ case 5:
+ case 6:
+ return 1;
+ }
+ return 0;
+ }
+
public static void main(String[] args) {
}
--
Gitblit v1.9.1