From 3602e4088519be44965118c852593c6376217d4e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 13:46:38 +0800
Subject: [PATCH] jlwms ==> xzjlwms

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   74 +++++++++++++++++++++++++++++++------
 1 files changed, 62 insertions(+), 12 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 8764787..b63a392 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -34,6 +34,11 @@
     }
 
     @Override
+    public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
+        return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
+    }
+
+    @Override
     public LocMast queryFreeLocMast0(Integer row, Short locType1) {
         return this.baseMapper.queryFreeLocMast0(row, locType1);
     }
@@ -51,11 +56,11 @@
     }
 
     @Override
-    public Boolean checkEmptyCount(LocMast locMast) {
+    public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
         if (locMast == null) {
             return false;
         }
-        return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > 1;
+        return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank;
     }
 
     @Override
@@ -79,7 +84,7 @@
         int row = Utils.getRow(locNo);
         List<String> locNos = Utils.getGroupLoc(locNo);
         if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row) || CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
             Collections.reverse(locNos);
         } else {
             throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
@@ -89,6 +94,10 @@
         LocMast finalRes = null;
         for (String locNo0 : locNos) {
             LocMast locMast = this.selectById(locNo0);
+            if (locMast == null) {
+                continue;
+            }
+            
             if (locMast.getLocSts().equals("O")) {
                 if (finalRes == null) {
                     finalRes = locMast;
@@ -128,15 +137,56 @@
 
     @Override
     public Integer getOutCrnNo(LocMast locMast) {
-        int row = Utils.getRow(locMast.getLocNo());
-        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-            return 1;
-        }
-        if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
-            return 3;
-        } else {
-            return locMast.getCrnNo();
-        }
+        return 1;
     }
 
+    @Override
+    public LocMast findNearloc(String locNo) {
+        int row = getRow(locNo);
+        LocMast locMast = null;
+        if (row>19) {
+            List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+            if (!Cools.isEmpty(groupOuterLoc)) {
+                locMast = this.baseMapper.selectAvailableNearLocDesc(groupOuterLoc);
+            }
+
+        }else {
+            List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+            if (!Cools.isEmpty(groupOuterLoc)) {
+                locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
+            }
+        }
+        return locMast;
+    }
+
+    /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
+     */
+    public static int getRow(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Integer.parseInt(locNo.substring(0, 2));
+        }
+        throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+    }
+
+    @Override
+    public List<LocMast> selectAllPeakLoc() {
+        return this.baseMapper.selectAllPeakLoc();
+    }
+
+    @Override
+    public Boolean checkAllLocEmpty(List<String> groupOuterLoc) {
+        List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
+        return result.size() <= 0;
+    }
+
+    @Override
+    public List<LocMast> selectLocByLev(Integer lev) {
+        return this.baseMapper.selectLocByLev(lev);
+    }
+
+    @Override
+    public List<LocMast> selectEmptyByLocNos(List<String> locNos) {
+        return this.baseMapper.selectEmptyByLocNos(locNos);
+    }
 }

--
Gitblit v1.9.1