From 1b230d7961b2d5068298f0cba13287cabd2fd649 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 17 七月 2024 18:47:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 173bc58..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,5 +1,6 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.WaitPakin;
@@ -8,12 +9,15 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+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;
@@ -39,24 +43,26 @@
@Autowired
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())) {
- orderService.checkComplete(wrkDetl.getOrderNo());
+ wrkDetlsKeyOrder.add(wrkDetl);
iterator.remove();
}
}
}
// 鍏ュ簱 --------------------------------------------------------------------------------
- if (wrkMast.getWrkSts() == 5) {
+ if (wrkMast.getWrkSts() == 10) {
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
@@ -65,18 +71,19 @@
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());
- }
- }
- // 鎷ｆ枡鍐嶅叆搴�
+// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
+ // 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
if (!Cools.isEmpty(wrkDetls)) {
if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
@@ -85,8 +92,8 @@
}
}
- // 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getWrkSts() == 15) {
+ // 鍑哄簱 --------------------------------------------------------------------------------
+ } else if (wrkMast.getWrkSts() == 30) {
if (!Cools.isEmpty(wrkDetls)) {
if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -110,6 +117,18 @@
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();
--
Gitblit v1.9.1