From 9ad0e9864a506a912829eca81944c4698d76de5d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 09:39:36 +0800
Subject: [PATCH] 库位地图，出库选择，出库拦截非空库位
---
src/main/java/com/zy/asrs/utils/Utils.java | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e75e2a8..e5cc52f 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,12 +3,10 @@
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;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2020/8/27
@@ -227,61 +225,59 @@
public static List<String> getGroupLoc(String locNo){
int row = getRow(locNo);
+ ArrayList<String> list = new ArrayList<>();
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));
- }};
+ list.add(zerofill(String.valueOf(1), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
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));
- }};
+ list.add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
+ return list;
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));
- }};
+ list.add(zerofill(String.valueOf(8), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
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));
- }};
+ list.add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(14), 2) + locNo.substring(2));
+ return list;
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));
- }};
+ list.add(zerofill(String.valueOf(15), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
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));
- }};
+ list.add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(21), 2) + locNo.substring(2));
+ return list;
default:
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
@@ -532,4 +528,9 @@
return result;
}
+ public static void main(String[] args) {
+ List<String> groupLoc = Utils.getGroupLoc("1300801");
+ System.out.println(groupLoc);
+ }
+
}
--
Gitblit v1.9.1