From c253c12c4001811b970a4fdee680e33819701197 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 25 十月 2022 14:24:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 22 +++++++++-------------
src/main/java/com/zy/core/enums/SteTaskModeType.java | 20 ++++++--------------
2 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5d29d14..141502b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -136,6 +136,13 @@
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
+ public static void main(String[] args) {
+ SlaveProperties slaveProperties = new SlaveProperties();
+ slaveProperties.setDoubleDeep(true);
+ slaveProperties.setGroupCount(2);
+ System.out.println(getDeepLoc(slaveProperties, "3100101"));
+ }
+
/**
* 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
*/
@@ -153,7 +160,7 @@
int targetRow;
if (remainder == 2) {
targetRow = row - 1;
- } else if (remainder == 3) {
+ } else if (remainder == 1) {
targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
@@ -169,7 +176,7 @@
int targetRow;
if (remainder == 2) {
targetRow = shallowRow - 1;
- } else if (remainder == 3) {
+ } else if (remainder == 1) {
targetRow = shallowRow + 1;
} else {
throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
@@ -237,15 +244,4 @@
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
- public static void main(String[] args) {
- SlaveProperties slaveProperties = new SlaveProperties();
- slaveProperties.setDoubleDeep(true);
- List<Integer> list = new ArrayList<>();
- list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
- slaveProperties.setDoubleLocs(list);
- slaveProperties.setGroupCount(4);
- Integer deepRow = getDeepRow(slaveProperties, 6);
- System.out.println(deepRow);
-
- }
}
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 109da35..980a032 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -58,14 +58,10 @@
}
public static SteTaskModeType findInByLoc(String locNo) {
- switch (Utils.getGroupRow(locNo)) {
- case 3:
- case 11:
- case 18:
+ switch (Utils.getGroupRow(locNo, true)) {
+ case 17:
return SteTaskModeType.IN_RIGHT; // 鍙�
- case 4:
- case 12:
- case 19:
+ case 18:
return SteTaskModeType.IN_LEFT; // 宸�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
@@ -73,14 +69,10 @@
}
public static SteTaskModeType findOutByLoc(String locNo) {
- switch (Utils.getGroupRow(locNo)) {
- case 3:
- case 11:
- case 18:
+ switch (Utils.getGroupRow(locNo, false)) {
+ case 2:
return SteTaskModeType.OUT_RIGHT; // 鍙�
- case 4:
- case 12:
- case 19:
+ case 18:
return SteTaskModeType.OUT_LEFT; // 宸�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
--
Gitblit v1.9.1