From 0b88bff9c283553707d493360b68c7752509602e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 12 四月 2021 17:06:34 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 92 ++++++++++++++++-----------------------------
1 files changed, 33 insertions(+), 59 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 86cbd86..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
@@ -38,56 +35,15 @@
@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("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
+ List<StoPreTab> res = new ArrayList<>();
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
locDetlService.checkLocDetlCount(dto.getNumber());
- List<StoPreTab> result = new ArrayList<>();
+
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -114,14 +70,22 @@
tab.setRemQty(tab.getTotal() - tab.getReduce());
tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
tab.setPrior$(tab.getPrior()?"鉁�":"脳");
- result.add(tab);
+ tab.setType(1);
+ res.add(tab);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
}
}
- 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
@@ -129,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());
@@ -152,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);
@@ -161,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();
@@ -182,5 +150,11 @@
}
}
+ private Long getDocId(String number) {
+ if (number.startsWith("PR")) {
+ return 6L;
+ }
+ return 11L;
+ }
}
--
Gitblit v1.9.1