From 668e40d51e654104287a3f63c7fd856657a35a11 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 19 十月 2023 11:39: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/LocDetlServiceImpl.java |   76 +++++++++++++++++++++++++++++++++++--
 1 files changed, 71 insertions(+), 5 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 a6f231a..ee8b387 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -9,15 +9,18 @@
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.BasDevpService;
 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.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -28,6 +31,8 @@
     private StaDescService staDescService;
     @Autowired
     private LocMastService locMastService;
+    @Autowired
+    private BasDevpService basDevpService;
 
     @Override
     public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -123,8 +128,49 @@
                 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);
-                locDto.setStaNos(staNos);
+                //List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+                List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+
+                locDto.setStaNos(outSite);
+                locDto.setCsocode(csocode);
+                locDto.setIsoseq(isoseq);
+                locDto.setContainerCode(locDetl.getSuppCode());
+                locDtoList.add(locDto);
+                // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+                issued = issued - locDetl.getAnfme();
+            }
+        }
+        return issued;
+    }
+
+    //琛ヨ揣鍑哄簱
+    public double queryStockAndSetLocDto1(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
+        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;
+            }
+            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);
                 locDto.setCsocode(csocode);
                 locDto.setIsoseq(isoseq);
                 locDto.setContainerCode(locDetl.getSuppCode());
@@ -163,8 +209,8 @@
 
 
     @Override
-    public LocDetl selectItem(String locNo, String matnr, String batch) {
-        return this.baseMapper.selectItem(locNo, matnr, batch);
+    public LocDetl selectItem(String locNo, String matnr, String batch,String suppCode) {
+        return this.baseMapper.selectItem(locNo, matnr, batch,suppCode);
     }
 
     @Override
@@ -181,13 +227,33 @@
     }
 
     @Override
+    public List<String> selectLocNo(String matnr) {
+        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);
     }
 
     private void wapperSetCondition(Wrapper wrapper,String column, String condition){
         if(Cools.isEmpty(condition)){
-            wrapper.isNull(column);
+            wrapper.andNew().eq(column,"").or().isNull(column);
         }else {
             wrapper.eq(column,condition);
         }

--
Gitblit v1.9.1