From a13a56a0ddb0da74aabf2922e3740ff7502342cf Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 05 三月 2021 15:09:49 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 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 7b249a1..63d82ba 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 @@ -10,13 +10,11 @@ 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.*; import zy.cloud.wms.manager.entity.param.StockConfirmParam; import zy.cloud.wms.manager.entity.param.StockInParam; 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; @@ -38,6 +36,8 @@ private LocDetlService locDetlService; @Autowired private CustOrderService custOrderService; + @Autowired + private PakoutService pakoutService; @Override @Transactional @@ -86,6 +86,15 @@ } @Override + public R stockOutPrint(StockOutParam param, Long userId) { + List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber())); + StoPrintVo vo = new StoPrintVo(); + vo.setDocNum(param.getNumber()); + vo.setList(pakouts); + 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()) @@ -100,8 +109,13 @@ } @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