From 1fcbc05db63b43c549a317eeb1baede94f4b7030 Mon Sep 17 00:00:00 2001 From: lfdMem <1> Date: 星期一, 10 三月 2025 08:16:35 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/utils/Utils.java | 26 ++++++-------------------- 1 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index fa440ef..ed947ab 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -89,9 +89,9 @@ int row = getRow(deepLoc); int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount()); int shallowRow = remainder == 1 ? (row + 1) : (row - 1); - if(row==9 || row==15 ){ + if(row==31){ shallowRow = row + 1; - }else if(row==12 || row==18 ){ + }else if(row==34){ shallowRow = row - 1; }else { return null; @@ -112,31 +112,17 @@ */ public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) { int row = getRow(shallowLoc); -// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount()); int targetRow; switch (row){ - case 10: - targetRow = 9; + case 32: + targetRow = 31; break; - case 11: - targetRow = 12; - break; - case 16: - targetRow = 15; - break; - case 17: - targetRow = 18; + case 33: + targetRow = 34; break; default: throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖"); } -// if (remainder == 2) { -// targetRow = row - 1; -// } else if (remainder == 3) { -// targetRow = row + 1; -// } else { -// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖"); -// } return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2); } -- Gitblit v1.9.1