From b778c28b598eecd0687f0612f9236c6e957de89f Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期四, 03 四月 2025 16:59:34 +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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 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 7d72b1c..1e857c8 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 @@ -35,6 +35,10 @@ @Autowired private TaskItemService taskItemService; @Autowired + private TaskLogService taskLogService; + @Autowired + private TaskItemLogService taskItemLogService; + @Autowired private StockItemService stockItemService; @Autowired private PurchaseService purchaseService; @@ -63,4 +67,55 @@ } taskService.completeTask(tasks); } + + + /** + * @author Ryan + * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。 + * @param + * @return + * @time 2025/4/3 12:54 + */ + @Scheduled(cron = "0 0/05 * * * ? ") + @Transactional(rollbackFor = Exception.class) + public void taskLogUpdate() { + List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.UPDATED_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>().in(TaskItem::getTaskId, list)); + if (taskItems.isEmpty()) { + return; + } + List<TaskLog> taskLogs = new ArrayList<>(); + tasks.forEach(task -> { + TaskLog taskLog = new TaskLog(); + BeanUtils.copyProperties(task, taskLog); + taskLog.setTaskId(task.getId()).setId(null); + taskLogs.add(taskLog); + }); + if (!taskLogService.saveBatch(taskLogs)) { + throw new CoolException("浠诲姟鍘嗗彶妗d繚瀛樺け璐ワ紒锛�"); + } + List<TaskItemLog >itemLogs = new ArrayList<>(); + taskItems.forEach(item -> { + TaskItemLog itemLog = new TaskItemLog(); + BeanUtils.copyProperties(item, itemLog); + itemLog.setId(null).setTaskItemId(item.getId()); + itemLogs.add(itemLog); + }); + if (!taskItemLogService.saveBatch(itemLogs)) { + throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗d繚瀛樺け璐ワ紒锛�"); + } + 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