From fd02009741fbc7bc520000edb0c19afb6c27f29e Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 07 一月 2026 15:46:49 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 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 cf17c46..18b8ada 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
@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.schedules;
-
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.*;
@@ -52,7 +51,7 @@
public void genReCheck() {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.select(Task::getId)
- .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id)
+ .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id)
.eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
if (tasks.isEmpty()) {
return;
@@ -70,17 +69,21 @@
return;
}
Long loginUserId = SystemAuthUtils.getLoginUserId();
- Map<Long, List<TaskItem>> taskMps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
+ Map<Long, List<TaskItem>> taskMps = taskItems.stream()
+ .filter(item -> Objects.nonNull(item.getOrderId()))
+ .collect(Collectors.groupingBy(TaskItem::getOrderId));
taskMps.keySet().forEach(orderId -> {
WkOrder order = checkOrderService.getById(orderId);
if (Objects.isNull(order)) {
throw new CoolException("鐩樼偣鍗曟嵁涓嶅瓨鍦紒锛�");
}
- CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderId, orderId));
+ 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_INIT.val)
.setCreateBy(loginUserId)
@@ -95,6 +98,7 @@
List<TaskItem> items = taskMps.get(orderId);
List<CheckDiffItem> diffItems = new ArrayList<>();
+ CheckDiff finalCheckDiff = checkDiff;
for (TaskItem item : items) {
Task task = taskService.getById(item.getTaskId());
if (Objects.isNull(task)) {
@@ -113,22 +117,22 @@
.setOrderCode(checkDiff.getOrderCode());
diffItems.add(checkDiffItem);
-// 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$());
-// }
+ 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("搴撳尯淇℃伅淇敼澶辫触锛侊紒");
-// }
+ 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