From eb13b96cc3b01a3d44fbce6a730004e158418ab5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 14:06:58 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 82 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 32 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..3791840 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -15,10 +15,7 @@
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.PakoutService;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
/**
* Created by vincent on 2021/3/1
@@ -39,13 +36,14 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Transactional
- public List<StoPreVo> stockOutPreview(OrderStoDto dto) {
+ public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
+ List<StoPreTab> res = new ArrayList<>();
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
locDetlService.checkLocDetlCount(dto.getNumber());
- List<StoPreVo> result = new ArrayList<>();
+
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -55,29 +53,39 @@
// 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
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()?"鉁�":"脳");
+ tab.setType(1);
+ res.add(tab);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
}
- result.add(vo);
+
}
- return result;
+ res.sort(new Comparator<StoPreTab>() {
+ @Override
+ public int compare(StoPreTab o1, StoPreTab o2) {
+// return o1.getMatnr().length() - o2.getMatnr().length();
+ return (int) (o1.getAnfme() - o2.getAnfme());
+ }
+ });
+ return res;
}
@Transactional
@@ -85,9 +93,13 @@
if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
return;
}
+ Date now = new Date();
+
+ /******************************* 绔嬪簱鎷ｈ揣鍗� ********************************/
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
locDetlService.checkLocDetlCount(dto.getNumber());
- Date now = new Date();
+
+ /******************************* 骞充粨鎷ｈ揣鍗� ********************************/
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -108,7 +120,7 @@
pakout.setNodeId(locDetl.getNodeId());
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
-// pakout.setDocId(custOrder.getBTypeId());
+ pakout.setDocId(getDocId(dto.getNumber())); // 鍗曟嵁绫诲瀷
pakout.setDocNum(custOrder.getNumber()); // 鍗曟嵁缂栧彿
pakout.setCreateTime(now);
pakout.setUpdateTime(now);
@@ -117,15 +129,15 @@
throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
}
if (issued>=locDetl.getAnfme()) {
- // 鍒犻櫎搴撳瓨鏄庣粏
- if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
- throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
- }
+// // 鍒犻櫎搴撳瓨鏄庣粏
+// if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
+// throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+// }
} else {
- // 淇敼搴撳瓨鏄庣粏鏁伴噺
- if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
- throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
- }
+// // 淇敼搴撳瓨鏄庣粏鏁伴噺
+// if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
+// throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+// }
}
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
@@ -138,5 +150,11 @@
}
}
+ private Long getDocId(String number) {
+ if (number.startsWith("PR")) {
+ return 6L;
+ }
+ return 11L;
+ }
}
--
Gitblit v1.9.1