From 00e1f09d1ce3ed8ab3a9976d7b7af7ef558625af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 16:41:21 +0800
Subject: [PATCH] AGV工作档取消和完成
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 139 +++++++++++++++++-----------------------------
1 files changed, 52 insertions(+), 87 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..15b1c83 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,32 +1,30 @@
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.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
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 com.zy.common.model.OrderDto;
+import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
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.Iterator;
import java.util.List;
-import java.util.Optional;
/**
* Created by vincent on 2020/7/6
*/
+@Slf4j
@Service
public class WorkLogHandler extends AbstractHandler<String> {
@@ -43,111 +41,65 @@
@Autowired
private WaitPakinLogService waitPakinLogService;
@Autowired
- private ErpService erpService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private WmsService wmsService;
+ private OrderService orderService;
+ // update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ // 鍖哄垎璁㈠崟浠诲姟
+ List<WrkDetl> wrkDetlsKeyOrder = new ArrayList<>();
+ if (!Cools.isEmpty(wrkDetls)) {
+ Iterator<WrkDetl> iterator = wrkDetls.iterator();
+ while (iterator.hasNext()) {
+ WrkDetl wrkDetl = iterator.next();
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ wrkDetlsKeyOrder.add(wrkDetl);
+ iterator.remove();
+ }
+ }
+ }
- // 鍏ュ簱
- if (wrkMast.getWrkSts() == 5) {
-
+ // 鍏ュ簱 --------------------------------------------------------------------------------
+ if (wrkMast.getWrkSts() == 10) {
// 鍏ㄦ澘鍏ュ簱
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());
}
}
- // 鎷ｆ枡鍐嶅叆搴�
+// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
+// 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());
+ if (!Cools.isEmpty(wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+ 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());
- }
- }
+ // 鍑哄簱 --------------------------------------------------------------------------------
+ } else if (wrkMast.getWrkSts() == 30) {
+ if (!Cools.isEmpty(wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+ exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
}
-
-
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -165,7 +117,20 @@
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
+ if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
+ orderService.checkComplete(wrkDetl.getOrderNo());
+ } else {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ for (OrderDto one : orderDtoList) {
+ orderService.checkComplete(one.getOrderNo());
+ }
+ }
+ }
} catch (Exception e) {
+ log.error("fail", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
--
Gitblit v1.9.1