From 587fcf4a73c44330a5d75ced8ccf0274666c3cbe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 08:17:59 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 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 3a89934..8faa579 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
@@ -64,22 +64,31 @@
if (!update) {
throw new CoolException("淇敼鎵樼洏璧勬枡妗ｅけ璐�");
}
- // 鏇存柊璐т綅搴撳瓨鏄庣粏
- LocDetl locDetl = new LocDetl();
- locDetl.setLocNo(node.getName());
- locDetl.setNodeId(node.getId());
- locDetl.setZpallet(param.getZpallet());
- locDetl.setAnfme(comb.getAnfme());
- VersionUtils.setLocDetl(locDetl, comb);
- locDetl.setStatus(1);
- locDetl.setCreateBy(userId);
- locDetl.setCreateTime(now);
- locDetl.setUpdateBy(userId);
- locDetl.setUpdateTime(now);
- boolean insert = locDetlService.insert(locDetl);
- if (!insert) {
- throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ LocDetl locDetl = locDetlService.getLocDetl(node.getId(), comb.getMatnr());
+ if (locDetl == null) {
+ // 鏇存柊璐т綅搴撳瓨鏄庣粏
+ locDetl = new LocDetl();
+ locDetl.setLocNo(node.getName());
+ locDetl.setNodeId(node.getId());
+ locDetl.setZpallet(param.getZpallet());
+ locDetl.setAnfme(comb.getAnfme());
+ VersionUtils.setLocDetl(locDetl, comb);
+ locDetl.setStatus(1);
+ locDetl.setCreateBy(userId);
+ locDetl.setCreateTime(now);
+ locDetl.setUpdateBy(userId);
+ locDetl.setUpdateTime(now);
+ boolean insert = locDetlService.insert(locDetl);
+ if (!insert) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ if (!locDetlService.incrementStock(node.getId(), comb.getMatnr(), comb.getAnfme())) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+
}
+
}
return R.ok();
}
@@ -108,6 +117,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())
@@ -118,7 +139,7 @@
dto.setCustOrders(custOrders);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
- return R.ok();
+ return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
}
@Override
@@ -129,7 +150,10 @@
return R.error("淇濆瓨鏁版嵁澶辫触");
}
// todo锛氫慨鏀瑰簱瀛樻暟閲�
-
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
return R.ok();
}
@@ -173,10 +197,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,13 +251,22 @@
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())) > 0) {
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", param.getNumber()).ne("bType_id", param.getCustomerTypeId())) > 0) {
return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
}
Date now = new Date();
--
Gitblit v1.9.1