From f695b59337121fb6c93251e73bdfb3fc8e847cc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 七月 2025 17:07:09 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
index 4c80343..12938da 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
@@ -47,11 +47,25 @@
* @description: 鑷姩鑾峰彇宸茬敓鎴愮洏鐐逛换鍔＄殑鐩樼偣鍒楄〃
* @version 1.0
*/
- @Scheduled(cron = "0/25 * * * * ?")
+ @Scheduled(cron = "0/15 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void genReCheck() {
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
- .notExists("SELECT 1 FROM man_check_diff_item cdi WHERE id != cdi.task_item_id"));
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .select(Task::getId)
+ .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id)
+ .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
+ if (tasks.isEmpty()) {
+ return;
+ }
+ List<CheckDiffItem> list = checkDiffItemService
+ .list(new LambdaQueryWrapper<CheckDiffItem>()
+ .select(CheckDiffItem::getTaskItemId));
+ Set<Long> taskIds = tasks.stream().map(Task::getId).collect(Collectors.toSet());
+ List<Long> itemIds = list.stream().map(CheckDiffItem::getTaskItemId).collect(Collectors.toList());
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>()
+ .in(TaskItem::getTaskId, taskIds)
+ .notIn(!itemIds.isEmpty(), TaskItem::getId, itemIds));
if (taskItems.isEmpty()) {
return;
}
@@ -60,21 +74,22 @@
taskMps.keySet().forEach(orderId -> {
WkOrder order = checkOrderService.getById(orderId);
if (Objects.isNull(order)) {
- throw new CoolException("鐩樼偣鍗曟嵁涓嶅瓨鍦紒锛�");
+ throw new CoolException("鐩樼偣鍗曟嵁涓嶅瓨鍦紒锛�");
}
CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderId, orderId));
if (Objects.isNull(checkDiff)) {
checkDiff = new CheckDiff();
checkDiff.setAnfme(order.getAnfme())
.setCheckType(order.getCheckType())
+ .setId(null)
.setOrderCode(order.getCode())
- .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_ING.val)
+ .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
.setOrderId(order.getId());
- if (!checkDiffService.save(checkDiff)) {
+ if (!checkDiffService.saveOrUpdate(checkDiff)) {
throw new CoolException("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
}
}
@@ -82,14 +97,14 @@
List<TaskItem> items = taskMps.get(orderId);
List<CheckDiffItem> diffItems = new ArrayList<>();
CheckDiff finalCheckDiff = checkDiff;
- items.forEach(item -> {
+ for (TaskItem item : items) {
Task task = taskService.getById(item.getTaskId());
if (Objects.isNull(task)) {
throw new CoolException("鏁版嵁閿欒锛氫换鍔′笉瀛樺湪锛侊紒");
}
CheckDiffItem checkDiffItem = new CheckDiffItem();
BeanUtils.copyProperties(item, checkDiffItem);
- checkDiffItem.setCheckId(finalCheckDiff.getId())
+ checkDiffItem.setCheckId(checkDiff.getId())
.setTaskItemId(item.getId())
.setTaskId(item.getTaskId())
.setCreateBy(loginUserId)
@@ -97,10 +112,10 @@
.setBarcode(task.getBarcode())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
- .setOrderCode(finalCheckDiff.getOrderCode());
+ .setOrderCode(checkDiff.getOrderCode());
diffItems.add(checkDiffItem);
- if (Objects.isNull(finalCheckDiff.getAreaId())) {
+ if (Objects.isNull(checkDiff.getAreaId())) {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, task.getOrgLoc())
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_R.type));
@@ -108,16 +123,18 @@
throw new CoolException("鐩樼偣搴撲綅涓嶅瓨鍦紒锛�");
}
finalCheckDiff.setAreaId(loc.getAreaId()).setAreaName(loc.getAreaId$());
-
- if (!checkDiffService.updateById(finalCheckDiff)) {
- throw new CoolException("搴撳尯淇℃伅淇敼澶辫触锛侊紒");
- }
}
- });
+ }
- if (!checkDiffItemService.saveBatch(diffItems)) {
- throw new CoolException("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
- }
+ checkDiff.setAreaId(finalCheckDiff.getAreaId()).setAreaName(finalCheckDiff.getAreaName());
+
+ if (!checkDiffService.updateById(checkDiff)) {
+ throw new CoolException("搴撳尯淇℃伅淇敼澶辫触锛侊紒");
+ }
+
+ if (!checkDiffItemService.saveBatch(diffItems)) {
+ throw new CoolException("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
+ }
});
}
}
--
Gitblit v1.9.1