From 5a7b4e6003671eb17a3ce07d6e69a10ae842a63c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 04 三月 2021 10:41:10 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 98 insertions(+), 4 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java index b7be0db..9dface3 100644 --- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java +++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java @@ -1,13 +1,27 @@ package zy.cloud.wms.manager.service.impl; -import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; import com.core.common.R; +import com.core.exception.CoolException; 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.service.MainService; +import zy.cloud.wms.common.utils.VersionUtils; +import zy.cloud.wms.manager.entity.Comb; +import zy.cloud.wms.manager.entity.CustOrder; +import zy.cloud.wms.manager.entity.LocDetl; import zy.cloud.wms.manager.entity.Node; +import zy.cloud.wms.manager.entity.param.StockConfirmParam; import zy.cloud.wms.manager.entity.param.StockInParam; -import zy.cloud.wms.manager.service.NodeService; -import zy.cloud.wms.manager.service.WorkService; +import zy.cloud.wms.manager.entity.param.StockOutParam; +import zy.cloud.wms.manager.entity.result.StoPrintVo; +import zy.cloud.wms.manager.service.*; + +import java.util.Date; +import java.util.List; /** * Created by vincent on 2021/2/25 @@ -16,15 +30,95 @@ public class WorkServiceImpl implements WorkService { @Autowired + private MainService mainService; + @Autowired private NodeService nodeService; + @Autowired + private CombService combService; + @Autowired + private LocDetlService locDetlService; + @Autowired + private CustOrderService custOrderService; + @Autowired + private PakoutService pakoutService; @Override + @Transactional public R stockIn(StockInParam param, Long userId) { Node node = nodeService.selectByUuid(param.getNodeId()); if (node == null) { return R.error("璐т綅涓嶅瓨鍦�"); } - System.out.println(JSON.toJSONString(param)); + List<Comb> combs = combService.selectList(new EntityWrapper<Comb>().eq("zpallet", param.getZpallet()).eq("io_status", 1)); + if (Cools.isEmpty(combs)) { + return R.error("鐗╂枡涓嶅瓨鍦�"); + } + Date now = new Date(); + for (Comb comb : combs) { + // 鏀瑰彉缁勬墭妗g姸鎬� + comb.setIoStatus(4); + comb.setUpdateBy(userId); + comb.setUpdateTime(now); + boolean update = combService.update(comb, new EntityWrapper<Comb>().eq("zpallet", param.getZpallet()).eq("matnr", comb.getMatnr())); + if (!update) { + throw new CoolException("淇敼鎵樼洏璧勬枡妗eけ璐�"); + } + // 鏇存柊璐т綅搴撳瓨鏄庣粏 + LocDetl locDetl = new LocDetl(); + locDetl.setLocNo(node.getName()); + locDetl.setNodeId(node.getId()); + locDetl.setZpallet(param.getZpallet()); + locDetl.setAnfme(comb.getAnfme()); + VersionUtils.setLocDetl(locDetl, comb); + locDetl.setStatus(1); + locDetl.setCreateBy(userId); + locDetl.setCreateTime(now); + locDetl.setUpdateBy(userId); + locDetl.setUpdateTime(now); + boolean insert = locDetlService.insert(locDetl); + if (!insert) { + throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } + return R.ok(); + } + + @Override + public R stockOutCheck(String number, Long userId) { + return null; + } + + @Override + public R stockOutPrint(StockOutParam param, Long userId) { + + StoPrintVo vo = new StoPrintVo(); + vo.setDocNum(param.getNumber()); + return R.ok().add(vo); + } + + @Override + public R stockOut(StockOutParam param, Long userId) { + List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>() + .eq("number", param.getNumber()) + .eq("status", 1) + ); + OrderStoDto dto = new OrderStoDto(); + dto.setNumber(param.getNumber()); + dto.setCustOrders(custOrders); + // 寮�濮嬫暣鐞嗗嚭搴撴暟鎹� + mainService.stockOutProcess(dto); + return R.ok(); + } + + @Override + @Transactional + public R stockOutComplete(StockConfirmParam param, Long userId) { + // 淇敼鍑哄簱鍗曠姸鎬� + if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) { + return R.error("淇濆瓨鏁版嵁澶辫触"); + } + // todo锛氫慨鏀瑰簱瀛樻暟閲� + return R.ok(); } -- Gitblit v1.9.1