diff --git a/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java b/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java
index efdaa74..b5aa68e 100644
--- a/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java
@@ -590,7 +590,7 @@ public class HomeServiceImpl implements HomeService {
         String resultflag = resjo.getString("result");
         if (StrUtil.equals("0", resultflag)) {
             //返程指令已下发
-            if (TaskTypeEnum.TAKE.getCode().equals(taskjo.getString("task_type")) || TaskTypeEnum.PUT.getCode().equals(taskjo.getString("task_type"))) {
+            if(TaskTypeEnum.TAKE.getCode().equals(taskjo.getString("task_type")) || TaskTypeEnum.PUT.getCode().equals(taskjo.getString("task_type"))) {
                 taskjo.put("step", "1");
             }
             taskjo.put("is_manualfinished", "1");
@@ -691,7 +691,7 @@ public class HomeServiceImpl implements HomeService {
         //stopWatch.start();
         JSONObject taskjo = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete='0'and task_status='01'").uniqueResult(0);
         //小车停止，且已到达目标点位
-        if (ObjectUtil.isNotEmpty(taskjo)) {
+        if (ObjectUtil.isNotEmpty(taskjo) && StrUtil.equals("0", debugInfoJson.getString("PathFollow_Enable")) && debugInfoJson.getString("CurNodeID").equals(taskjo.getString("next_point_code"))) {
             //普通任务
             if (TaskTypeEnum.COMMON.getCode().equals(taskjo.getString("task_type"))) {
                 updateTaskStatus(taskjo, TaskStatusEnum.END);