From c832c7f5d6f8c015d609e044e902e070da5240b0 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期日, 24 九月 2023 14:22:57 +0800 Subject: [PATCH] 拣货单 --- src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 66 +++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 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 357cb56..a6f231a 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) { @@ -86,6 +99,43 @@ 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 public Double queryStockAnfme(String matnr, String batch) { return this.baseMapper.queryStockAnfme(matnr, batch); @@ -119,6 +169,9 @@ @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); } @@ -126,4 +179,17 @@ 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.isNull(column); + }else { + wrapper.eq(column,condition); + } + } } -- Gitblit v1.9.1