From d44598d72c02bc05227b64749ea017c1eb69c6a5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 14:46:46 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 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 b7b32cd..b142b3d 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
@@ -7,16 +7,15 @@
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.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.service.CombService;
-import zy.cloud.wms.manager.service.LocDetlService;
-import zy.cloud.wms.manager.service.NodeService;
-import zy.cloud.wms.manager.service.WorkService;
+import zy.cloud.wms.manager.entity.result.StoPrintVo;
+import zy.cloud.wms.manager.service.*;
import java.util.Date;
import java.util.List;
@@ -28,11 +27,17 @@
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
@@ -81,11 +86,47 @@
}
@Override
- public R stockOut(StockOutParam param, Long userId) {
- // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- locDetlService.checkLocDetlCount(param.getNumber());
+ 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("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
+ vo.setWorkerName("闄嗘檽娑�");
+ return R.ok().add(vo);
+ }
- return null;
+ @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