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 | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 40 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 11a0603..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
@@ -2,17 +2,19 @@
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.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.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 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;
@@ -30,6 +32,10 @@
@Autowired
private TaskItemService taskItemService;
@Autowired
+ private TaskLogService taskLogService;
+ @Autowired
+ private TaskItemLogService taskItemLogService;
+ @Autowired
private StockItemService stockItemService;
@Autowired
private PurchaseService purchaseService;
@@ -41,52 +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 * * * ? ")
- @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("浠诲姟鏄庣粏涓虹┖锛侊紒");
- }
- //鑾峰彇鍗曟嵁鏄庣粏ID
- List<Long> ids = taskItems.stream().map(TaskItem::getOrderItemId).collect(Collectors.toList());
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, ids));
- if (items.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒锛氭槑缁嗗崟鎹笉瀛樺湪");
- }
- /**鑾峰彇璁㈠崟*/
- List<Long> orders = items.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
- Map<Long, List<AsnOrderItem>> listMap = items.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
+ taskService.complateInTask(tasks);
+ }
- listMap.keySet().forEach(key -> {
- AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, key));
- 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());
+ /**
+ * @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);
}
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
+ } 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("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
- stock.setAsnId(order.getId()).setAsnCode(order.getCode());
- if (!stockService.save(stock)) {
- 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("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ }
}
--
Gitblit v1.9.1