1

source/DeviceLibrary/doubleLine/DoubleLineBean_S1Shelf.cs

@@ -272,7 +272,7 @@ namespace OnlineStore.DeviceLibrary
 
 
                 S1Log(" 下层阻挡2(LLow_StopCylinder2)下降3秒， 链条转动，开始放大料架到左侧，阻挡1需要上升");
                 S1Log(" 下层阻挡2(LLow_StopCylinder2)下降3秒， 链条转动，开始放大料架到左侧，阻挡1需要上升");
                 SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2500));
                 SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2500));
-                IOMove(IO_Type.LLow_StopCylinder2, IO_VALUE.HIGH, 3000);
+                IOMove(IO_Type.LLow_StopCylinder2, IO_VALUE.HIGH, 3500);
                 IOMove(IO_Type.M_LeftStopCylinder, IO_VALUE.HIGH);
                 IOMove(IO_Type.M_LeftStopCylinder, IO_VALUE.HIGH);
                 IOMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH);
                 IOMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH);
 
 
@@ -307,31 +307,32 @@ namespace OnlineStore.DeviceLibrary
                 S1LineRun(SOneMoveInfo);
                 S1LineRun(SOneMoveInfo);
                 //IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
                 //IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
                 SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LeftStopCheck, IO_VALUE.LOW));
                 SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LeftStopCheck, IO_VALUE.LOW));
-
+                SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
             }
             }
             else if(SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C04_DToLeft_1))
             else if(SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C04_DToLeft_1))
             {
             {
-                if(IOValue(IO_Type.PreS1_PosStopCheck).Equals(IO_VALUE.HIGH))
+               // if(IOValue(IO_Type.PreS1_PosStopCheck).Equals(IO_VALUE.HIGH))
                 {
                 {
                     SOneMoveInfo.NextMoveStep(MoveStep.S1_C04_DToLeft);
                     SOneMoveInfo.NextMoveStep(MoveStep.S1_C04_DToLeft);
+                    AllLine.LeftLowLine.LineStop(Name, "放行大料架完成");
                     S1Log("放行料架完成");
                     S1Log("放行料架完成");
                 }
                 }
-                else
-                {
-                    if (SOneMoveInfo.IsTimeOut(30))
-                    {
-                        if (MUpdownCanMove())
-                        {
-                            SOneMoveInfo.NextMoveStep(MoveStep.S1_C02_MDown);
-                            S1Log("放料架超时30秒，重新放行");
-                            CylinderMove(SOneMoveInfo, IO_Type.M_Updown_Up, IO_Type.M_Updown_Down);
-                            CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
-                            CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
-                            CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
-                            // CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
-                        }
-                    }
-                }
+                //else
+                //{
+                //    if (SOneMoveInfo.IsTimeOut(30))
+                //    {
+                //        if (MUpdownCanMove())
+                //        {
+                //            SOneMoveInfo.NextMoveStep(MoveStep.S1_C02_MDown);
+                //            S1Log("放料架超时30秒，重新放行");
+                //            CylinderMove(SOneMoveInfo, IO_Type.M_Updown_Up, IO_Type.M_Updown_Down);
+                //            CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
+                //            CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
+                //            CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
+                //            // CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
+                //        }
+                //    }
+                //}
             }
             }
             else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C04_DToLeft))
             else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C04_DToLeft))
             {
             {