From abb7c67088e18f8052eeff6d35b611286eedcee5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 三月 2025 15:52:02 +0800
Subject: [PATCH] #出入库改动
---
src/main/java/com/zy/asrs/utils/Utils.java | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index b2faf2b..7a4e7a3 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -189,29 +189,36 @@
public static Integer getOutLayerRow(String locNo, Boolean pakin){
int row = getRow(locNo);
- // 鍏ュ簱
- if (pakin) {
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 17;
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 18;
- } else {
- return -1;
-// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- // 鍑哄簱
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 4;
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 5;
} else {
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 2;
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 30;
- } else {
- return -1;
-// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
+ return -1;
}
}
+
+ public static Integer getInnermostRow(String locNo){
+ int row = getRow(locNo);
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return 1;
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ return 11;
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
public static List<Integer> getGroupLoc(Integer row){
if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
@@ -227,17 +234,17 @@
public static List<String> getGroupOuterLoc(String locNo){
int row = getRow(locNo);
List<String> result = new ArrayList<>();
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
+ 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.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);
+ } else 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);
for (Integer integer : clone) {
if (integer > row) {
@@ -252,13 +259,17 @@
return result;
}
+ public static void main(String[] args) {
+ System.out.println(JSON.toJSONString(getGroupOuterLoc("0200101")));
+ }
+
// 鍐呬晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
public static List<String> getGroupInsideLoc(String locNo){
int row = getRow(locNo);
List<String> result = new ArrayList<>();
- 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);
+ 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) {
@@ -267,8 +278,8 @@
break;
}
}
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
+ } else if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
if (integer < row) {
result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
} else {
@@ -288,17 +299,17 @@
public static List<String> getGroupOutsideLoc(String locNo){
int row = getRow(locNo);
List<String> result = new ArrayList<>();
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
+ 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.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);
+ } else 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);
for (Integer integer : clone) {
if (integer > row) {
@@ -314,10 +325,6 @@
Collections.reverse(result);
}
return result;
- }
-
- public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupOutsideLoc("0500201")));
}
}
--
Gitblit v1.9.1