1

source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs

@@ -147,18 +147,18 @@ namespace OnlineStore.DeviceLibrary
 
                 if (Shunt_MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
-                    if (IOValue(IO_Type.Shunt_Check1_Front).Equals(IO_VALUE.HIGH))
+                    if (IOValue(IO_Type.Shunt_Check1_Front).Equals(IO_VALUE.HIGH)&& IOValue(IO_Type.Shunt_Check2_Middle).Equals(IO_VALUE.HIGH))
                     {
-                        if (TrayManager.checkWatch(ShuntCheck1Watch, 500, true))
+                        if (TrayManager.checkWatch(ShuntCheck1Watch, 400, true))
                         {
                             Shunt_MoveInfo.NewMove(LineMoveType.InStore);
                             Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt01_WaitTime);
                             UpateShuntTrayNum();
                             ShuntLog("分流横移：等待阻挡1亮，阻挡2亮，阻挡1上升，升降1下降   ");
-                            Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_Check1_Front, IO_VALUE.HIGH));
-                            Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_Check2_Middle, IO_VALUE.HIGH));
                             CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1,true);
                             CheckAndMove(IO_Type.Shunt_StopDown1_Front, IO_VALUE.LOW);
+                            Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_Check1_Front, IO_VALUE.HIGH));
+                            Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_Check2_Middle, IO_VALUE.HIGH));
                         }
                     }
                     else
@@ -211,8 +211,6 @@ namespace OnlineStore.DeviceLibrary
 
             if (Shunt_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt01_WaitTime))
             {
-                if (IOValue(IO_Type.Shunt_Check1_Front).Equals(IO_VALUE.HIGH))
-                {
                 string msg = "";
                 if (TrayNeedShunt(ShuntTrayNum, out msg))
                 {
@@ -233,15 +231,6 @@ namespace OnlineStore.DeviceLibrary
                     IOMove(IO_Type.Shunt_StopDown1_Front, IO_VALUE.HIGH, 1200);
                 } 
             }
-                else
-                {
-                    Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt01_WaitTime);
-                    Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_Check1_Front, IO_VALUE.HIGH));
-                    Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_Check2_Middle, IO_VALUE.HIGH));
-                    CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1, true);
-                    CheckAndMove(IO_Type.Shunt_StopDown1_Front, IO_VALUE.LOW);
-                }
-            }
             else if (Shunt_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt02_Stop1Down))
             {
                 Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt03_WaitCheck1Low);