From 02284de3ccd91f3af53c0c2b111199fda38cb79c Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 21 四月 2025 08:25:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index f429f09..3af7671 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -146,7 +146,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 == 1 ? (row - 1) : (row + 1); return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2); } @@ -528,25 +528,20 @@ //婊℃澘姝e父鍏ュ簱 switch (curRow){ case 1: - necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓 - break; - case 4: - necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓 - break; - case 5: - necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓 - break; - case 8: necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = 1; //nearRow 鏈�娴呭簱浣嶆帓 break; + case 6: + necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓 + break; + case 13: + necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓 + break; default: throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); } -- Gitblit v1.9.1