From b6a8cc0f2d3ced0b287348eb2a6a5785129f0ffb Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 25 三月 2021 09:12:04 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 71 +++++++++++++++++++++++++++++++++-- 1 files changed, 67 insertions(+), 4 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 d80fcf3..6d88519 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 @@ -10,13 +10,17 @@ 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.entity.param.StockTransferParam; 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 { @@ -25,10 +29,14 @@ 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 @@ -43,9 +51,12 @@ 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")); - if (!Cools.isEmpty(locDetls1)) { - result.addAll(locDetls1); + for (LocDetl locDetl : locDetls1) { + if (!nodeIds.contains(locDetl.getNodeId())) { + result.add(locDetl); + } } return result; } @@ -74,9 +85,61 @@ } @Override + public List<StockTransferParam> checkLocDetlCountOfRes(String number) { + List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1)); + boolean asrs = false; + List<StockTransferParam> params = new ArrayList<>(); + for (CustOrder custOrder : custOrders) { + Double count = this.baseMapper.selectCountByMatnr(custOrder.getUserCode()); + if (count == null) { + count = 0.0D; + } + if (count < custOrder.getQty()) { + if (!asrs) { asrs = true; } + StockTransferParam param = new StockTransferParam(); + param.setMatnr(custOrder.getUserCode()); + param.setAnfme(custOrder.getQty() - count); + param.setTotal(custOrder.getQty()); + params.add(param); + } + } + return params; + } + + @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; + } + + @Override + public List<LocDetl> getLocDetlStatis() { + return this.baseMapper.getLocDetlStatis(); + } + + @Override + public Double selectCountByMatnr(String matnr) { + return this.baseMapper.selectCountByMatnr(matnr); + } + + @Override + public List<LocDetl> findByNodeUuid(String uuid) { + return this.baseMapper.selectByNodeUuid(uuid); + } + } -- Gitblit v1.9.1