From 7fd4de087a1b9629d419e3178a5321eeb50dd75d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 16:14:04 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 78 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 17 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 4e6a347..86cbd86 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -38,14 +38,56 @@
@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<StoPreVo> stockOutPreview(OrderStoDto dto) {
+ public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
locDetlService.checkLocDetlCount(dto.getNumber());
- List<StoPreVo> result = new ArrayList<>();
+ List<StoPreTab> result = new ArrayList<>();
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -55,27 +97,29 @@
// 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
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);
+ double anfme = issued;
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);
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMatnr() + "锛�" + mat.getMaktx() + "锛�");
+ 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.setRemQty(tab.getTotal() - tab.getReduce());
+ tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+ tab.setPrior$(tab.getPrior()?"鉁�":"脳");
+ result.add(tab);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
}
- result.add(vo);
+
}
return result;
}
--
Gitblit v1.9.1