From c96d7cac4e3ed8d8ab3d2ef4fbee8be372f1a3b0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 七月 2025 13:27:50 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 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 e470f48..cf17c46 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
@@ -4,11 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
-import com.vincent.rsf.server.manager.enums.CheckExceStatus;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +38,8 @@
private CheckOrderService checkOrderService;
@Autowired
private CheckOrderItemService checkOrderItemService;
+ @Autowired
+ private LocServiceImpl locService;
/**
* @author Ryan
@@ -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,7 +74,7 @@
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)) {
@@ -68,37 +82,57 @@
checkDiff.setAnfme(order.getAnfme())
.setCheckType(order.getCheckType())
.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("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
}
}
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)
.setCreateTime(new Date())
+ .setBarcode(task.getBarcode())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
- .setOrderCode(finalCheckDiff.getOrderCode());
+ .setOrderCode(checkDiff.getOrderCode());
diffItems.add(checkDiffItem);
- });
- if (!checkDiffItemService.saveBatch(diffItems)) {
- throw new CoolException("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
- }
+// 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));
+// if (Objects.isNull(loc)) {
+// throw new CoolException("鐩樼偣搴撲綅涓嶅瓨鍦紒锛�");
+// }
+//// finalCheckDiff.setAreaId(loc.getAreaId()).setAreaName(loc.getAreaId$());
+// }
+ }
+
+// 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