From 6f7c57ceab710f631f0530e307c6fdbee4e7b9af Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 04 三月 2021 12:57:13 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 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 7f2c08a..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
@@ -7,17 +7,18 @@
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.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;
@@ -36,6 +37,10 @@
private CombService combService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private CustOrderService custOrderService;
+ @Autowired
+ private PakoutService pakoutService;
@Override
@Transactional
@@ -84,11 +89,37 @@
}
@Override
- public R stockOut(StockOutParam param, Long userId) {
- // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- locDetlService.checkLocDetlCount(param.getNumber());
+ public R stockOutPrint(StockOutParam param, Long userId) {
- return null;
+ 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