diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
index 06c53f5..32cb292 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
@@ -7,7 +7,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
-import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
 import com.ruoyi.bas.port.domain.WcsPort;
 import com.ruoyi.bas.port.service.IWcsPortService;
@@ -15,7 +14,6 @@ import com.ruoyi.common.domain.SendData;
 import com.ruoyi.device.srgv.domain.DeviceSrgv;
 import com.ruoyi.device.tsj.domain.DeviceTsj;
 import com.ruoyi.device.tsj.service.IDeviceTsjService;
-import com.ruoyi.job.domain.MydoJob;
 import com.ruoyi.job.service.IMydoJobService;
 import com.ruoyi.queue.srgv.domain.WcsSrgvQueue;
 import com.ruoyi.queue.srgv.service.IWcsSrgvQueueService;
@@ -30,8 +28,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 @Slf4j
 public class TsjThread implements Runnable {
@@ -132,21 +128,38 @@ public class TsjThread implements Runnable {
             wcsSrgvQueue.setExecutionStatus("0");
             String startSite = "";
             String endSite = "";
-            switch (wcsSrgvQueue.getTaskType()){
+            switch (wcsSrgvQueue.getDefault02()) {
                 case "1":
-                    //空车
-                    startSite = "tsj";
-                    endSite = wcsSrgvQueue.getCargoPickSite();
-                    break;
-                case "2":
-                case "3":
-                    //满车或者是充电
+                    //入库
+                    //满车
                     startSite = "tsj";
                     endSite = wcsSrgvQueue.getCargoPlaceSite();
                     break;
-                default:
-                    log.info("任务类型错误");
+                case "2":
+                    //出库
+                    startSite = "tsj";
+                    endSite = wcsSrgvQueue.getCargoPlaceSite();
+                    break;
+                case "3":
+                    //充电
+                    break;
+                case "4":
+                    //点到点
+                    switch (wcsSrgvQueue.getTaskType()) {
+                        case "1":
+                            startSite = "tsj";
+                            endSite = wcsSrgvQueue.getCargoPickSite();
+                            break;
+                        case "2":
+                            startSite = "tsj";
+                            endSite = wcsSrgvQueue.getCargoPlaceSite();
+                            break;
+                        default:
+                            log.info("任务类型错误");
+                    }
+                    break;
             }
+
             if (StrUtil.isNotEmpty(startSite) && StrUtil.isNotEmpty(endSite)){
                 wcsSrgvQueue.setStartSite(startSite);
                 wcsSrgvQueue.setEndSite(endSite);
@@ -173,21 +186,26 @@ public class TsjThread implements Runnable {
                         WcsSrgvQueue wcsSrgvQueue = wcsSrgvQueues.get(0);
                         String strFloor = wcsSrgvQueue.getTheFloor();
                         String tarFloor = wcsSrgvQueue.getDefault07();
-                        TsjDeviceExecutionQueue tsjDeviceExecutionQueue = new TsjDeviceExecutionQueue();
-                        tsjDeviceExecutionQueue.setGuid(IdUtil.simpleUUID());
-                        tsjDeviceExecutionQueue.setDeviceId(tsj.getId());
-                        tsjDeviceExecutionQueue.setDeviceName(tsj.getName());
-                        tsjDeviceExecutionQueue.setTaskNo(Convert.toLong(deviceSrgv.getTaskNo()));
-                        tsjDeviceExecutionQueue.setSrcRow("0");
-                        tsjDeviceExecutionQueue.setSrcLayer(strFloor);
-                        tsjDeviceExecutionQueue.setTarRow("0");
-                        tsjDeviceExecutionQueue.setTarLayer(tarFloor);
-                        tsjDeviceExecutionQueue.setSendType("1");
-                        tsjDeviceExecutionQueue.setCreateDate(DateUtil.formatDateTime(new Date()));
-                        tsjDeviceExecutionQueue.setSpare1(Convert.toStr(deviceSrgv.getDeviceId()));
-                        tsjDeviceExecutionQueue.setTaskType("1");
-                        tsjDeviceExecutionQueue.setRwlx("1");
-                        tsjDeviceExecutionQueueService.insertTsjDeviceExecutionQueue(tsjDeviceExecutionQueue);
+                        if (!Convert.toStr(tsj.getDqcs()).equals(strFloor)) {
+                            //提升机层数和取车任务层数不一致
+                            //todo 判断目标楼层存在不存在其他小车
+                            TsjDeviceExecutionQueue tsjDeviceExecutionQueue = new TsjDeviceExecutionQueue();
+                            tsjDeviceExecutionQueue.setGuid(IdUtil.simpleUUID());
+                            tsjDeviceExecutionQueue.setDeviceId(tsj.getId());
+                            tsjDeviceExecutionQueue.setDeviceName(tsj.getName());
+                            tsjDeviceExecutionQueue.setTaskNo(Convert.toLong(deviceSrgv.getTaskNo()));
+                            tsjDeviceExecutionQueue.setSrcRow("0");
+                            tsjDeviceExecutionQueue.setSrcLayer(strFloor);
+                            tsjDeviceExecutionQueue.setTarRow("0");
+                            tsjDeviceExecutionQueue.setTarLayer(tarFloor);
+                            tsjDeviceExecutionQueue.setSendType("1");
+                            tsjDeviceExecutionQueue.setCreateDate(DateUtil.formatDateTime(new Date()));
+                            tsjDeviceExecutionQueue.setSpare1(Convert.toStr(deviceSrgv.getDeviceId()));
+                            tsjDeviceExecutionQueue.setTaskType("1");
+                            tsjDeviceExecutionQueue.setRwlx("1");
+                            tsjDeviceExecutionQueueService.insertTsjDeviceExecutionQueue(tsjDeviceExecutionQueue);
+                        }
+
                     }
                 }
             }