From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/utils/Utils.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 16ab732..1b044df 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.service.RowLastnoService;
import com.zy.common.properties.SlaveProperties;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STString;
import java.text.DecimalFormat;
import java.util.ArrayList;
@@ -33,6 +34,12 @@
public static final List<Integer> FOURTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
add(7);add(8);
}};
+ public static final List<Integer> FIFTH_GROUP_ROW_LIST = new ArrayList<Integer>(){{
+ add(9);
+ }};
+ public static final List<Integer> SIXTH_GROUP_ROW_LIST = new ArrayList<Integer>(){{
+ add(10);add(11);
+ }};
public static List<String> getGroupLocNo(String locNo, Boolean pakIn) {
int row = getRow(locNo);
@@ -53,8 +60,19 @@
result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
}
} else if (FOURTH_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[FOURTH_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, FOURTH_GROUP_ROW_LIST);
+// List<Integer> clone = Arrays.asList(new Integer[FOURTH_GROUP_ROW_LIST.size()]);
+// Collections.copy(clone, FOURTH_GROUP_ROW_LIST);
+// Collections.reverse(clone);
+ for (Integer groupRow : FOURTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
+ }
+ }else if (FIFTH_GROUP_ROW_LIST.contains(row)) {
+ for (Integer groupRow : FIFTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
+ }
+ }else if (SIXTH_GROUP_ROW_LIST.contains(row)) {
+ List<Integer> clone = Arrays.asList(new Integer[SIXTH_GROUP_ROW_LIST.size()]);
+ Collections.copy(clone, SIXTH_GROUP_ROW_LIST);
Collections.reverse(clone);
for (Integer integer : clone) {
result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
--
Gitblit v1.9.1