From d559780d63e92b9cbbdf82b819cbc8bc9053da80 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 16 三月 2021 08:18:59 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java index 733e735..1e673f3 100644 --- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java @@ -3,18 +3,23 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.core.common.Cools; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import zy.cloud.wms.common.config.CodeCoolException; import zy.cloud.wms.manager.entity.CustOrder; import zy.cloud.wms.manager.entity.LocDetl; import zy.cloud.wms.manager.entity.Mat; +import zy.cloud.wms.manager.entity.Prior; import zy.cloud.wms.manager.mapper.LocDetlMapper; import zy.cloud.wms.manager.service.CustOrderService; import zy.cloud.wms.manager.service.LocDetlService; import zy.cloud.wms.manager.service.MatService; +import zy.cloud.wms.manager.service.PriorService; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @Service("locDetlService") public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService { @@ -23,15 +28,36 @@ private CustOrderService custOrderService; @Autowired private MatService matService; + @Autowired + private PriorService priorService; @Override - public Page<LocDetl> getPage(Page page, String nodeId, Object locNo, Object matnr, Object maktx) { - return page.setRecords(baseMapper.listByPage(page, nodeId, locNo, matnr, maktx)); + public Page<LocDetl> getPage(Page<LocDetl> page) { + page.setRecords(baseMapper.listByPage(page.getCondition())); + page.setTotal(baseMapper.listByPageCount(page.getCondition())); + return page; } @Override public LocDetl getLocDetl(Long nodeId, String matnr) { return this.baseMapper.selectByLocNoAndMatnr(nodeId, matnr); + } + + @Override + public List<LocDetl> findOfSort(String matnr) { + List<LocDetl> result = new ArrayList<>(); + List<LocDetl> locDetls = this.baseMapper.selectByPrior(matnr, null); + if (!Cools.isEmpty(locDetls)) { + result.addAll(locDetls); + } + List<Long> nodeIds = locDetls.stream().map(LocDetl::getNodeId).distinct().collect(Collectors.toList()); + List<LocDetl> locDetls1 = this.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr).eq("status", 1).orderBy("create_time")); + for (LocDetl locDetl : locDetls1) { + if (!nodeIds.contains(locDetl.getNodeId())) { + result.add(locDetl); + } + } + return result; } @Override @@ -57,5 +83,25 @@ } } + @Override + public Boolean reduceStock(Long nodeId, String matnr, Double anfme) { + return this.baseMapper.reduceStock(nodeId, matnr, anfme)>0; + } + + @Override + public Boolean incrementStock(Long nodeId, String matnr, Double anfme) { + return this.baseMapper.incrementStock(nodeId, matnr, anfme)>0; + } + + @Override + public Boolean removeStock(Long nodeId, String matnr) { + return this.baseMapper.removeStock(nodeId, matnr)>0; + } + + @Override + public Boolean isPrior(Long nodeId, String matnr) { + return priorService.selectCount(new EntityWrapper<Prior>().eq("matnr", matnr).eq("node_id", nodeId).eq("status", 1))>0; + } + } -- Gitblit v1.9.1