From b7b3328fdfa45cf13d1943fa79d47f1b6bb43f01 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 18:22:17 +0800
Subject: [PATCH] 添加定时任务用户

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |  181 ++++++++++++++++++++++++--------------------
 1 files changed, 98 insertions(+), 83 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 3156c74..18711a1 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
@@ -1,22 +1,22 @@
 package com.vincent.rsf.server.manager.schedules;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.enums.LocStsType;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.lang3.StringUtils;
+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.sql.Array;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -30,94 +30,109 @@
 @Component
 public class TaskSchedules {
 
+    public static Logger logger = LoggerFactory.getLogger(TaskSchedules.class);
+
     @Autowired
     private TaskService taskService;
     @Autowired
     private TaskItemService taskItemService;
     @Autowired
-    private StockItemService stockItemService;
+    private TaskLogService taskLogService;
     @Autowired
-    private PurchaseService purchaseService;
+    private TaskItemLogService taskItemLogService;
     @Autowired
-    private AsnOrderService asnOrderService;
-    @Autowired
-    private AsnOrderItemService asnOrderItemService;
-    @Autowired
-    private StockService stockService;
-    @Autowired
-    private LocService locService;
+    private ConfigService configService;
+
     /**
-    * @author Ryan
-    * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
-    * @param
-    * @return
-    * @time 2025/4/2 12:37
-    */
-    @Scheduled(cron = "0 0/05 * * * ?  ")
-//  @Scheduled(cron = "0/5 * * * * ?")
-    @Transactional(rollbackFor = Exception.class)
-    public void completeInStock() {
+     * @param
+     * @return
+     * @author Ryan
+     * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
+     * @time 2025/4/2 12:37
+     */
+    @Scheduled(cron = "0/3 * * * * ?")
+    public void completeInStock() throws Exception {
         List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
         if (tasks.isEmpty()) {
             return;
         }
-        List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
-        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list));
-        if (taskItems.isEmpty()) {
-            throw new CoolException("浠诲姟鏄庣粏涓虹┖锛侊紒");
-        }
-        /**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
-        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
-        List<StockItem> stockItems = new ArrayList<>();
-        orderMap.keySet().forEach(key -> {
-            AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
-                    .eq(AsnOrder::getId, key)
-                    .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
-            Stock stock = new Stock();
-            if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
-                Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
-                stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
-            }
-            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
-            if (StringUtils.isBlank(ruleCode)) {
-                throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
-            }
-            stock.setAsnId(order.getId()).setAsnCode(order.getCode());
-            if (!stockService.save(stock)) {
-                throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
-            }
-            List<TaskItem> items = orderMap.get(key);
-            for (TaskItem item : items) {
-                /**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
-                Task taskServiceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
-                        .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
-                        .eq(Task::getId, item.getTaskId()));
-                Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
-                if (Objects.isNull(loc)) {
-                    throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
-                }
-                AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
-                if (Objects.isNull(orderItem)) {
-                    throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
-                }
-                StockItem stockItem = new StockItem();
-                BeanUtils.copyProperties(orderItem, stockItem);
-                stockItem.setAsnItemId(item.getOrderItemId())
-                        .setBarcode(taskServiceOne.getBarcode())
-                        .setLocId(loc.getId())
-                        .setId(null)
-                        .setStockId(stock.getId());
-                stockItems.add(stockItem);
-            }
-            if (!stockItemService.saveBatch(stockItems)) {
-                throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
-            }
-        });
-        /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
-        List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
-        if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
-            throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-        }
+        taskService.complateInTask(tasks);
     }
 
+    /**
+     * @author Ryan
+     * @date 2025/5/20
+     * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱瀛�
+     * @version 1.0
+     */
+    @Scheduled(cron = "0/5 * * * * ?  ")
+    public void complateOutStock() throws Exception {
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id));
+        if (tasks.isEmpty()) {
+            return;
+        }
+        taskService.completeTask(tasks);
+    }
+
+    /**
+     * @param
+     * @return
+     * @author Ryan
+     * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
+     * @time 2025/4/3 12:54
+     */
+    @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.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
+            } else {
+                queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
+            }
+        } else {
+            queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
+        }
+        List<Task> tasks = taskService.list(queryWrapper);
+        if (tasks.isEmpty()) {
+            return;
+        }
+
+        tasks.forEach(task -> {
+            TaskLog taskLog = new TaskLog();
+            BeanUtils.copyProperties(task, taskLog);
+            taskLog.setTaskId(task.getId())
+                    .setId(null);
+            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 : taskItems) {
+                TaskItemLog itemLog = new TaskItemLog();
+                BeanUtils.copyProperties(item, itemLog);
+                itemLog.setId(null)
+                        .setTaskId(task.getId())
+                        .setLogId(taskLog.getId())
+                        .setTaskItemId(item.getId());
+                itemLogs.add(itemLog);
+            }
+
+            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("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+                }
+            }
+        });
+    }
 }

--
Gitblit v1.9.1