From 8d326ad5e4f718b285fd179f31c82d5a568364f4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 30 三月 2023 13:37:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 13 ++++++++++---
1 files changed, 10 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 5ddaadc..ef6014f 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -88,7 +88,14 @@
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;
+ if (row==9 || row==15){
+ shallowRow=row+1;
+ }else if (row==12 || row==18){
+ shallowRow=row-1;
+ }else {
+ throw new RuntimeException(row + "涓嶆槸娣卞簱浣嶏紝绯荤粺绻佸繖");
+ }
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -107,9 +114,9 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
+ if (row == 10 || row == 16) {
targetRow = row - 1;
- } else if (remainder == 3) {
+ } else if (row == 11 || row == 17) {
targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
--
Gitblit v1.9.1