From abf98922f65f1434b9bde62d251cb439189921d1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 26 三月 2022 13:56:38 +0800
Subject: [PATCH] #杰克缝纫机立库 【订单出库优化】
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 a76ea38..280e7a7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,10 +1,8 @@
package com.zy.asrs.task.handler;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
-import com.zy.asrs.entity.RequestLog;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -24,7 +22,6 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -57,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) {
@@ -104,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);
@@ -120,17 +116,16 @@
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()));
- if (!Cools.isEmpty(wrkDetls)) {
- for (WrkDetl wrkDetl : wrkDetls) {
- ReplenishDto param = new ReplenishDto();
- param.setMatnr(wrkDetl.getMatnr());
- param.setCount(wrkDetl.getAnfme());
- replenishDtos.add(param);
- }
- Result result = wmsService.replenish(replenishDtos);
- if (result.getCode() != 200) {
- exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", 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);
+ if (result.getCode() != 200) {
+ exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 閿�鍞鍗�
} else {
@@ -142,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);
@@ -172,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