From 41a903a9675a7115a0deb506d80308878ea2e4f5 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 19 十月 2023 15:24:11 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 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..99e4a80 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -60,6 +60,29 @@ } /** + * 鍒ゆ柇鏄惁涓哄乏娣卞簱浣� + */ + public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row){ + if (slaveProperties.isDoubleDeep()) { + return slaveProperties.getDoubleLocsLeft().contains(row); + } else { + return false; + } + } + + + /** + * 鍒ゆ柇鏄惁涓哄彸娣卞簱浣� + */ + public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row){ + if (slaveProperties.isDoubleDeep()) { + return slaveProperties.getDoubleLocsRight().contains(row); + } else { + return false; + } + } + + /** * 鍒ゆ柇鏄惁涓烘祬搴撲綅 */ public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){ @@ -126,10 +149,6 @@ if (remainder == 2) { targetRow = shallowRow - 1; } else if (remainder == 3) { - targetRow = shallowRow + 1; - } else if (shallowRow == 10 || shallowRow == 16) { - targetRow = shallowRow - 1; - } else if (shallowRow == 11 || shallowRow == 17) { targetRow = shallowRow + 1; } else { throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�"); -- Gitblit v1.9.1