From 08915b05c42b2ba97a8bb0809aeb48802ae63b46 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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 9308366..1fbf211 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.TaskStatusType;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -17,6 +18,7 @@
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2020/7/6
@@ -47,6 +49,8 @@
private TaskDetlService taskDetlService;
@Autowired
private TaskDetlLogService taskDetlLogService;
+ @Autowired
+ private OrderPakinService orderPakinService;
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> start(WrkMast wrkMast) {
@@ -59,10 +63,18 @@
WrkDetl wrkDetl = iterator.next();
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
// orderService.checkComplete(wrkDetl.getOrderNo());
- if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 8 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 104){
- OrderInAndOutUtil.checkComplete(Boolean.TRUE,wrkDetl.getOrderNo());
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 8 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 104) {
+ OrderInAndOutUtil.checkComplete(Boolean.TRUE, wrkDetl.getOrderNo());
} else {
- OrderInAndOutUtil.checkComplete(Boolean.FALSE,wrkDetl.getOrderNo());
+
+ OrderInAndOutUtil.checkComplete(Boolean.FALSE, wrkDetl.getOrderNo());
+
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>()
+ .eq("order_no", wrkDetl.getOrderNo())
+ .in("doc_type", 7));
+ if (!Objects.isNull(orderPakin)) {
+ OrderInAndOutUtil.checkComplete(Boolean.TRUE, orderPakin.getOrderNo());
+ }
}
iterator.remove();
}
@@ -90,7 +102,7 @@
// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
// }
// }
- // 鎷ｆ枡鍐嶅叆搴�
+ // 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
// //
// if (!Cools.isEmpty(wrkDetls)) {
@@ -100,7 +112,7 @@
// }
}
- // 鍑哄簱 --------------------------------------------------------------------------------
+ // 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
@@ -119,10 +131,13 @@
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ log.error("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ log.error("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
@@ -145,10 +160,10 @@
TaskDetl taskDetl = iterator.next();
if (!Cools.isEmpty(taskDetl.getOrderNo())) {
// orderService.checkComplete(wrkDetl.getOrderNo());
- if (task.getIoType() == 1 || task.getIoType() == 8 || task.getIoType() == 54 || task.getIoType() == 104){
- OrderInAndOutUtil.checkComplete(Boolean.TRUE,taskDetl.getOrderNo());
+ if (task.getIoType() == 1 || task.getIoType() == 8 || task.getIoType() == 54 || task.getIoType() == 104) {
+ OrderInAndOutUtil.checkComplete(Boolean.TRUE, taskDetl.getOrderNo());
} else {
- OrderInAndOutUtil.checkComplete(Boolean.FALSE,taskDetl.getOrderNo());
+ OrderInAndOutUtil.checkComplete(Boolean.FALSE, taskDetl.getOrderNo());
}
iterator.remove();
}
@@ -205,22 +220,26 @@
if (!taskService.deleteById(task)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", task.getWrkNo());
}
+
+
List<TaskDetl> taskDetls2 = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
- for (TaskDetl taskDetl :taskDetls2){
+ for (TaskDetl taskDetl : taskDetls2) {
TaskDetlLog taskDetlLog = new TaskDetlLog();
BeanUtils.copyProperties(taskDetl, taskDetlLog);
taskDetlLog.setLogId(taskLog.getId());
taskDetlLog.setId(null);
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!taskDetlLogService.insert(taskDetlLog)) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
+ log.error("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
+// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
}
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!taskDetlService.deleteById(taskDetl)) {
- exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", task.getWrkNo());
- }
+ // 鍒犻櫎宸ヤ綔鏄庣粏
}
+ if (!taskDetlService.delete(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()))) {
+ log.error("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
+// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", task.getWrkNo());
+ }
} catch (Exception e) {
log.error("fail", e);
--
Gitblit v1.9.1