From dca272efbaf315859decfcd339b39f9f647fffad Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 三月 2023 10:17:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 7a4e7a3..9fd11fb 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -234,15 +234,7 @@
public static List<String> getGroupOuterLoc(String locNo){
int row = getRow(locNo);
List<String> result = new ArrayList<>();
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
Collections.reverse(clone);
@@ -253,8 +245,36 @@
break;
}
}
- } else {
-// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
+ List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
+ Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
+ Collections.reverse(clone);
+ for (Integer integer : clone) {
+ if (integer > row) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ } else {
+ break;
+ }
+ }
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
+ List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
+ Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
+ Collections.reverse(clone);
+ for (Integer integer : clone) {
+ if (integer > row) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ } else {
+ break;
+ }
+ }
+ } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
+ for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
+ if (integer < row) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ } else {
+ break;
+ }
+ }
}
return result;
}
--
Gitblit v1.9.1