From 160496bb9b61400bfdf07398a6152dc74aa3bae0 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Wed, 11 Mar 2026 20:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TaskExecuteRecordServiceImpl.java    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java
index 19ace890..1d18cd81 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java
@@ -156,7 +156,6 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
             if(Task.STATUS_CONVEYOR_END.equals(task.getTaskStatus())){
                 //判断是否需要调用ctu接口
                 containerToCtu(agvCallBack.getTaskCode());
-
             }
 
         }
@@ -315,8 +314,15 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
                 return true;
             }
 
+            if(StringUtils.isEmpty(taskExecuteRecord.getEndPos())){
+                log.error("任务执行记录的终点位置为空，taskCode：{}", taskCode);
+                return false;
+            }
+
+            Station station = stationService.getByStationCode(taskExecuteRecord.getEndPos());
+
             // 3. 检查是否需要送到库位
-            if(null == task.getLocationId()){
+            if(null == task.getLocationId() || null != station){
                 log.info("任务{}不需要送到库位，直接完成", taskCode);
 
                 // 直接更新任务状态为完成
@@ -345,10 +351,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
                 return false;
             }
 
-            if(StringUtils.isEmpty(taskExecuteRecord.getEndPos())){
-                log.error("任务执行记录的终点位置为空，taskCode：{}", taskCode);
-                return false;
-            }
+
 
             // 6. 生成CTU调度任务
             AgvSchedulingTaskVO ctuSchedulingTask = genCtuSchedulingTask(
@@ -521,6 +524,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
         if (null == location) {
             log.info("根据终点位置未查询到位置信息，endPos：{}", endPos);
             log.info("不需要调再次调用AGV小车,整体任务到此结束");
+
             return true;
         }
 
@@ -558,8 +562,8 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
                 log.info("AGV调度成功，taskCode：{}，from：{}，to：{}",
                         taskCode, location.getLocationCode(), station.getStationCode());
 
-                // 更新任务状态
-                task.setTaskStatus(Task.STATUS_FINISHED);
+                // todo 更新任务状态
+                task.setTaskStatus(Task.STATUS_CONVEYOR_END);
                 boolean taskUpdate = taskService.updateById(task);
                 if (!taskUpdate) {
                     log.error("任务状态更新失败，但AGV调度已成功，taskId：{}", task.getId());