仓门口前阻挡托盘放行逻辑修改。

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -640,7 +640,7 @@ namespace OnlineStore.DeviceLibrary
             //  [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒
             if (moveInfo.MoveType.Equals(LineMoveType.Fixture) &&
                 (moveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down) ||
-                moveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck) ||
+                moveInfo.IsStep(LineMoveStep.MIO_02_TrayCheck) ||
                   moveInfo.IsStep(LineMoveStep.MO_17_Stop2Check)))
             {
                 return true;

source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs

@@ -164,7 +164,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.LOW) || IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                 {
-                    T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_01_TrayCheck);
+                    T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_02_TrayCheck);
                     T3C1_Log("托盘阻挡" + T3C1_MoveInfo.SLog + "   前阻挡上升，等待 阻挡托盘检测=1");
                     IOMove(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW);
                     T3C1_MoveInfo.OneWaitCanEndStep = true;
@@ -179,7 +179,7 @@ namespace OnlineStore.DeviceLibrary
                     T3C1_MoveInfo.EndMove();
                 }
             }
-            else if (T3C1_MoveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck))
+            else if (T3C1_MoveInfo.IsStep(LineMoveStep.MIO_02_TrayCheck))
             {
                 if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                 {

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -793,25 +793,21 @@ namespace OnlineStore.DeviceLibrary
             #region 托盘检测
             if (SecondMoveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down))
             {
-                if (IOValue(IO_Type.StopCheck1).Equals(IO_VALUE.LOW) || IOValue(IO_Type.StopCheck2).Equals(IO_VALUE.HIGH))
+                if (IOValue(IO_Type.StopCheck1).Equals(IO_VALUE.LOW))
                 {
-                    SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_TrayCheck);
-                    CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   阻挡气缸1-1上升，等待 阻挡2托盘检测=1）"); 
-                    SecondMoveInfo.OneWaitCanEndStep = true;
-                    IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
-                    IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
-                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
-                    //最多等待30秒
-                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
+                    SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_StopDownWait);
+                    CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   前阻挡检测消失后再等待300ms上升阻挡"); 
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
                 }
                 else 
                 { 
-                    //未检测到信号或阻挡下降失败，结束处理
-                    LogInfo(SecondMoveInfo.SLog + "未等到信号 StopCheck1=LOW，或 StopCheck2=HIGH，结束处理 ");
-                    SecondMoveInfo.EndMove();
+                    MIO_02_TrayCheck();
                 }
+            }else if (SecondMoveInfo.IsStep(LineMoveStep.MIO_01_StopDownWait))
+            {
+                MIO_02_TrayCheck(); 
             }
-            else if (SecondMoveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck))
+            else if (SecondMoveInfo.IsStep(LineMoveStep.MIO_02_TrayCheck))
             {
                 if (IOValue(IO_Type.StopCheck2).Equals(IO_VALUE.HIGH))
                 {
@@ -993,6 +989,28 @@ namespace OnlineStore.DeviceLibrary
             }
             #endregion
         }
+
+        private void MIO_02_TrayCheck()
+        {
+            if (IOValue(IO_Type.StopCheck1).Equals(IO_VALUE.LOW) || IOValue(IO_Type.StopCheck2).Equals(IO_VALUE.HIGH))
+            {
+                SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_02_TrayCheck);
+                CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   阻挡气缸1-1上升，等待 阻挡2托盘检测=1）");
+                SecondMoveInfo.OneWaitCanEndStep = true;
+                IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
+                IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
+                //最多等待30秒
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
+            }
+            else
+            {
+                //未检测到信号或阻挡下降失败，结束处理
+                LogInfo(SecondMoveInfo.SLog + "未等到信号 StopCheck1=LOW，或 StopCheck2=HIGH，结束处理 ");
+                SecondMoveInfo.EndMove();
+            }
+        }
+
         private void MO_16_Stop2Down()
         {
             if (LineManager.Line.Move5CanStop2Down(DeviceID))

source/DeviceLibrary/model/LineMoveInfo.cs

@@ -151,7 +151,7 @@ namespace OnlineStore.DeviceLibrary
         {
             StepMoveLog();
             this.moveType = LineMoveType.None;
-            this.MoveParam = null; 
+            this.MoveParam = new InOutParam(); 
             moveStep = LineMoveStep.Wait;
             LastSetpTime = DateTime.Now;
             IsInWait = false;

source/DeviceLibrary/model/StoreStep.cs

@@ -263,11 +263,17 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         [Description("托盘处理_前阻挡检测到托盘，前阻挡下降")]
         MIO_00_Stop1Down = 1180,
+
+        /// <summary>
+        ///移载（流水线）装置出入库处理，前阻挡检测消失后再等待300ms上升阻挡 
+        /// </summary>
+        [Description("托盘处理_前阻挡检测到托盘，前阻挡检测消失后再等待300ms上升阻挡")]
+        MIO_01_StopDownWait,
         /// <summary>
         ///移载（流水线）装置出入库处理，夹具检测1-4=1 
         /// </summary>
         [Description("托盘处理_等待托盘检测信号亮")]
-        MIO_01_TrayCheck,
+        MIO_02_TrayCheck,
         /// <summary>
         /// 移载（流水线）装置出入库处理，等待夹具持续500毫秒
         /// </summary>