From 1cb134a269b9e7a70481a875d61e288be47ca99f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 四月 2021 08:51:30 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 113 ++++++++++++--------------------------------------------
1 files changed, 25 insertions(+), 88 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 01cf71f..6c81900 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -7,19 +7,11 @@
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.*;
-import zy.cloud.wms.manager.entity.param.StockTransferParam;
-import zy.cloud.wms.manager.entity.result.PakoutVo;
-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.*;
import java.util.*;
@@ -37,40 +29,28 @@
@Autowired
private PakoutService pakoutService;
@Autowired
- private CustOrderService custOrderService;
- @Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private AsrsService asrsService;
+ private OrderService orderService;
@Transactional
- public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
- if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
+ public List<StoPreTab> stockOutPreview(OrderStoDto orderStoDto) {
+ if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
List<StoPreTab> res = new ArrayList<>();
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
- if (!Cools.isEmpty(transferParams)) {
- // 鏌ョ湅绔嬪簱搴撳瓨
- Result result = asrsService.stockTransferPrew(transferParams);
- if (result.getCode() == 500) {
- throw new CodeCoolException("20001-" + String.valueOf(result.getData()));
- }
- if (result.getCode() == 200) {
- res = (List<StoPreTab>) result.getData();
- }
- }
+ locDetlService.checkLocDetlCount(orderStoDto.getDtos());
- for (CustOrder custOrder : dto.getCustOrders()) {
+ 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) ;
+ double issued = Optional.ofNullable(matnrDto.getCount()).orElse(0.0D) ;
double anfme = issued;
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
@@ -107,63 +87,27 @@
}
@Transactional
- public void stockOutProcess(OrderStoDto dto) {
- if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
+ public void stockOutProcess(OrderStoDto orderStoDto) {
+ if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
return;
}
- Date now = new Date();
-
- /******************************* 绔嬪簱鎷ｈ揣鍗� ********************************/
- // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
- if (!Cools.isEmpty(transferParams)) {
- // 鏌ョ湅绔嬪簱搴撳瓨
- Result1 result = asrsService.stockTransfer(transferParams);
- if (result.getCode() == 500) {
- if (Cools.isEmpty(result.getData())) {
- throw new CodeCoolException(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() + "鐗╂枡灏氭湭鏇存柊銆�" + dto.getNumber() +"鍗曟嵁鍥犳涓柇锛�");
- }
- 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(getDocId(dto.getNumber())); // 鍗曟嵁绫诲瀷
- pakout.setDocNum(dto.getNumber()); // 鍗曟嵁缂栧彿
- pakout.setCreateTime(now);
- pakout.setUpdateTime(now);
- pakout.setStatus(1);
- if (!pakoutService.insert(pakout)) {
- throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
- }
- }
-
- }
+ Order order = orderService.selectByOrderNo(orderStoDto.getOrderNo());
+ if (order == null) {
+ throw new CoolException(orderStoDto.getOrderNo() + "鍗曟嵁涓嶅瓨鍦�");
}
+ Date now = new Date();
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+ locDetlService.checkLocDetlCount(orderStoDto.getDtos());
- /******************************* 骞充粨鎷ｈ揣鍗� ********************************/
- for (CustOrder custOrder : dto.getCustOrders()) {
+ 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() + "鐗╂枡灏氭湭鏇存柊銆�" + matnrDto.getCount() +"鍗曟嵁鍥犳涓柇锛�");
}
// 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
- double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
+ double issued = Optional.ofNullable(matnrDto.getCount()).orElse(0.0D) ;
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
// 淇濆瓨鍑哄簱閫氱煡鍗�
@@ -175,8 +119,8 @@
pakout.setNodeId(locDetl.getNodeId());
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
- pakout.setDocId(getDocId(dto.getNumber())); // 鍗曟嵁绫诲瀷
- pakout.setDocNum(custOrder.getNumber()); // 鍗曟嵁缂栧彿
+ pakout.setDocId(order.getDocType()); // 鍗曟嵁绫诲瀷
+ pakout.setDocNum(order.getOrderNo()); // 鍗曟嵁缂栧彿
pakout.setCreateTime(now);
pakout.setUpdateTime(now);
pakout.setStatus(1);
@@ -199,17 +143,10 @@
}
}
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(custOrder.getNumber(), 2)) {
+ if (!orderService.updateSettle(orderStoDto.getOrderNo(), 2L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
- }
-
- private Long getDocId(String number) {
- if (number.startsWith("PR")) {
- return 6L;
- }
- return 11L;
}
}
--
Gitblit v1.9.1