From c2f6a9f9ecf61c873bd53b09d00c6a8950e91f45 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 10 一月 2026 10:01:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   23 +++++++++++------------
 1 files changed, 11 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 a176edf..f6fbd4e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
@@ -38,7 +39,7 @@
     @Autowired
     private OrderService orderService;
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ReturnT<String> start(WrkMast wrkMast) {
         try {
             List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -107,12 +108,14 @@
             wrkMastLog.setModiTime(now);
             wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
             if (!wrkMastLogService.insert(wrkMastLog)){
-                exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+                throw new CoolException("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触");
+//                exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
 
             // 鍒犻櫎宸ヤ綔涓绘。
             if (!wrkMastService.deleteById(wrkMast)) {
-                exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+//                exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+                throw new CoolException("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触");
             }
             // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
             List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -121,22 +124,18 @@
                 wrkDetlLog.sync(wrkDetl);
                 wrkDetlLog.setModiTime(now);
                 if (!wrkDetlLogService.insert(wrkDetlLog)){
-                    exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+//                    exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+                    throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触");
                 }
             });
 
-//            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-////                exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
-//            }
             // 鍒犻櫎宸ヤ綔鏄庣粏妗�
             if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
-                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+//                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+                throw new CoolException("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触");
             }
         } catch (Exception e) {
-            log.error("fail", e);
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return FAIL.setMsg(e.getMessage());
+            throw new CoolException("澶勭悊宸ヤ綔妗h浆鍘嗗彶澶辫触");
         }
         return SUCCESS;
     }

--
Gitblit v1.9.1