From 61c36655506afd11f448e6985f4406e6f107c8ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 26 三月 2022 14:55:34 +0800
Subject: [PATCH] #杰克缝纫机立库 【订单出库预览】 优化
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 07e740c..280e7a7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -15,6 +15,7 @@
import com.zy.common.service.wms.ReplenishDto;
import com.zy.common.service.wms.Result;
import com.zy.common.service.wms.WmsService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +28,7 @@
/**
* Created by vincent on 2020/7/6
*/
+@Slf4j
@Service
public class WorkLogHandler extends AbstractHandler<String> {
@@ -52,14 +54,12 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
-
// 鍏ュ簱
if (wrkMast.getWrkSts() == 5) {
-
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
String docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
- // 涓婃姤缁檈rp
+ // 鍗曟嵁鐘舵�佸彉鏇� 浣滀笟涓� ===>> 宸插畬鎴�
List<MatnrDto> matnrDtos = new ArrayList<>();
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
for (WrkDetl wrkDetl : wrkDetls) {
@@ -78,7 +78,6 @@
if (!erpService.uploadBill(dtos, 34, docNum)) {
exceptionHandle("鏃犳硶涓婃姤鑷砮rp[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
-
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
@@ -100,6 +99,7 @@
ReplenishDto param = new ReplenishDto();
param.setMatnr(wrkDetl.getMatnr());
param.setCount(wrkDetl.getAnfme());
+ param.setWorkNo(wrkMast.getWrkNo());
replenishDtos.add(param);
}
Result result = wmsService.replenish(replenishDtos);
@@ -113,13 +113,14 @@
// 鍑哄簱
} else if (wrkMast.getWrkSts() == 15) {
// 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨
- if (!wrkMast.getPdcType().equals("Y")) {
+ if (Cools.isEmpty(wrkMast.getPdcType()) || !wrkMast.getPdcType().equals("Y")) {
List<ReplenishDto> replenishDtos = new ArrayList<>();
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
for (WrkDetl wrkDetl : wrkDetls) {
ReplenishDto param = new ReplenishDto();
param.setMatnr(wrkDetl.getMatnr());
param.setCount(wrkDetl.getAnfme());
+ param.setWorkNo(wrkMast.getWrkNo());
replenishDtos.add(param);
}
Result result = wmsService.replenish(replenishDtos);
@@ -136,6 +137,7 @@
ReplenishDto param = new ReplenishDto();
param.setMatnr(wrkDetl.getMatnr());
param.setCount(more);
+ param.setWorkNo(wrkMast.getWrkNo());
List<ReplenishDto> replenishDtos = new ArrayList<>();
replenishDtos.add(param);
Result result = wmsService.replenish(replenishDtos);
@@ -166,6 +168,7 @@
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
+ log.error("", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
--
Gitblit v1.9.1