From b801ccf0a01277b0796ee6f822346836e33de148 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 14:55:46 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   12 ++++++++++++
 src/main/java/com/zy/asrs/service/LocMastService.java          |    2 ++
 src/main/java/com/zy/common/service/CommonService.java         |   20 +++++++++++++-------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 9dbfeae..4b8f371 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -46,6 +46,8 @@
 
     LocMast findNearloc(String locNo);
 
+    LocMast findInnerLoc(String locNo);
+
     List<LocMast> selectAllPeakLoc();
 
     Boolean checkAllLocEmpty(List<String> groupOuterLoc);
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 be4b66b..c1fa598 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -145,6 +145,18 @@
         return locMast;
     }
 
+    @Override
+    public LocMast findInnerLoc(String locNo) {
+        List<String> groupLoc = Utils.getGroupLoc(locNo);
+        for (String loc : groupLoc) {
+            LocMast tmp = this.baseMapper.selectByLoc(loc);
+            if (tmp.getLocSts().equals("O")) {
+                return tmp;
+            }
+        }
+        return null;
+    }
+
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
      */
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f5e4231..b7887ae 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -203,9 +203,12 @@
 
                 List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
                 for (LocMast locMast0 : locMasts) {
-                    //棰勭暀绌哄簱浣�
-                    if (locMastService.checkEmptyCount(locMast0, 10)) {
-                        return locMast0;
+                    LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
+                    if (locMast1 != null) {
+                        //棰勭暀绌哄簱浣�
+                        if (locMastService.checkEmptyCount(locMast1, 10)) {
+                            return locMast1;
+                        }
                     }
                 }
             }
@@ -250,9 +253,12 @@
 
             List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
             for (LocMast locMast0 : locMasts) {
-                //棰勭暀绌哄簱浣�
-                if (locMastService.checkEmptyCount(locMast0, 10)) {
-                    return locMast0;
+                LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
+                if (locMast1 != null) {
+                    //棰勭暀绌哄簱浣�
+                    if (locMastService.checkEmptyCount(locMast1, 10)) {
+                        return locMast1;
+                    }
                 }
             }
         }
@@ -285,7 +291,7 @@
                 //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
                 List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
                 for (String locNo : locNos) {
-                    LocMast locMast0 = locMastService.findNearloc(locNo);
+                    LocMast locMast0 = locMastService.findInnerLoc(locNo);
                     if (null != locMast0) {
                         // 娴呭簱浣嶇鍚堝昂瀵告娴�
                         if (VersionUtils.checkLocType(locMast0, locTypeDto)) {

--
Gitblit v1.9.1