From 40bfd7078ca4e46ae127dea1cf37870af2865c46 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 15:21:50 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 97e3447..87d453a 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
@@ -108,6 +108,18 @@
}
@Override
+ public R stockOutPreview(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);
+ return R.ok().add(mainService.stockOutPreview(dto));
+ }
+
+ @Override
public R stockOut(StockOutParam param, Long userId) {
List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
.eq("number", param.getNumber())
@@ -129,7 +141,10 @@
return R.error("淇濆瓨鏁版嵁澶辫触");
}
// todo锛氫慨鏀瑰簱瀛樻暟閲�
-
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
return R.ok();
}
@@ -173,10 +188,27 @@
}
@Override
+ @Transactional
public R completePakout(String wrkNo, Long userId) {
Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
if (null != pakout) {
if (pakoutService.stockOutComplete(wrkNo, null, userId)) {
+
+ boolean complete = true;
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
+ for (Pakout item : pakouts) {
+ if (item.getWrkSts() != 3) {
+ complete = false;
+ break;
+ }
+ }
+ if (complete) {
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+
return R.ok("鎷ｈ揣鍗曞凡瀹屾垚");
}
}
@@ -210,12 +242,24 @@
if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
throw new CoolException("鍒犻櫎鎷ｈ揣鍗曞け璐�");
}
+
+ // 鍙栨秷閿�鍞鍗�
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
+ if (Cools.isEmpty(pakouts)){
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(pakout.getDocNum(), 3)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
}
@Override
@Transactional
public R initOrder(InitOrderParam param, Long userId) {
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", param.getNumber()).ne("bType_id", param.getCustomerTypeId())) > 0) {
+ return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
+ }
Date now = new Date();
for (PakinMatDto dto : param.getList()){
Mat mat = matService.selectByMatnr(dto.getMatnr());
--
Gitblit v1.9.1