From c1702cc51a4d94ed37d5083494c87fe0f2cbe5b3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 18 六月 2021 10:20:13 +0800 Subject: [PATCH] # 销售单取消后回滚立库出库至A99 --- src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 81 +++++++++++++++++++++++++++++++++------- 1 files changed, 67 insertions(+), 14 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 3cb3441..8b51c74 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 @@ -7,25 +7,28 @@ 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.common.model.MatnrDto; 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.Optional; import java.util.stream.Collectors; @Service("locDetlService") public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService { @Autowired - private CustOrderService custOrderService; - @Autowired private MatService matService; + @Autowired + private PriorService priorService; @Override public Page<LocDetl> getPage(Page<LocDetl> page) { @@ -57,26 +60,40 @@ } @Override - public void checkLocDetlCount(String number) { - List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1)); + public void checkLocDetlCount(List<MatnrDto> dtos) { StringBuilder errorMsg = new StringBuilder(); boolean error = false; - for (CustOrder custOrder : custOrders) { - Double count = this.baseMapper.selectCountByMatnr(custOrder.getUserCode()); - if (count == null) { - count = 0.0D; - } - if (count < custOrder.getQty()) { + for (MatnrDto dto : dtos) { + Double count = Optional.ofNullable(baseMapper.selectCountByMatnr(dto.getMatnr())).orElse(0.0D); + if (count < dto.getCount()) { if (!error) { error = true; } - Mat mat = matService.selectByMatnr(custOrder.getUserCode()); - errorMsg.append(mat == null ? custOrder.getUserCode() : mat.getMaktx()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(custOrder.getQty() - count).append("</br>"); + Mat mat = matService.selectByMatnr(dto.getMatnr()); + errorMsg.append(mat == null ? dto.getMatnr() : mat.getMaktx()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(dto.getCount() - count).append("</br>"); } } if (error) { throw new CodeCoolException("20001-" + errorMsg.toString()); } + } + + @Override + public List<StockTransferParam> checkLocDetlCountOfRes(List<MatnrDto> dtos) { + boolean asrs = false; + List<StockTransferParam> params = new ArrayList<>(); + for (MatnrDto dto : dtos) { + Double count = Optional.ofNullable(baseMapper.selectCountByMatnr(dto.getMatnr())).orElse(0.0D); + if (count < dto.getCount()) { + if (!asrs) { asrs = true; } + StockTransferParam param = new StockTransferParam(); + param.setMatnr(dto.getMatnr()); + param.setAnfme(dto.getCount() - count); + param.setTotal(dto.getCount()); + params.add(param); + } + } + return params; } @Override @@ -94,6 +111,42 @@ 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); + } + + @Override + public Page<LocDetl> getStockStatis(Page<LocDetl> page) { + page.setRecords(baseMapper.getStockStatis(page.getCondition())); + page.setTotal(baseMapper.getStockStatisCount(page.getCondition())); + return page; + } + + @Override + public List<LocDetl> getStockStatisExcel() { + return this.baseMapper.getStockStatisExcel(); + } + + @Override + public Double getStockByDocType34(String matnr) { + return this.baseMapper.getStockByDocType34(matnr); + } } -- Gitblit v1.9.1