From 439452f59b03556aecc5dd6dbaa8f064b70cd026 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 31 五月 2021 11:13:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 133 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 8 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 3402e4e..07e740c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,18 +1,28 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SnowflakeIdWorker;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkDetlLogService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.ReturnT;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.model.BillDto;
+import com.zy.common.model.MatnrDto;
+import com.zy.common.service.ErpService;
+import com.zy.common.service.wms.ReplenishDto;
+import com.zy.common.service.wms.Result;
+import com.zy.common.service.wms.WmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
/**
* Created by vincent on 2020/7/6
@@ -28,25 +38,132 @@
private WrkDetlService wrkDetlService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private ErpService erpService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private WmsService wmsService;
@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) {
+ MatnrDto dto = new MatnrDto();
+ dto.setMatnr(wrkDetl.getMatnr());
+ dto.setCount(wrkDetl.getAnfme());
+ matnrDtos.add(dto);
+ }
+ List<BillDto> dtos = new ArrayList<>();
+ for (MatnrDto dto : matnrDtos) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(dto.getMatnr());
+ billDto.setQty(dto.getCount());
+ dtos.add(billDto);
+ }
+ if (!erpService.uploadBill(dtos, 34, docNum)) {
+ exceptionHandle("鏃犳硶涓婃姤鑷砮rp[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+
+ // 鍏ュ簱閫氱煡鍗�
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
+ // 鎷ｆ枡鍐嶅叆搴�
+ } else if (wrkMast.getIoType() == 53) {
+ // 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨
+ if (!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());
+ replenishDtos.add(param);
+ }
+ Result result = wmsService.replenish(replenishDtos);
+ if (result.getCode() != 200) {
+ exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
+
+ }
+
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() == 15) {
+ // 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨
+ if (!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());
+ replenishDtos.add(param);
+ }
+ Result result = wmsService.replenish(replenishDtos);
+ if (result.getCode() != 200) {
+ exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 閿�鍞鍗�
+ } else {
+ if (wrkMast.getIoType() == 101) {
+ Double more = Optional.ofNullable(wrkMast.getRefWrkno()).orElse(0.0D);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (more > 0 && !Cools.isEmpty(wrkDetls)) {
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ ReplenishDto param = new ReplenishDto();
+ param.setMatnr(wrkDetl.getMatnr());
+ param.setCount(more);
+ List<ReplenishDto> replenishDtos = new ArrayList<>();
+ replenishDtos.add(param);
+ Result result = wmsService.replenish(replenishDtos);
+ if (result.getCode() != 200) {
+ exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
+ }
+ }
+ }
+
+
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
- if (wrkMastService.deleteById(wrkMast)) {
+ if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
- exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1