Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -2,16 +2,22 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.server.manager.entity.Task;
import com.vincent.rsf.server.manager.entity.TaskItem;
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.GlobalConfigCode;
import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
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.stream.Collectors;

/**
@@ -26,33 +32,124 @@
    @Autowired
    private TaskItemService taskItemService;
    @Autowired
    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;

    /**
    * @author Ryan
    * @description 完成入库，更新库存
    * @param
    * @return
    * @time 2025/4/2 12:37
    */
    @Scheduled(cron = "0 0/05 * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void completeInStock() {
     * @param
     * @return
     * @author Ryan
     * @description 完成入库，更新库存
     * @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));
        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("任务明细为空！！");
        }
        taskItems.forEach(item -> {

        });
        taskService.complateInTask(tasks);
    }

    /**
     * @author Ryan
     * @date 2025/5/20
     * @description: 完成出库任务，更新库存
     * @version 1.0
     */
    @Scheduled(cron = "0/30 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    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/05 * * * ?  ")
    @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);
            } else {
                queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
            }
        } else {
            queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.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();
            BeanUtils.copyProperties(task, taskLog);
            taskLog.setTaskId(task.getId())
                    .setId(null);
            if (!taskLogService.save(taskLog)) {
                throw new CoolException("任务历史档保存失败！！");
            }

            List<TaskItemLog> itemLogs = new ArrayList<>();
            for (TaskItem item : listMap.get(task.getId())) {
                TaskItemLog itemLog = new TaskItemLog();
                BeanUtils.copyProperties(item, itemLog);
                itemLog.setId(null)
                        .setTaskId(task.getId())
                        .setLogId(taskLog.getId())
                        .setTaskItemId(item.getId());
                itemLogs.add(itemLog);
            }

            if (!taskItemLogService.saveBatch(itemLogs)) {
                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("原始任务明细删除失败！！");
        }
    }
}