diff --git a/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs b/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
index 724aa01..0faa458 100644
--- a/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
+++ b/WcsMain/Business/CirculationTask/Stacker/ExecuteWcsTask.cs
@@ -84,8 +84,7 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
         var wcsTask = wcsTasks[0]; // 取第一条任务
         /* 校验入库站台是否可以取货 */
         (bool isSuccess, uint value) = _stackerConveyOperation.ReadSenserStatus(wcsTask.Origin);
-        if (!isSuccess) return false; //站台不允许取货
-        if (value == 0) return false; //站台不允许取货
+        if (!isSuccess || value == 0) return false; //站台不允许取货
         // TODO
         /* 检验并返回起点终点信息 */
 
@@ -105,8 +104,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
             PlcId = wcsTask.PlcId,
             TaskType = Convert.ToInt16(wcsTask.TaskType),
             GetStand = wcsTask.Origin == "111" ? (short)111 : (short)106,
-            InTunnelId = 3,
-            OutTunnelId = 3,
+            InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
+            OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
             SetStand = 0,
             GetQueue = 1,
             GetLine = 1,
@@ -156,7 +155,7 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
         /* 校验出库站台是否可以卸货 */
         // TODO
         /* 检验并返回起点终点信息 */
-        var originLocationInfo = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Origin);
+        var originLocationInfo = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Origin); 
         var destinationLocationInfo = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Destination);
         if (destinationLocationInfo == default || originLocationInfo == default) // 起点终点错误，直接标记错误
         {
@@ -171,8 +170,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
             PlcId = wcsTask.PlcId,
             TaskType = Convert.ToInt16(wcsTask.TaskType),
             GetStand = 0,
-            InTunnelId = 3,
-            OutTunnelId = 3,
+            InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
+            OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
             SetStand = Convert.ToInt16(wcsTask.Destination),
             GetQueue = Convert.ToInt16(originLocationInfo.Queue),
             GetLine = Convert.ToInt16(originLocationInfo.Line),
@@ -237,8 +236,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
             PlcId = wcsTask.PlcId,
             TaskType = Convert.ToInt16(wcsTask.TaskType),
             GetStand = 0,
-            InTunnelId = 3,
-            OutTunnelId = 3,
+            InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
+            OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
             SetStand = 0,
             GetQueue = Convert.ToInt16(originLocationInfo.Queue),
             GetLine = Convert.ToInt16(originLocationInfo.Line),
@@ -301,8 +300,8 @@ public class ExecuteWcsTask(StackerOperation stackerOperation, AppWcsTaskDao wcs
             PlcId = wcsTask.PlcId,
             TaskType = Convert.ToInt16(wcsTask.TaskType),
             GetStand = 0,
-            InTunnelId = 3,
-            OutTunnelId = 3,
+            InTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
+            OutTunnelId = Convert.ToInt16(destinationLocationInfo.TunnelNo),
             SetStand = 0,
             GetQueue = Convert.ToInt16(originLocationInfo.Queue),
             GetLine = Convert.ToInt16(originLocationInfo.Line),