C1线横移托盘检测修改

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -352,6 +352,7 @@ namespace OnlineStore.DeviceLibrary
                     CheckLog("托盘阻挡" + MoveInfo.SLog + "  再次等待托盘信号");
                     CheckLog("托盘阻挡" + MoveInfo.SLog + "  再次等待托盘信号");
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(800));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(800));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
+                    MoveInfo.OneWaitCanEndStep = true;
                 }
                 }
                 else
                 else
                 {
                 {
@@ -362,6 +363,22 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime))
             else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime))
             {
             {
+                if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.HY05_TrayCheck);
+                    CheckLog("托盘阻挡" + MoveInfo.SLog + "  再次等待托盘信号");
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH)); 
+                }
+                else
+                {
+                    //未检测到信号或阻挡下降失败，结束处理
+                    LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
+                    MoveEndS();
+                }
+            }
+            else if (MoveInfo.IsStep(LineMoveStep.HY05_TrayCheck))
+            {
                 //判断是否需要横移托盘，或者取放料
                 //判断是否需要横移托盘，或者取放料
                 UpdateTrayNum();
                 UpdateTrayNum();
 
 

source/DeviceLibrary/model/KTK_Store.cs

@@ -30,7 +30,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// <summary>
         /// 托盘检测信号需要持续时间
         /// 托盘检测信号需要持续时间
         /// </summary>
         /// </summary>
-        protected static int TrayWaitTime = 500;
+        protected static int TrayWaitTime = 600;
         public KTK_Store()
         public KTK_Store()
         {
         {
         }
         }