1228

source/DeviceLibrary/doubleLine/DoubleLineBean_S1Shelf.cs

@@ -602,7 +602,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 //S1料架先到左侧
                 SOneMoveInfo.NextMoveStep(MoveStep.S1_41_S1ToLeft);
-                S1Log(" 右->S1切换 ，" + S1SName + " 先到左侧，4下降，3上升，S1反转");
+                S1Log(" 右->S1切换 ，" + S1SName + " 先到左侧，上料位前正阻挡下降，上料位前反阻挡上升，S1反转");
 
                 CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.HIGH);
                 CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.LOW);
@@ -616,7 +616,7 @@ namespace OnlineStore.DeviceLibrary
                 SOneMoveInfo.NextMoveStep(MoveStep.S1_42_WaitInLeft);
                 S1Log(" 右->S1切换 ，等待" + S1SName + " 完全进入左侧");
                 SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_NegStopCheck, IO_VALUE.HIGH));
-                SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_NegStopCheck, IO_VALUE.LOW));
+                //SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_NegStopCheck, IO_VALUE.LOW));
                 //     SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
             }
             else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_42_WaitInLeft))
@@ -642,7 +642,6 @@ namespace OnlineStore.DeviceLibrary
                 RFIDManager.ReadRFID(Config.S1_Rfid, true);
                 CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.LOW);
                 CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.HIGH);
-
                 S1BackRun();
                 //S2BackRun();
                 SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.LOW));