From a04ddd7cc61969800aac6ca7bd4e77516a48b8a8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 15 八月 2022 17:02:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 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 1c21b16..574eb94 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -2,7 +2,6 @@
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;
@@ -14,6 +13,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Iterator;
+import java.util.List;
/**
* Created by vincent on 2020/7/6
@@ -35,15 +37,24 @@
@Autowired
private WaitPakinLogService waitPakinLogService;
@Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+// 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());
+// iterator.remove();
+// }
+// }
+// }
+//
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
// 鍏ㄦ澘鍏ュ簱
@@ -59,21 +70,28 @@
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)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
}
-
- // 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getWrkSts() == 15) {
-
- }
-
- // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
- for (WrkDetl wrkDetl : wrkDetlService.selectByWrkNo(wrkMast.getWrkNo())) {
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- orderService.checkComplete(wrkDetl.getOrderNo());
- }
+//
+// // 鍑哄簱 --------------------------------------------------------------------------------
+// } else if (wrkMast.getWrkSts() == 15) {
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
--
Gitblit v1.9.1