From b10c50ce84e4c6020864bd9f79d12733635a9602 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 14:02:51 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 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 1cbf6ea..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
--
Gitblit v1.9.1