From 2e929cc5c44e4072520aae4c8a9f40029da27405 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 18 十一月 2025 17:29:13 +0800
Subject: [PATCH] 上报站点报异常 二次组托异常

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 810f26b..b2cca17 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
@@ -478,16 +478,19 @@
                 CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
                 if (result.getCode() == 200) {
                     tasks.forEach(task -> {
-                        BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
-                        if (Objects.isNull(curSta)) {
-                            throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
-                        }
+
                         if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+
+                            BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
+                            if (Objects.isNull(curSta)) {
+                                throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+                            }
+
                             if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                                     .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
                                 throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -507,6 +510,11 @@
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
                                 || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+                            BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+                            if (Objects.isNull(curSta)) {
+                                throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+                            }
+
                             if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                                     .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
                                 throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");

--
Gitblit v1.9.1