From 359ffffec540f2645af8071d5aff0a6cd55db160 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 29 九月 2025 11:14:04 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/utils/Utils.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e80f7e5..2d31722 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -76,6 +76,9 @@
*/
public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
if (slaveProperties.isDoubleDeep()) {
+ if(row == 1||row == 2){
+ return false;
+ }
return !slaveProperties.getDoubleLocs().contains(row);
} else {
return false;
@@ -88,7 +91,7 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ int shallowRow = remainder == 3 ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -123,9 +126,9 @@
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
+ if (remainder == 0) {
targetRow = shallowRow - 1;
- } else if (remainder == 3) {
+ } else if (remainder == 1) {
targetRow = shallowRow + 1;
} else {
throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
--
Gitblit v1.9.1