From c21db7895425a870452d1dc03175cc4f4f1c0aab Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 22 七月 2025 16:07:04 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 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..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 @@ -52,7 +52,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; @@ -81,6 +81,7 @@ 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 +96,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 +115,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