From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +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 | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 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 4ce0193..076e72d 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
@@ -2,15 +2,16 @@
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 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.stream.Collectors;
@@ -26,7 +27,17 @@
@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
@@ -38,21 +49,73 @@
* @return
* @time 2025/4/2 12:37
*/
- @Scheduled(cron = "0 0/05 * * * ? ")
+// @Scheduled(cron = "0 0/05 * * * ? ")
+ @Scheduled(cron = "0/15 * * * * ?")
@Transactional(rollbackFor = Exception.class)
- public void completeInStock() {
+ 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.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("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ 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("浠诲姟鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+
+ 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