From f379bb81c7d45142015544969312c5fa1413f87f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 31 八月 2022 14:26:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 108 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 87 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 4b053cb..1fc7f04 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,7 +3,6 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
import java.text.DecimalFormat;
import java.util.ArrayList;
@@ -164,33 +163,100 @@
public static Integer getGroupRow(String locNo, Boolean pakin){
int row = getRow(locNo);
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return pakin?17:2;
+ 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("搴撲綅瑙ｆ瀽寮傚父");
}
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return pakin?30:18;
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
public static List<String> getGroupLoc(String locNo){
int row = getRow(locNo);
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- List<String> result = new ArrayList<>();
- for (Integer row0 : CommonService.FIRST_GROUP_ROW_LIST) {
- result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
- }
- return result;
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(1), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ }};
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
+ }};
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(8), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
+ }};
+ case 12:
+ case 13:
+ case 14:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(14), 2) + locNo.substring(2));
+ }};
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(15), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
+ }};
+ case 19:
+ case 20:
+ case 21:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(21), 2) + locNo.substring(2));
+ }};
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- List<String> result = new ArrayList<>();
- for (Integer row0 : CommonService.SECOND_GROUP_ROW_LIST) {
- result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
- }
- return result;
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
public static void main(String[] args) {
--
Gitblit v1.9.1