From 2e182dfa35d17e531bee9c1eb4f4381c28ef9e93 Mon Sep 17 00:00:00 2001
From: Xq Yang <2290299376@qq.com>
Date: Tue, 25 Jun 2024 11:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8E=9F=E6=9C=AC=E5=86=99=E6=AD=BB?=
 =?UTF-8?q?=E7=9A=84=E5=A0=86=E5=9E=9B=E6=9C=BA=E7=BC=96=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=BA=86=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CirculationTask/Stacker/ExecuteWcsTask.cs | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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),