From c255a17d7ef4fabb37c1ac84b212768e73c42915 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 29 五月 2025 16:57:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |   84 +++++++++++++++++------------------------
 1 files changed, 35 insertions(+), 49 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index f35c3ab..13b453f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -8,16 +8,16 @@
 import com.vincent.rsf.server.system.constant.GlobalConfigCode;
 import com.vincent.rsf.server.system.entity.Config;
 import com.vincent.rsf.server.system.service.ConfigService;
+import com.vincent.rsf.server.system.utils.SystemAuthUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -27,6 +27,8 @@
 @Component
 public class TaskSchedules {
 
+    public static Logger logger = LoggerFactory.getLogger(TaskSchedules.class);
+
     @Autowired
     private TaskService taskService;
     @Autowired
@@ -35,18 +37,6 @@
     private TaskLogService taskLogService;
     @Autowired
     private TaskItemLogService taskItemLogService;
-    @Autowired
-    private StockItemService stockItemService;
-    @Autowired
-    private PurchaseService purchaseService;
-    @Autowired
-    private AsnOrderService asnOrderService;
-    @Autowired
-    private AsnOrderItemService asnOrderItemService;
-    @Autowired
-    private StockService stockService;
-    @Autowired
-    private LocService locService;
     @Autowired
     private ConfigService configService;
 
@@ -58,13 +48,14 @@
      * @time 2025/4/2 12:37
      */
     @Scheduled(cron = "0/3 * * * * ?")
-//    @Transactional(rollbackFor = Exception.class)
     public void completeInStock() throws Exception {
-        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id).select(Task::getId));
         if (tasks.isEmpty()) {
             return;
         }
-        taskService.complateInTask(tasks);
+        List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+        List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+        taskService.complateInTask(vaildTasks);
     }
 
     /**
@@ -73,14 +64,17 @@
      * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱瀛�
      * @version 1.0
      */
-    @Scheduled(cron = "0/30 * * * * ?  ")
-    @Transactional(rollbackFor = Exception.class)
+    @Scheduled(cron = "0/5 * * * * ?  ")
     public void complateOutStock() throws Exception {
-        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id));
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+                .eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id)
+                .select(Task::getId));
         if (tasks.isEmpty()) {
             return;
         }
-        taskService.completeTask(tasks);
+        List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+        List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+        taskService.completeTask(vaildTasks);
     }
 
     /**
@@ -90,32 +84,24 @@
      * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
      * @time 2025/4/3 12:54
      */
-    @Scheduled(cron = "0 0/05 * * * ?  ")
+    @Scheduled(cron = "0 0/01 * * * ?  ")
     @Transactional(rollbackFor = Exception.class)
     public void taskLogUpdate() {
         LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
         Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));
         if (!Objects.isNull(config)) {
             if (Boolean.parseBoolean(config.getVal())) {
-                queryWrapper.eq(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
+                queryWrapper.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
             } else {
-                queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
+                queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
             }
         } else {
-            queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
+            queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
         }
         List<Task> tasks = taskService.list(queryWrapper);
         if (tasks.isEmpty()) {
             return;
         }
-
-        List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
-        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
-        if (taskItems.isEmpty()) {
-            return;
-        }
-
-        Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
 
         tasks.forEach(task -> {
             TaskLog taskLog = new TaskLog();
@@ -125,9 +111,9 @@
             if (!taskLogService.save(taskLog)) {
                 throw new CoolException("浠诲姟鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
             }
-
+            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
             List<TaskItemLog> itemLogs = new ArrayList<>();
-            for (TaskItem item : listMap.get(task.getId())) {
+            for (TaskItem item : taskItems) {
                 TaskItemLog itemLog = new TaskItemLog();
                 BeanUtils.copyProperties(item, itemLog);
                 itemLog.setId(null)
@@ -137,19 +123,19 @@
                 itemLogs.add(itemLog);
             }
 
-            if (!taskItemLogService.saveBatch(itemLogs)) {
-                throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
+            if (!taskService.removeById(task.getId())) {
+                throw new CoolException("鍘熷浠诲姟鍒犻櫎澶辫触锛侊紒");
+            }
+
+            if (!taskItems.isEmpty()) {
+                if (!taskItemLogService.saveBatch(itemLogs)) {
+                    throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
+                }
+
+                if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
+                    throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+                }
             }
         });
-
-        if (!taskService.removeByIds(list)) {
-            throw new CoolException("鍘熷浠诲姟鍒犻櫎澶辫触锛侊紒");
-        }
-
-        List<Long> itemIds = taskItems.stream().map(TaskItem::getId).collect(Collectors.toList());
-
-        if (!taskItemService.removeByIds(itemIds)) {
-            throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
-        }
     }
 }

--
Gitblit v1.9.1