From cda03cb23bc12f582029ac8d6df103d86e61fc8b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 02 十月 2023 13:48:57 +0800
Subject: [PATCH] AGV调试更改 工作档自增

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   83 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 80 insertions(+), 3 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 213eaad..10265ee 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,12 +1,20 @@
 package com.zy.asrs.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.StaDescService;
+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;
@@ -15,6 +23,11 @@
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+    @Autowired
+    private StaDescService staDescService;
+    @Autowired
+    private LocMastService locMastService;
 
     @Override
     public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -38,8 +51,8 @@
     }
 
     @Override
-    public List<String> getSameDetl(String matnr, Integer start, Integer end) {
-        return this.baseMapper.selectSameDetl(matnr, start, end);
+    public List<String> getSameDetl(String matnr) {
+        return this.baseMapper.selectSameDetl(matnr);
     }
 
     @Override
@@ -80,10 +93,48 @@
         List<LocDetl> result = new ArrayList<>();
         List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
         for (QueryStockPreDo preDo : preDos) {
-            List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getBay());
+            List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
             result.addAll(locDetls);
         }
         return result;
+    }
+
+    //鍑哄簱
+    public double queryStockAndSetLocDto(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);
+
+                locDto.setStaNos(staNos);
+                locDto.setCsocode(csocode);
+                locDto.setIsoseq(isoseq);
+                locDto.setContainerCode(locDetl.getSuppCode());
+                locDtoList.add(locDto);
+                // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+                issued = issued - locDetl.getAnfme();
+            }
+        }
+        return issued;
     }
 
     @Override
@@ -116,4 +167,30 @@
     public LocDetl selectItem(String locNo, String matnr, String batch) {
         return this.baseMapper.selectItem(locNo, matnr, batch);
     }
+
+    @Override
+    public List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo) {
+        if (Cools.isEmpty(orderNo) && Cools.isEmpty(matnr) && Cools.isEmpty(maktx) && Cools.isEmpty(specs) && Cools.isEmpty(locNo)) {
+            return new ArrayList<LocDetl>();
+        }
+        return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo);
+    }
+
+    @Override
+    public List<LocDetl> selectByLocNo(String locNo) {
+        return this.baseMapper.selectByLocNo(locNo);
+    }
+
+    @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.andNew().eq(column,"").or().isNull(column);
+        }else {
+            wrapper.eq(column,condition);
+        }
+    }
 }

--
Gitblit v1.9.1