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/common/service/MainService.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index e26ea1f..808eaaa 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -9,15 +9,13 @@
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.utils.VersionUtils;
-import zy.cloud.wms.manager.entity.CustOrder;
-import zy.cloud.wms.manager.entity.LocDetl;
-import zy.cloud.wms.manager.entity.Mat;
-import zy.cloud.wms.manager.entity.Pakout;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.PakoutService;
-import zy.cloud.wms.manager.service.PriorService;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -36,9 +34,93 @@
@Autowired
private PakoutService pakoutService;
@Autowired
- private PriorService priorService;
+ private CustOrderService custOrderService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+
+// @Transactional
+// public List<StoPreVo> stockOutPreview0(OrderStoDto dto) {
+// if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
+// throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+// }
+// // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+// locDetlService.checkLocDetlCount(dto.getNumber());
+// List<StoPreVo> result = new ArrayList<>();
+// for (CustOrder custOrder : dto.getCustOrders()) {
+// // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+// Mat mat = matService.selectByMatnr(custOrder.getUserCode());
+// if (null == mat) {
+// throw new CoolException(custOrder.getUserCode() + "鐗╂枡灏氭湭鏇存柊銆�" + custOrder.getNumber() +"鍗曟嵁鍥犳涓柇锛�");
+// }
+// // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+// List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
+// double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
+// // 瑙嗗浘瀵硅薄
+// StoPreVo vo = new StoPreVo();
+// vo.setMatnr(mat.getMatnr());
+// vo.setMaktx(mat.getMaktx());
+// vo.setAnfme(issued);
+// List<StoPreVo.StoPreLoc> locVos = new ArrayList<>();
+// vo.setLocs(locVos);
+// for (LocDetl locDetl : locDetls) {
+// if (issued > 0) {
+// StoPreVo.StoPreLoc locVo = new StoPreVo.StoPreLoc();
+// locVo.setLocNo(locDetl.getLocNo());
+// locVo.setNodeId(locDetl.getNodeId());
+// locVo.setTotal(locDetl.getAnfme());
+// locVo.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+// locVo.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+// locVos.add(locVo);
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+// }
+// }
+// result.add(vo);
+// }
+// return result;
+// }
+
+ @Transactional
+ public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
+ if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+ locDetlService.checkLocDetlCount(dto.getNumber());
+ List<StoPreTab> result = new ArrayList<>();
+ for (CustOrder custOrder : dto.getCustOrders()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(custOrder.getUserCode());
+ if (null == mat) {
+ throw new CoolException(custOrder.getUserCode() + "鐗╂枡灏氭湭鏇存柊銆�" + custOrder.getNumber() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+ // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+ List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
+ double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
+ double anfme = issued;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMatnr() + "<br>" + mat.getMaktx() + "<br>鏁伴噺锛�" + anfme);
+ tab.setMatnr(mat.getMatnr());
+ tab.setMaktx(mat.getMaktx());
+ tab.setAnfme(anfme);
+
+ tab.setLocNo(locDetl.getLocNo());
+ tab.setNodeId(locDetl.getNodeId());
+ tab.setTotal(locDetl.getAnfme());
+ tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+ result.add(tab);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+
+ }
+ return result;
+ }
@Transactional
public void stockOutProcess(OrderStoDto dto) {
@@ -57,8 +139,8 @@
// 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
- while (issued > 0) {
- for (LocDetl locDetl : locDetls) {
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
// 淇濆瓨鍑哄簱閫氱煡鍗�
Pakout pakout = new Pakout();
pakout.setWrkSts(1L);
@@ -68,20 +150,33 @@
pakout.setNodeId(locDetl.getNodeId());
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
+// pakout.setDocId(custOrder.getBTypeId());
+ pakout.setDocNum(custOrder.getNumber()); // 鍗曟嵁缂栧彿
pakout.setCreateTime(now);
pakout.setUpdateTime(now);
pakout.setStatus(1);
if (!pakoutService.insert(pakout)) {
throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
}
- // 淇敼搴撳瓨鏄庣粏鏁伴噺
- if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued)) {
- throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ if (issued>=locDetl.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
}
- // 鍓╀綑寰呭嚭璐т綅閫掑噺
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
}
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(custOrder.getNumber(), 2)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
}
}
--
Gitblit v1.9.1