From 27f0bc2ca510a0d60aa2475acaf3e6a86f48a12c Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 07 六月 2022 11:15:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   68 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 26 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 6b8c21f..7492ff1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,23 +1,23 @@
 package com.zy.asrs.task.handler;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WaitPakin;
 import com.zy.asrs.entity.WrkDetl;
 import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkDetlLogService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 /**
  * Created by vincent on 2020/7/6
  */
 @Service
-@Transactional
-public class WorkLogHandler extends AbstractHandler {
+public class WorkLogHandler extends AbstractHandler<String> {
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -27,28 +27,44 @@
     private WrkDetlService wrkDetlService;
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
+    @Autowired
+    private WaitPakinService waitPakinService;
+    @Autowired
+    private WaitPakinLogService waitPakinLogService;
 
-    public void start() {
-        WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
-        if (null == wrkMast) {
-            return;
+    @Transactional
+    public ReturnT<String> start(WrkMast wrkMast) {
+        try {
+
+            if (!Cools.isEmpty(wrkMast.getBarcode())) {
+                // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+                waitPakinLogService.save(wrkMast.getBarcode());
+                // 鍒犻櫎鍏ュ簱閫氱煡妗�
+                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+            }
+
+            // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+                exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+            }
+            // 鍒犻櫎宸ヤ綔涓绘。
+            if (!wrkMastService.deleteById(wrkMast)) {
+                exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+            }
+            // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+            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());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
         }
-        // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
-            exceptionHandle(""); // todo
-        }
-        // 鍒犻櫎宸ヤ綔涓绘。
-        if (!wrkMastService.deleteById(wrkMast)) {
-            exceptionHandle(""); // todo
-        }
-        // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
-        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-            exceptionHandle(""); // todo
-        }
-        // 鍒犻櫎宸ヤ綔鏄庣粏妗�
-        if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
-            exceptionHandle(""); // todo
-        }
+        return SUCCESS;
     }
 
 }

--
Gitblit v1.9.1