From 8084dd691e1e1914cde3df118360561c7016ade1 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 08 三月 2023 10:07:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 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 4d0af43..9a1ea8f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -11,6 +11,7 @@
 import com.zy.asrs.service.WorkService;
 import com.zy.asrs.utils.Utils;
 import com.zy.common.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +19,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+@Slf4j
 @Service("locMastService")
 public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
 
@@ -28,6 +30,11 @@
 
     @Override
     public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
+        return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
+    }
+
+    @Override
+    public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1) {
         return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
     }
 
@@ -49,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
@@ -63,7 +70,7 @@
 
     @Override
     public Boolean isOutMost(String locNo, Boolean pakin) {
-        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, true);
+        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, pakin);
     }
 
     public static void main(String[] args) {
@@ -82,24 +89,29 @@
         } else {
             throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
         }
-        // 鍏ュ簱澶栧眰搴撲綅婊炵┖
-        for (int i = 0; i<locNos.size() - 1; i++) {
-            LocMast locMast = this.selectById(locNos.get(i));
+
+        // plan second
+        LocMast finalRes = null;
+        for (String locNo0 : locNos) {
+            LocMast locMast = this.selectById(locNo0);
             if (locMast.getLocSts().equals("O")) {
-                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("S") || lastLoc.getLocSts().equals("X")) {
-                        return locMast;
-                    } else {
-                        break;
-                    }
+                if (finalRes == null) {
+                    finalRes = locMast;
                 }
+            } else {
+                if (finalRes != null) {
+                    log.error("{}搴撲綅寮傚父锛歿}搴撲綅鐘舵�佷负O.绌哄簱浣嶏紝浣唟}搴撲綅鐘舵�佷负{}", finalRes.getLocNo(), finalRes.getLocNo(), locMast.getLocNo(), locMast.getLocSts());
+                    finalRes = null;
+                    break;
+                }
+                if (locMast.getLocSts().equals("R") || locMast.getLocSts().equals("P")) {
+                    finalRes = null;
+                    break;
+                }
+                finalRes = null;
             }
         }
-        return null;
+        return finalRes;
     }
 
     @Override
@@ -121,15 +133,7 @@
 
     @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;
     }
 
 }

--
Gitblit v1.9.1