From cf943cb90fde999773267cbc14bf51a70881481a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 14:24:21 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 59 ++---------------------------------------------------------
1 files changed, 2 insertions(+), 57 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 a2007e9..3791840 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -7,15 +7,9 @@
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.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;
@@ -40,8 +34,6 @@
private CustOrderService custOrderService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private AsrsService asrsService;
@Transactional
public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
@@ -50,17 +42,7 @@
}
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.getMsg()));
- }
- if (result.getCode() == 200) {
- res = (List<StoPreTab>) result.getData();
- }
- }
+ locDetlService.checkLocDetlCount(dto.getNumber());
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
@@ -115,44 +97,7 @@
/******************************* 绔嬪簱鎷ｈ揣鍗� ********************************/
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- 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 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() + "鐗╂枡灏氭湭鏇存柊銆�" + 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("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
- }
- }
-
- }
- }
+ locDetlService.checkLocDetlCount(dto.getNumber());
/******************************* 骞充粨鎷ｈ揣鍗� ********************************/
for (CustOrder custOrder : dto.getCustOrders()) {
--
Gitblit v1.9.1