1

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -309,31 +309,35 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime))
             {
-                if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
+                //1秒以后在处理
+                if (MoveInfo.IsTimeOut(1))
                 {
-                    //更新托盘号
-                    UpdateTrayNum();
-
-                    //判断托盘是否需要横移，或进出料线
-                    MoveInfo.NextMoveStep(LineMoveStep.HY05_TrayCheck);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
-                    if (TrayNeedSL(currTrayNum))
+                    if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                     {
-                        MoveInfo.NextMoveStep(LineMoveStep.HY06_SL_TopUp);
-                        CheckLog("托盘阻挡" + MoveInfo.SLog + "  需要拦截托盘，顶升上升");
-                        CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
+                        //更新托盘号
+                        UpdateTrayNum();
+
+                        //判断托盘是否需要横移，或进出料线
+                        MoveInfo.NextMoveStep(LineMoveStep.HY05_TrayCheck);
+                        MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
+                        if (TrayNeedSL(currTrayNum))
+                        {
+                            MoveInfo.NextMoveStep(LineMoveStep.HY06_SL_TopUp);
+                            CheckLog("托盘阻挡" + MoveInfo.SLog + "  需要拦截托盘，顶升上升");
+                            CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
+                        }
+                        else
+                        {
+                            HY11_TopUpToHY();
+                        }
                     }
                     else
                     {
-                        HY11_TopUpToHY();
+                        //未检测到信号或阻挡下降失败，结束处理
+                        LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
+                        MoveEndS();
                     }
                 }
-                else
-                {
-                    //未检测到信号或阻挡下降失败，结束处理
-                    LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
-                    MoveEndS();
-                }
 
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY06_SL_TopUp))
@@ -546,8 +550,8 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY63_WaitTrayGo))
             {
                 MoveInfo.NextMoveStep(LineMoveStep.HY64_CheckWait);
-                CheckLog("托盘阻挡" + MoveInfo.SLog + "  等待托盘检测信号消失500");
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                CheckLog("托盘阻挡" + MoveInfo.SLog + "  等待托盘检测信号消失1500");
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1500));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY64_CheckWait))