料仓有无料盘用感应器和逻辑同时用或判断

Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs

@@ -891,7 +891,25 @@ namespace Rs.AutoDischarge.V3.Flow
 
         public bool HasTray()
         {
-            return  (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测")) ;
+            bool hasTray = Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测");
+            bool hasTray2 = GlobalTray.GetTray(m_stockType).Status == "Loaded";
+            //if(!hasTray)
+            //{
+            //    //斜推气缸松开
+            //    Ops.Off($"{(int)m_stockType}号料仓斜推气缸");
+            //    Thread.Sleep(200);
+            //    //斜退气缸顶住
+            //    Ops.On($"{(int)m_stockType}号料仓斜推气缸");
+            //    Thread.Sleep(200);
+            //    hasTray = Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测");
+            //    if(!hasTray)
+            //    {
+            //        Ops.Off($"{(int)m_stockType}号料仓斜推气缸");
+            //        Thread.Sleep(200);
+            //    }
+            //}
+            return hasTray || hasTray2;
+            //return  (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测")) ;
         }
 
         private void ReportSwitchTray(int no)