From cf074430480e44eba1e6ddce09ccce9f28067120 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 九月 2025 08:56:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 9 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 d01a8f9..73dfd81 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -40,6 +40,15 @@
private WrkMastStaService wrkMastStaService;
@Autowired
private WrkMastStaLogService wrkMastStaLogService;
+ @Autowired
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
+ @Autowired
+ private WrkMastSplitTwinLogService wrkMastSplitTwinLogService;
+ @Autowired
+ private WrkMastCrnService wrkMastCrnService;
+ @Autowired
+ private WrkMastCrnLogService wrkMastCrnLogService;
+
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -74,12 +83,14 @@
log.error("鍒犻櫎鍏ュ簱閫氱煡妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
}
}
-// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
-// if (!Cools.isEmpty(wrkDetls)) {
-// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
-// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// }
+ if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
+ // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+ 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)) {
@@ -106,14 +117,19 @@
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls)){
+ List<WrkDetl> wrkDetls2 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls2)){
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ log.error("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
+
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
- exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ log.error("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
+
}
}
} catch (Exception e) {
@@ -147,4 +163,47 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> start(WrkMastSplitTwin wrkMastSplitTwin) {
+ try {
+ WrkMastSplitTwinLog wrkMastSplitTwinLog = new WrkMastSplitTwinLog();
+ wrkMastSplitTwinLog.sync(wrkMastSplitTwin);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastSplitTwinLogService.insert(wrkMastSplitTwinLog)) {
+ exceptionHandle("淇濆瓨wrkMastSplitTwinLog宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMastSplitTwin.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastSplitTwinService.deleteById(wrkMastSplitTwin)) {
+ exceptionHandle("鍒犻櫎wrkMastSplitTwin宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMastSplitTwin.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> start(WrkMastCrn wrkMastCrn) {
+ try {
+ WrkMastCrnLog wrkMastCrnLog = new WrkMastCrnLog();
+ wrkMastCrnLog.sync(wrkMastCrn);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastCrnLogService.insert(wrkMastCrnLog)) {
+ exceptionHandle("淇濆瓨wrkMastCrnLog宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMastCrn.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastCrnService.deleteById(wrkMastCrn)) {
+ exceptionHandle("鍒犻櫎wrkMastCrn宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMastCrn.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+
}
--
Gitblit v1.9.1