From 2f3992c0e26bc8252b18263be940df281b62aea1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 15:29:43 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 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..35d0905 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,24 @@
}
@Override
+ public R stockOutPrint(StockOutParam param, Long userId) {
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
+ Double total = 0.0D;
+ String custName = "";
+ for (Pakout pakout : pakouts) {
+ total = pakout.getAnfme() + total;
+ custName = pakout.getCustName();
+ }
+ StoPrintVo vo = new StoPrintVo();
+ vo.setDocNum(param.getNumber());
+ vo.setList(pakouts);
+ vo.setTotal(total);
+ vo.setCustName(custName);
+ vo.setWorkerName("闄嗘檽娑�");
+ 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 +118,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