From 16fea9a478c5c0f0c38a84b476083c8473f90eb8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 04 三月 2021 11:16:14 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/common/service/MainService.java | 73 +++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 22 deletions(-) diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java index 8fb5db3..dbc4645 100644 --- a/src/main/java/zy/cloud/wms/common/service/MainService.java +++ b/src/main/java/zy/cloud/wms/common/service/MainService.java @@ -1,25 +1,28 @@ package zy.cloud.wms.common.service; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import zy.cloud.wms.common.model.OrderStoDto; +import zy.cloud.wms.common.utils.VersionUtils; 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.service.LocDetlService; -import zy.cloud.wms.manager.service.MatService; -import zy.cloud.wms.manager.service.PakoutService; -import zy.cloud.wms.manager.service.PriorService; +import zy.cloud.wms.manager.entity.Pakout; +import zy.cloud.wms.manager.service.*; +import java.util.Date; import java.util.List; +import java.util.Optional; /** * Created by vincent on 2021/3/1 */ +@Slf4j @Service("mainService") public class MainService { @@ -30,32 +33,58 @@ @Autowired private PakoutService pakoutService; @Autowired - private PriorService priorService; + private CustOrderService custOrderService; + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; @Transactional - public void stockOutProcess(List<CustOrder> list) { - if (Cools.isEmpty(list)) { + public void stockOutProcess(OrderStoDto dto) { + if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) { return; } - for (CustOrder data : list) { + // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶� + locDetlService.checkLocDetlCount(dto.getNumber()); + Date now = new Date(); + for (CustOrder custOrder : dto.getCustOrders()) { // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪 - Mat mat = matService.selectByMatnr(data.getUserCode()); + Mat mat = matService.selectByMatnr(custOrder.getUserCode()); if (null == mat) { - throw new CoolException(data.getUserCode() + "鐗╂枡灏氭湭鏇存柊銆�" + data.getNumber() +"鍗曟嵁鍥犳涓柇锛�"); + throw new CoolException(custOrder.getUserCode() + "鐗╂枡灏氭湭鏇存柊銆�" + custOrder.getNumber() +"鍗曟嵁鍥犳涓柇锛�"); } - // 鏍规嵁鎺ㄨ崘搴撲綅鏌ユ壘搴撳瓨 - List<Prior> priors = priorService.selectList(new EntityWrapper<Prior>().eq("matnr", mat.getMatnr()).orderBy("prio")); - if (!Cools.isEmpty(priors)) { - for (Prior prior : priors) { - LocDetl locDetl = locDetlService.getLocDetl(prior.getNodeId(), prior.getMatnr()); - if (null != locDetl) { - + // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣� + List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr()); + double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ; + while (issued > 0) { + for (LocDetl locDetl : locDetls) { + // 淇濆瓨鍑哄簱閫氱煡鍗� + Pakout pakout = new Pakout(); + pakout.setWrkSts(1L); + pakout.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued); + pakout.setZpallet(locDetl.getZpallet()); + pakout.setLocNo(locDetl.getLocNo()); + pakout.setNodeId(locDetl.getNodeId()); + pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId())); + VersionUtils.setPakout(pakout, mat); +// pakout.setDocId(custOrder.getBTypeId()); + pakout.setDocNum(custOrder.getNumber()); // 鍗曟嵁缂栧彿 + pakout.setCreateTime(now); + pakout.setUpdateTime(now); + pakout.setStatus(1); + if (!pakoutService.insert(pakout)) { + throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�"); } + // 淇敼搴撳瓨鏄庣粏鏁伴噺 + if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued)) { + throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触"); + } + // 鍓╀綑寰呭嚭鏁伴噺閫掑噺 + issued = issued - locDetl.getAnfme(); } } - - - + // 淇敼鍗曟嵁鐘舵�� + if (!custOrderService.updateStatus(custOrder.getNumber(), 2)) { + throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�"); + } } } -- Gitblit v1.9.1