From fbed9fbabbc2d560d7a341b426d7604d72f3b6c4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 31 五月 2023 08:23:31 +0800
Subject: [PATCH] 111库格移栽任务完成处理
---
src/main/java/com/zy/asrs/utils/Utils.java | 127 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 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 1921ffb..5ded7a4 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -348,6 +348,129 @@
}
}
+ /**
+ * 鑾峰彇鍐呬晶宸烽亾搴撲綅缁�
+ */
+ public static List<String> getGroupInsideRoadwayLoc(String locNo){
+ int row = getRow(locNo);
+ ArrayList<String> list = new ArrayList<>();
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ list.add(zerofill(String.valueOf(1), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ 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:
+ 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));
+ Collections.reverse(list);
+ return list;
+ case 12:
+ case 13:
+ case 14:
+ 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:
+ 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));
+ Collections.reverse(list);
+ return list;
+ case 19:
+ case 20:
+ case 21:
+ 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("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
+ // 鑾峰彇褰撳墠搴撲綅鍑哄簱鍓嶆柟搴撲綅缁勪笉鍖呭惈鏈�澶栦晶搴撲綅
+ public static List<String> getGroupOutWrkLoc(String locNo){
+ int row = getRow(locNo);
+ switch (row) {
+ case 1:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ }};
+ case 2:
+ case 3:
+ return new ArrayList<>();
+ case 4:
+ case 5:
+ return new ArrayList<>();
+ case 6:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ }};
+ case 7:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ }};
+ case 8:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ }};
+ case 9:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ }};
+ case 10:
+ case 11:
+ return new ArrayList<>();
+ case 12:
+ case 13:
+ return new ArrayList<>();
+ case 14:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
+ }};
+ case 15:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ }};
+ case 16:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ }};
+ case 17:
+ case 18:
+ return new ArrayList<>();
+ case 19:
+ case 20:
+ return new ArrayList<>();
+ case 21:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
+ }};
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
// 娉ㄦ剰椤哄簭
public static List<String> getGroupOuterLoc(String locNo){
int row = getRow(locNo);
@@ -542,7 +665,7 @@
if (sign) {
break;
}
- List<String> groupInsideLoc = Utils.getGroupLoc(locNo);
+ List<String> groupInsideLoc = Utils.getGroupOutWrkLoc(locNo);
if (!Cools.isEmpty(groupInsideLoc)) {
for (String insideLoc : groupInsideLoc) {
if (locNos.contains(insideLoc)) {
@@ -552,7 +675,7 @@
if (locMast != null) {
if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
sign = true;
- th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
+ th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅" + locMast.getLocNo() + "锛�";
break;
}
}
--
Gitblit v1.9.1