From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 112 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 39 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 076e72d..f35c3ab 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
@@ -5,6 +5,9 @@
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;
@@ -13,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -42,80 +47,109 @@
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 * * * ? ")
- @Scheduled(cron = "0/15 * * * * ?")
- @Transactional(rollbackFor = Exception.class)
+ * @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;
+ }
+ 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);
}
-
/**
- * @author Ryan
- * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
- * @param
- * @return
- * @time 2025/4/3 12:54
- */
+ * @param
+ * @return
+ * @author Ryan
+ * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
+ * @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));
+ 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;
}
- List<TaskLog> taskLogs = new ArrayList<>();
+ 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);
- taskLogs.add(taskLog);
- });
- if (!taskLogService.saveBatch(taskLogs)) {
- throw new CoolException("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
- }
- List<TaskItemLog >itemLogs = new ArrayList<>();
+ taskLog.setTaskId(task.getId())
+ .setId(null);
+ if (!taskLogService.save(taskLog)) {
+ throw new CoolException("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
- taskItems.forEach(item -> {
- TaskItemLog itemLog = new TaskItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setId(null).setTaskItemId(item.getId());
- itemLogs.add(itemLog);
- });
+ 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 (!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