From c4d9e1eb799a4da88cd4d7ba6053556415f8d8f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 二月 2023 11:04:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   59 ++++++++++++-------
 src/main/resources/mapper/LocMastMapper.xml                    |    2 
 src/main/java/com/zy/common/service/CommonService.java         |  109 ++++++++++++++++--------------------
 3 files changed, 87 insertions(+), 83 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 0ba1412..b311758 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -9,6 +9,7 @@
 import com.zy.asrs.service.RowLastnoService;
 import com.zy.asrs.service.WorkService;
 import com.zy.asrs.utils.Utils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +19,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("locMastService")
 public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
 
@@ -124,33 +126,46 @@
             rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
         }
 
-//        if (!rows.retainAll(new ArrayList<Integer>() {{ add(1);add(2);add(3);}})
-//                || !rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})
-//                || !rows.retainAll(new ArrayList<Integer>() {{ add(15);add(16);add(17);add(18);}})
-//        ) {
-//            locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
-//        } else if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})
-//                || !rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})
-//                || !rows.retainAll(new ArrayList<Integer>() {{ add(19);add(20);add(21);}})
-//        ) {
-//            locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+        // plan first
+//        for (int i = 0; i<locNos.size(); i++) {
+//            LocMast locMast = this.selectById(locNos.get(i));
+//            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("X")) {
+//                        return locMast;
+//                    } else {
+//                        break;
+//                    }
+//                }
+//            }
 //        }
-        for (int i = 0; i<locNos.size(); i++) {
-            LocMast locMast = this.selectById(locNos.get(i));
+//        return null;
+
+        // plan second
+        LocMast finalRes = null;
+        for (String locNo : locNos) {
+            LocMast locMast = this.selectById(locNo);
             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("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
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c3e2a43..d9a2a71 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -210,8 +210,29 @@
             }
         }
 
-        // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+        // 搴撳尯閿佸畾
+        LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
+        if (!Cools.isEmpty(locRule)) {
+            List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1()
+                    , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+            for (LocMast one : locMasts) {
+                List<String> groupLoc = Utils.getGroupLoc(one.getLocNo());
+                LocMast locMast0 = locMastService.findOutMost(groupLoc);
+                if (null != locMast0) {
+                    // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+                        // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+                            crnNo = locMast0.getCrnNo();
+                            locMast = locMast0;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
 
+        // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
         int currentRow = 1;
         if (null == locMast) {
             Shelves shelves = new Shelves(rowCount, crn_qty);
@@ -312,64 +333,18 @@
 
         // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
         if (locMast == null) {
-
-            // 搴撳尯閿佸畾
-            LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
-            if (!Cools.isEmpty(locRule)) {
-                // plan first
-//                List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
-//                List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
-//                        , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
-//                if (!Cools.isEmpty(locMasts)) {
-//                    Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
-//                    for (LocMast one : locMasts) {
-//                        if (one.getRow1().equals(innermostRow)) {
-//                            locMast = one;
-//                            crnNo = locMast.getCrnNo();
-//                            wrapper = new EntityWrapper<StaDesc>()
-//                                    .eq("type_no", staDescId)
-//                                    .eq("stn_no", sourceStaNo)
-//                                    .eq("crn_no", crnNo);
-//                            staDesc = staDescService.selectOne(wrapper);
-//                            if (Cools.isEmpty(staDesc)) {
-//                                log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
-//                                throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
-//                            }
-//                            // 妫�娴嬬洰鏍囩珯
-//                            staNo = basDevpService.selectById(staDesc.getCrnStn());
-//                            if (!staNo.getAutoing().equals("Y")) {
-//                                throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
-//                            }
-//                            break;
-//                        }
-//                    }
-//                }
-
-                // plan second
-                List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1()
-                        , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+            List<Integer> rows = Utils.getGroupLoc(curRow);
+            List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
+            if (!Cools.isEmpty(locMasts)) {
+                Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
                 for (LocMast one : locMasts) {
-
-                }
-            }
-
-            if (locMast == null) {
-                List<Integer> rows = Utils.getGroupLoc(curRow);
-                List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
-                if (!Cools.isEmpty(locMasts)) {
-                    Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
-                    for (LocMast one : locMasts) {
-                        if (one.getRow1().equals(innermostRow)) {
-                            locMast = one;
-                            break;
-                        }
+                    if (one.getRow1().equals(innermostRow)) {
+                        locMast = one;
+                        break;
                     }
                 }
             }
-//            LocMast locMast0 = locMastService.findOutMost(locMasts.stream().map(LocMast::getLocNo).distinct().collect(Collectors.toList()));
-//            if (!Cools.isEmpty(locMast0)) {
-//                locMast = locMast0;
-//            }
+
             // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
 //            if (!locMastService.checkEmptyCount(locMast)) {
 //                locMast = null;
@@ -377,8 +352,6 @@
         }
 
         // 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
-
-
         if (Cools.isEmpty(locMast)) {
             int sign = curRow;
             while (sign != 0 && Cools.isEmpty(locMast)) {
@@ -386,9 +359,25 @@
                 for (LocMast loc : locMasts) {
                     // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
                     boolean success = true;
-                    List<String> outerLoc = Utils.getGroupOuterLoc(loc.getLocNo());
-                    for (String outerLocNo : outerLoc) {
-                        if (!locMastService.selectById(outerLocNo).getLocSts().equals("O")) {
+                    // 娴呭簱浣�
+                    List<String> outerLocList = Utils.getGroupOuterLoc(loc.getLocNo());
+                    for (String outerLocNo : outerLocList) {
+                        LocMast outerLoc = locMastService.selectById(outerLocNo);
+                        if (Cools.isEmpty(outerLoc)) {
+                            continue;
+                        }
+                        if (!outerLoc.getLocSts().equals("O")) {
+                            success = false; break;
+                        }
+                    }
+                    // 娣卞簱浣�
+                    List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
+                    for (String insideLocNo : insideLocList) {
+                        LocMast insideLoc = locMastService.selectById(insideLocNo);
+                        if (Cools.isEmpty(insideLoc)) {
+                            continue;
+                        }
+                        if (insideLoc.getLocSts().equals("R") || insideLoc.getLocSts().equals("P")) {
                             success = false; break;
                         }
                     }
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index ffd3a10..2146663 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -237,7 +237,7 @@
     <select id="queryFreeLocMast2" resultMap="BaseResultMap">
         select *
         from asr_loc_mast
-        where row1=#{row}
+        where 1=1
         and loc_sts='O'
         <if test="locType1 != null">
             and loc_type1 = #{locType1}

--
Gitblit v1.9.1