From 7045b984af43d5825058b4df4b4dbc7a08cf2db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:33:53 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 69cc3d3..8769ef5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -72,24 +72,36 @@
}
// 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
if (!Cools.isEmpty(wrkDetls)) {
- if (!orderService.saveHandlerOrder(wrkMast, 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) {
-
+ if (!Cools.isEmpty(wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+ exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
}
-
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ if (!wrkMastLogService.saveLog(wrkMast)) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+
+// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
--
Gitblit v1.9.1