From 69c098271a9f52c2d57073eb9c150d0f8b672323 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 20 十月 2022 15:27:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   17 +
 src/main/java/com/zy/asrs/utils/Utils.java                     |  420 ++++++++++++---------------------------------------
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |    4 
 src/main/java/com/zy/common/service/CommonService.java         |    2 
 4 files changed, 119 insertions(+), 324 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index eae14bd..c5c1dfa 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -58,7 +58,7 @@
 
     @Override
     public Boolean isOutMost(String locNo, Boolean pakin) {
-        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutermostRow(locNo, true);
+        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, true);
     }
 
     @Override
@@ -99,10 +99,19 @@
         } else {
             rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
         }
-        for (String locNo : locNos) {
-            LocMast locMast = this.selectById(locNo);
+        for (int i = 0; i<locNos.size(); i++) {
+            LocMast locMast = this.selectById(locNos.get(i));
             if (locMast.getLocSts().equals("O")) {
-                return locMast;
+                if (i == 0) {
+                    return locMast;
+                } else {
+                    LocMast lastLoc = this.selectById(locNos.get(i - 1));
+                    if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D")  || lastLoc.getLocSts().equals("X")) {
+                        return locMast;
+                    } else {
+                        break;
+                    }
+                }
             }
         }
         return null;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 12559a5..1738b59 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -54,7 +54,7 @@
                     for (String outerLoc : groupOuterLoc) {
                         WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(outerLoc);
                         if (wrkMast != null) {
-                            defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
+                            defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
                         }
                     }
                 }
@@ -63,7 +63,7 @@
                     for (String insideLoc : groupInsideLoc) {
                         WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(insideLoc);
                         if (wrkMast != null) {
-                            defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
+                            defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
                         }
                     }
                 }
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 0d5ef85..68cb066 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.core.common.Arith;
 import com.core.common.Cools;
 import com.zy.common.properties.SlaveProperties;
@@ -7,6 +8,8 @@
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -162,323 +165,6 @@
 
     }
 
-    public static Integer getOutermostRow(String locNo, Boolean pakin){
-        int row = getRow(locNo);
-        switch (row) {
-            case 1:
-            case 2:
-            case 3:
-                return 3;
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-                return 4;
-            case 8:
-            case 9:
-            case 10:
-            case 11:
-                return 11;
-            case 12:
-            case 13:
-            case 14:
-                return 12;
-            case 15:
-            case 16:
-            case 17:
-            case 18:
-                return 18;
-            case 19:
-            case 20:
-            case 21:
-                return 19;
-            default:
-                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-    }
-
-    public static Integer getInnermostRow(String locNo){
-        int row = getRow(locNo);
-        switch (row) {
-            case 1:
-            case 2:
-            case 3:
-                return 1;
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-                return 7;
-            case 8:
-            case 9:
-            case 10:
-            case 11:
-                return 8;
-            case 12:
-            case 13:
-            case 14:
-                return 14;
-            case 15:
-            case 16:
-            case 17:
-            case 18:
-                return 15;
-            case 19:
-            case 20:
-            case 21:
-                return 21;
-            default:
-                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-    }
-
-    public static List<Integer> getGroupLoc(Integer row){
-        switch (row) {
-            case 1:
-            case 2:
-            case 3:
-                return new ArrayList<Integer>() {{
-                    add(1);
-                    add(2);
-                    add(3);
-                }};
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-                return new ArrayList<Integer>() {{
-                    add(4);
-                    add(5);
-                    add(6);
-                    add(7);
-                }};
-            case 8:
-            case 9:
-            case 10:
-            case 11:
-                return new ArrayList<Integer>() {{
-                    add(8);
-                    add(9);
-                    add(10);
-                    add(11);
-                }};
-            case 12:
-            case 13:
-            case 14:
-                return new ArrayList<Integer>() {{
-                    add(12);
-                    add(13);
-                    add(14);
-                }};
-            case 15:
-            case 16:
-            case 17:
-            case 18:
-                return new ArrayList<Integer>() {{
-                    add(15);
-                    add(16);
-                    add(17);
-                    add(18);
-            }};
-            case 19:
-            case 20:
-            case 21:
-                return new ArrayList<Integer>() {{
-                    add(19);
-                    add(20);
-                    add(21);
-                }};
-            default:
-                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-    }
-
-    // 娉ㄦ剰椤哄簭
-    public static List<String> getGroupOuterLoc(String locNo){
-        int row = getRow(locNo);
-        switch (row) {
-            case 1:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
-                }};
-            case 2:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
-                }};
-            case 3:
-            case 4:
-            case 11:
-            case 12:
-            case 18:
-            case 19:
-                return new ArrayList<>();
-            case 5:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
-                }};
-            case 6:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
-                }};
-            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));
-                }};
-            case 8:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
-                }};
-            case 9:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
-                }};
-            case 10:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
-                }};
-            case 13:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
-                }};
-            case 14:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
-                }};
-            case 15:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
-                }};
-            case 16:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
-                }};
-            case 17:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
-                }};
-            case 20:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
-                }};
-            case 21:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
-                }};
-            default:
-                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-    }
-
-    // 娉ㄦ剰椤哄簭
-    public static List<String> getGroupInsideLoc(String locNo){
-        int row = getRow(locNo);
-        switch (row) {
-            case 1:
-            case 21:
-            case 14:
-            case 15:
-            case 7:
-            case 8:
-                return new ArrayList<>();
-            case 2:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(1), 2) + locNo.substring(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));
-                }};
-            case 4:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
-                }};
-            case 5:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
-                }};
-            case 6:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
-                }};
-            case 9:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(8), 2) + locNo.substring(2));
-                }};
-            case 10:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(8), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
-                }};
-            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));
-                }};
-            case 12:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(14), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
-                }};
-            case 13:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(14), 2) + locNo.substring(2));
-                }};
-            case 16:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(15), 2) + locNo.substring(2));
-                }};
-            case 17:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(15), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
-                }};
-            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));
-                }};
-            case 19:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(21), 2) + locNo.substring(2));
-                    add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
-                }};
-            case 20:
-                return new ArrayList<String>() {{
-                    add(zerofill(String.valueOf(21), 2) + locNo.substring(2));
-                }};
-            default:
-                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-    }
-
-    public static Integer getGroupRow(String locNo, Boolean pakin){
-        int row = getRow(locNo);
-        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-            return pakin?17:2;
-        }
-        if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
-            return pakin?30:18;
-        }
-        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-    }
 
 
     public static List<String> getGroupLoc(String locNo){
@@ -500,4 +186,104 @@
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
 
+
+    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 {
+                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+            }
+        // 鍑哄簱
+        } else {
+            if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+                return 2;
+            } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+                return 30;
+            } else {
+                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+            }
+        }
+    }
+
+
+    public static List<Integer> getGroupLoc(Integer row){
+        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+            return CommonService.FIRST_GROUP_ROW_LIST;
+        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+            return CommonService.SECOND_GROUP_ROW_LIST;
+        } else {
+            throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+        }
+    }
+
+    // 澶栦晶鏂瑰悜鐨勮揣浣�  浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜
+    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 (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 {
+            throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+        }
+        return result;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(JSON.toJSONString(getGroupInsideLoc("2300101")));
+    }
+
+    // 鍐呬晶鏂瑰悜鐨勮揣浣�  浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
+    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);
+            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)) {
+            for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
+                if (integer < row) {
+                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+                } else {
+                    break;
+                }
+            }
+        } else {
+            throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+        }
+        if (!Cools.isEmpty(result)) {
+            Collections.reverse(result);
+        }
+        return result;
+    }
+
 }
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index db1539e..9e82564 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -236,7 +236,7 @@
 
             List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
             if (!Cools.isEmpty(locMasts)) {
-                Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
+                Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
                 for (LocMast one : locMasts) {
                     if (one.getRow1().equals(innermostRow)) {
                         locMast = one;

--
Gitblit v1.9.1