From e3bb506579f395c5dbca3d9f0e1e10a18170240f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 四月 2021 15:01:15 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 147 insertions(+), 26 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..827ef29 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -7,20 +7,22 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.common.config.CodeCoolException;
+import zy.cloud.wms.common.model.MatnrDto;
import zy.cloud.wms.common.model.OrderStoDto;
+import zy.cloud.wms.common.service.asrs.AsrsService;
+import zy.cloud.wms.common.service.asrs.entity.Result;
+import zy.cloud.wms.common.service.asrs.entity.Result1;
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.entity.param.StockTransferParam;
+import zy.cloud.wms.manager.entity.result.PakoutVo;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.PakoutService;
-import zy.cloud.wms.manager.service.PriorService;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
/**
* Created by vincent on 2021/3/1
@@ -36,29 +38,136 @@
@Autowired
private PakoutService pakoutService;
@Autowired
- private PriorService priorService;
- @Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private AsrsService asrsService;
@Transactional
- public void stockOutProcess(OrderStoDto dto) {
- if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
- return;
+ public List<StoPreTab> stockOutPreview(OrderStoDto orderStoDto) {
+ if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
+ List<StoPreTab> res = new ArrayList<>();
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- locDetlService.checkLocDetlCount(dto.getNumber());
- Date now = new Date();
- for (CustOrder custOrder : dto.getCustOrders()) {
+ List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(orderStoDto.getDtos());
+ if (!Cools.isEmpty(transferParams)) {
+ // 鏌ョ湅绔嬪簱搴撳瓨
+ Result result = asrsService.stockTransferPrew(transferParams);
+ if (result.getCode() == 500) {
+ throw new CodeCoolException("20001-" + String.valueOf(result.getMsg()));
+ }
+ if (result.getCode() == 200) {
+ res = (List<StoPreTab>) result.getData();
+ }
+ }
+
+ for (MatnrDto matnrDto : orderStoDto.getDtos()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
- Mat mat = matService.selectByMatnr(custOrder.getUserCode());
+ Mat mat = matService.selectByMatnr(matnrDto.getMatnr());
if (null == mat) {
- throw new CoolException(custOrder.getUserCode() + "鐗╂枡灏氭湭鏇存柊銆�" + custOrder.getNumber() +"鍗曟嵁鍥犳涓柇锛�");
+ throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + orderStoDto.getOrderNo() +"鍗曟嵁鍥犳涓柇锛�");
}
// 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
- double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
- while (issued > 0) {
- for (LocDetl locDetl : locDetls) {
+ double issued = Optional.ofNullable(matnrDto.getCount()).orElse(0.0D) ;
+ double anfme = issued;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 瑙嗗浘瀵硅薄
+ 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();
+ }
+ }
+
+ }
+ 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
+ public void stockOutProcess(OrderStoDto orderStoDto) {
+ if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
+ return;
+ }
+ Order order = orderService.selectByOrderNo(orderStoDto.getOrderNo());
+ if (order == null) {
+ throw new CoolException(orderStoDto.getOrderNo() + "鍗曟嵁涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+ List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(orderStoDto.getDtos());
+ if (!Cools.isEmpty(transferParams)) {
+ // 鏌ョ湅绔嬪簱搴撳瓨
+ Result1 result = asrsService.stockTransfer(transferParams);
+ if (result.getCode() == 500) {
+ if (Cools.isEmpty(result.getData())) {
+ throw new CoolException(result.getMsg());
+ } else {
+ throw new CodeCoolException("20001-" + result.getData());
+ }
+ }
+ if (result.getCode() == 200) {
+ for (PakoutVo vo : result.getData()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(vo.getMatnr());
+ if (null == mat) {
+ throw new CoolException(vo.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + orderStoDto.getOrderNo() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+ Pakout pakout = new Pakout();
+ pakout.setWrkSts(1L);
+ pakout.setAnfme(vo.getAnfme());
+ pakout.setZpallet(vo.getZpallet());
+ pakout.setLocNo(vo.getLocNo());
+ pakout.setNodeId(-1L);
+ pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ VersionUtils.setPakout(pakout, mat);
+ pakout.setDocId(order.getDocType()); // 鍗曟嵁绫诲瀷
+ pakout.setDocNum(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ pakout.setCreateTime(now);
+ pakout.setUpdateTime(now);
+ pakout.setStatus(1);
+ if (!pakoutService.insert(pakout)) {
+ throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
+ }
+ }
+
+ }
+ }
+
+ for (MatnrDto matnrDto : orderStoDto.getDtos()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(matnrDto.getMatnr());
+ if (null == mat) {
+ throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + matnrDto.getCount() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+ // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+ List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
+ double issued = Optional.ofNullable(matnrDto.getCount()).orElse(0.0D) ;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
// 淇濆瓨鍑哄簱閫氱煡鍗�
Pakout pakout = new Pakout();
pakout.setWrkSts(1L);
@@ -68,22 +177,34 @@
pakout.setNodeId(locDetl.getNodeId());
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
+ pakout.setDocId(order.getDocType()); // 鍗曟嵁绫诲瀷
+ pakout.setDocNum(order.getOrderNo()); // 鍗曟嵁缂栧彿
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 (!orderService.updateSettle(orderStoDto.getOrderNo(), 2L)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
}
}
-
}
--
Gitblit v1.9.1