From 53dbbd7be6a6ed00d65276a8707680955f9912b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 三月 2021 16:33:42 +0800
Subject: [PATCH] [import]修改库存数量修改顺序
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 128 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 38 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 99f2ab3..dec1993 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,17 +139,34 @@
dto.setCustOrders(custOrders);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
- return R.ok();
+ return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
}
@Override
@Transactional
public R stockOutComplete(StockConfirmParam param, Long userId) {
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
+ .eq("doc_num", param.getNumber())
+ .in("wrk_sts", 1, 2));
+ // 淇敼搴撳瓨鏁伴噺
+ for (Pakout pakout : pakouts) {
+ LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
+ if (pakout.getAnfme()>=locDetl.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), pakout.getMatnr(), pakout.getAnfme())) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ }
// 淇敼鍑哄簱鍗曠姸鎬�
if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
return R.error("淇濆瓨鏁版嵁澶辫触");
}
- // todo锛氫慨鏀瑰簱瀛樻暟閲�
// 淇敼鍗曟嵁鐘舵��
if (!custOrderService.updateStatus(param.getNumber(), 4)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
@@ -180,6 +218,20 @@
public R completePakout(String wrkNo, Long userId) {
Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
if (null != pakout) {
+ // 淇敼搴撳瓨鏁伴噺
+ LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
+ if (pakout.getAnfme()>=locDetl.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), pakout.getMatnr(), pakout.getAnfme())) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ // 淇敼鎷ｈ揣鍗曠姸鎬�
if (pakoutService.stockOutComplete(wrkNo, null, userId)) {
boolean complete = true;
@@ -207,26 +259,26 @@
@Transactional
public R cancelPakout(String wrkNo, Long userId) {
Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
- if (null != pakout) {
- LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
- if (locDetl == null) {
- LocDetl oldLocDetl = new LocDetl();
- VersionUtils.setLocDetl(oldLocDetl, pakout);
- oldLocDetl.setCreateTime(new Date());
- oldLocDetl.setCreateBy(userId);
- oldLocDetl.setUpdateTime(new Date());
- oldLocDetl.setUpdateBy(userId);
- if (!locDetlService.insert(oldLocDetl)) {
- throw new CoolException("鎭㈠搴撳瓨鏄庣粏澶辫触");
- }
- } else {
- if (!locDetlService.incrementStock(locDetl.getNodeId(), locDetl.getMatnr(), pakout.getAnfme())) {
- throw new CoolException("鎭㈠搴撳瓨鏄庣粏澶辫触");
- }
- }
- } else {
- return R.error("鎷ｈ揣鍗曞凡澶辨晥锛屽彇娑堝け璐ワ紒");
- }
+// if (null != pakout) {
+// LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
+// if (locDetl == null) {
+// LocDetl oldLocDetl = new LocDetl();
+// VersionUtils.setLocDetl(oldLocDetl, pakout);
+// oldLocDetl.setCreateTime(new Date());
+// oldLocDetl.setCreateBy(userId);
+// oldLocDetl.setUpdateTime(new Date());
+// oldLocDetl.setUpdateBy(userId);
+// if (!locDetlService.insert(oldLocDetl)) {
+// throw new CoolException("鎭㈠搴撳瓨鏄庣粏澶辫触");
+// }
+// } else {
+// if (!locDetlService.incrementStock(locDetl.getNodeId(), locDetl.getMatnr(), pakout.getAnfme())) {
+// throw new CoolException("鎭㈠搴撳瓨鏄庣粏澶辫触");
+// }
+// }
+// } else {
+// return R.error("鎷ｈ揣鍗曞凡澶辨晥锛屽彇娑堝け璐ワ紒");
+// }
if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
throw new CoolException("鍒犻櫎鎷ｈ揣鍗曞け璐�");
}
@@ -245,7 +297,7 @@
@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