From 10a43f2d14a1a161bc624b9fe2f70febc9776ac8 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 09:42:19 +0800
Subject: [PATCH] 1

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 601c72a..d299f77 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -23,6 +23,7 @@
 import com.vincent.rsf.server.system.utils.SerialRuleUtils;
 import com.vincent.rsf.server.system.utils.SystemAuthUtils;
 import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,6 +35,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("taskService")
 public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
 
@@ -406,22 +408,24 @@
      */
     @Synchronized
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void complateInTask(List<Task> tasks) throws Exception {
         Long loginUserId = SystemAuthUtils.getLoginUserId();
         for (Task task : tasks) {
-            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
-                //1.鍏ュ簱
-                complateInstock(task, loginUserId);
-            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
-                //53.鎷f枡鍐嶅叆搴�
-                //57.鐩樼偣鍐嶅叆搴�
-                pickComplateInStock(task, loginUserId);
-            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
-                //绉诲簱
-                moveInStock(task, loginUserId);
+            try {
+                if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
+                    //1.鍏ュ簱
+                    complateInstock(task, loginUserId);
+                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+                    //53.鎷f枡鍐嶅叆搴�
+                    //57.鐩樼偣鍐嶅叆搴�
+                    pickComplateInStock(task, loginUserId);
+                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+                    //绉诲簱
+                    moveInStock(task, loginUserId);
+                }
+            } catch (Exception ex) {
+                log.error(ex.getMessage(), ex);
             }
-
         }
     }
 
@@ -635,7 +639,6 @@
      */
     @Synchronized
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void completeTask(List<Task> tasks) {
         Long loginUserId = SystemAuthUtils.getLoginUserId();
         for (Task task : tasks) {
@@ -643,7 +646,8 @@
             try {
                 complateOutStock(task, loginUserId);
             } catch (Exception e) {
-                throw new CoolException(e.getMessage());
+                log.error(e.getMessage(), e);
+//                throw new CoolException(e.getMessage());
             }
         }
     }

--
Gitblit v1.9.1