From bd261458eee547abe546aa02b66a35ab511f59a1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 31 十月 2023 10:55:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   81 ++++++++++++++++++++++++++++++----------
 1 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 9638cdc..2a12c7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,14 +13,13 @@
 import com.zy.asrs.service.LocDetlService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.model.LocDto;
 import com.zy.common.model.QueryStockPreDo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -108,25 +107,19 @@
         wapperSetCondition(wrapper,"batch",batch);
         wapperSetCondition(wrapper,"three_code",csocode);
         wapperSetCondition(wrapper,"dead_time",isoseq);
-//        if(Cools.isEmpty(batch)){
-//            wrapper.isNull("batch");
-//        }else {
-//            wrapper.eq("batch",batch);
-//        }
 
         List<LocDetl> locDetlList = this.selectList(wrapper);
-        for (LocDetl locDetl : locDetlList) {
-            //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
-            LocMast locMast = locMastService.selectById(locDetl.getLocNo());
-            if(!"F".equals(locMast.getLocSts())){
-                continue;
-            }
+
+        Set<LocDetl> resort = resort(locDetlList);
+
+        for (LocDetl locDetl : resort) {
+
             if (issued > 0) {
                 double anfme = locDetl.getAnfme();
                 int ioType = anfme > issued ? 103 : 101;
                 anfme = anfme > issued ? issued : anfme;
                 LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
-                //List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+
                 List<Integer> outSite = basDevpService.getAvailableOutSite(101);
 
                 locDto.setStaNos(outSite);
@@ -147,14 +140,10 @@
         wapperSetCondition(wrapper,"batch",batch);
         wapperSetCondition(wrapper,"three_code",csocode);
         wapperSetCondition(wrapper,"dead_time",isoseq);
-//        if(Cools.isEmpty(batch)){
-//            wrapper.isNull("batch");
-//        }else {
-//            wrapper.eq("batch",batch);
-//        }
 
         List<LocDetl> locDetlList = this.selectList(wrapper);
-        for (LocDetl locDetl : locDetlList) {
+        Set<LocDetl> resort = resort(locDetlList);
+        for (LocDetl locDetl : resort) {
             //鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
             LocMast locMast = locMastService.selectById(locDetl.getLocNo());
             if(!"F".equals(locMast.getLocSts())){
@@ -229,6 +218,21 @@
         return this.baseMapper.selectLocNo(matnr);
     }
 
+    public Set<String> selectLocNo(String matnr, String batch, String csocode, String isocode) {
+
+        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr);
+        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+        List<LocDetl> locDetls = this.selectList(wrapper);
+
+        Set<String> locNos = new HashSet<>();
+        locDetls.forEach(locDetl -> {
+            locNos.add(locDetl.getLocNo());
+        });
+
+        return locNos;
+
+    }
+
     @Override
     public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
         return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
@@ -241,4 +245,39 @@
             wrapper.eq(column,condition);
         }
     }
+
+    //鏍规嵁娣辨祬搴撲綅杩涜閲嶆柊鎺掑簭
+    private Set<LocDetl> resort(List<LocDetl> locDetls){
+        Set<LocDetl> locDetlsResort = new LinkedHashSet<>();
+
+        for(LocDetl locDetl : locDetls){
+            LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+            if(!"F".equals(locMast.getLocSts())){
+                continue;
+            }
+
+            List<String> groupOuterLoc = Utils.getGroupOuterLoc(locDetl.getLocNo());
+
+            if(Cools.isEmpty(groupOuterLoc)){
+                locDetlsResort.add(locDetl);
+            }else {
+                groupOuterLoc.add(locDetl.getLocNo());
+                //濡傛灉鏄繁搴撲綅锛屽垯鍏堟壘澶栦晶鐨勫簱浣�
+                for (String locNo : groupOuterLoc){
+                    LocMast locMastOuter = locMastService.selectById(locNo);
+                    //澶栦晶濡傛灉鏄嫞鏂欙紝鍒欏唴娴嬩笉鍏佽鍑�
+                    if("P".equals(locMastOuter.getLocSts()) || "Q".equals(locMastOuter.getLocSts()) || "S".equals(locMastOuter.getLocSts())){
+                        break;
+                    }
+
+                    if(!"F".equals(locMastOuter.getLocSts())){
+                        continue;
+                    }
+                    locDetlsResort.addAll(this.selectByLocNo(locNo));
+
+                }
+            }
+        }
+        return locDetlsResort;
+    }
 }

--
Gitblit v1.9.1