From bb017102f135d427606dfbdc0503191e5f001265 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 02 十二月 2022 09:19:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 134 +++++++++++++-------------------------------
1 files changed, 40 insertions(+), 94 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index f67c4fc..fd12dab 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,7 +2,6 @@
import com.core.common.Arith;
import com.core.common.Cools;
-import com.zy.core.enums.SteABType;
import com.zy.core.properties.SlaveProperties;
import java.text.DecimalFormat;
@@ -13,6 +12,15 @@
* Created by vincent on 2020/8/27
*/
public class Utils {
+
+ public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
+ add(11);add(12);add(13);add(14);add(15);add(16);add(17);
+ }};
+ public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(18);add(19);add(20);
+ add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
+ }};
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
@@ -37,97 +45,35 @@
}
}
- public static Integer getGroupRow(Integer row) {
- switch (row) {
- case 1:
- case 2:
- case 3:
- return 3;
- case 4:
- case 5:
- case 6:
- case 7:
- return 4;
- case 8:
- case 9:
- case 10:
- case 11:
- return 11;
- case 12:
- case 13:
- case 14:
- return 12;
- case 15:
- case 16:
- case 17:
- case 18:
- return 18;
- case 19:
- case 20:
- case 21:
- return 19;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- }
-
-
- public static Integer getGroupRow(String locNo){
+ public static Integer getGroupRow(String locNo, Boolean pakin){
int row = getRow(locNo);
- return getGroupRow(row);
+ return getGroupRow(row, pakin);
}
-
-
- public static SteABType selectAB(Integer row) {
- switch (row) {
- case 1:
- case 2:
- case 3:
- return SteABType.B;
- case 4:
- case 5:
- case 6:
- case 7:
- return SteABType.A;
- case 8:
- case 9:
- case 10:
- case 11:
- return SteABType.B;
- case 12:
- case 13:
- case 14:
- return SteABType.A;
- case 15:
- case 16:
- case 17:
- case 18:
- return SteABType.B;
- case 19:
- case 20:
- case 21:
- return SteABType.A;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ public static Integer getGroupRow(Integer row, Boolean pakin) {
+ if (pakin) {
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 17;
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 18;
+ } else {
+ return 0;
+ }
+ } else {
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 2;
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 30;
+ } else {
+ return 0;
+ }
}
}
-
-
-
-
-
// -------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
@@ -190,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(getShallowLoc(slaveProperties, "3200101"));
+ }
+
/**
* 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
*/
@@ -207,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 + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
@@ -223,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 + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
@@ -287,15 +240,8 @@
}
- 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);
-
+ public static String getLocNo(Number row, Number bay, Number lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
+
}
--
Gitblit v1.9.1