diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
index aba695b..9852b54 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
@@ -1353,9 +1353,9 @@ public class AsynRunTaskService extends BaseService {
                     if (status!=1){
                         logger.info("===执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行失败===");
                         webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行失败");
-                        return;
+                    }else {
+                        logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行成功===");
                     }
-                    logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行成功===");
                 }
             }else {
                 logger.info("RGV2不在线，跳过检测是否避让。");
@@ -1376,9 +1376,9 @@ public class AsynRunTaskService extends BaseService {
                     if (status!=1){
                         logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败===");
                         webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败");
-                        return;
+                    }else {
+                        logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行成功===");
                     }
-                    logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行成功===");
                 }
             }else {
                 logger.info("RGV1不在线，跳过检测是否避让。");
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
index 513ab24..6d2495b 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mt.wms.core.base.BaseService;
 import com.mt.wms.core.dal.entity.*;
 import com.mt.wms.core.dal.service.*;
+import com.mt.wms.core.dal.service.impl.CurrTaskServiceBizImpl;
 import com.mt.wms.core.utils.BeanUtils;
 import com.mt.wms.core.utils.CodeGeneratorHelper;
 import com.mt.wms.core.utils.HttpClient;
@@ -81,16 +82,10 @@ public class ScheduledTask extends BaseService {
     @Resource
     private TaskDetHisServiceBiz taskDetHisServiceBiz;
 
+
     //@Scheduled(fixedDelay = 1000*20)
     @Test
     public void test() throws IOException {
-        CurrTask currTask = currTaskServiceBiz.getById(342);
-        if (currTask.getIsOut()==1){
-                int count = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.F_TASK_ID, currTask.getId()));
-            System.out.println(count>0);;
-            }else {
-            System.out.println(true);
-            }
 
     }
     //@Scheduled(fixedDelay = 1000*60)