1.去掉halcon补充扫码功能。2.仓门口前阻挡托盘放行逻辑修改。

source/DeviceLibrary/assemblyLine/EquipBase.cs

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

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -903,18 +903,24 @@ namespace OnlineStore.DeviceLibrary
             #region 托盘检测
             if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_00_Stop1Down))
             {
-                SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_FixtureCheck);
-                CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   阻挡气缸1-1上升，等待 阻挡2托盘检测=1）");
 
-                if (DeviceID.Equals(5))
+               if(IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
                 {
-                    SecondMoveInfo.TimeOutSeconds = 20;
+                    MIO_02_FixtureCheck();
                 }
-                IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
-                IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
-                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
+                else
+                {
+                    SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_StopDownWait);
+                    CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   前阻挡检测消失后再等待300ms上升阻挡");
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); 
+                } 
+            }
+            else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_StopDownWait))
+            {
+                MIO_02_FixtureCheck();
             }
-            else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_FixtureCheck))
+            else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_02_FixtureCheck))
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
                 CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "  再次等待托盘信号");
@@ -1137,7 +1143,20 @@ namespace OnlineStore.DeviceLibrary
                 SecondMoveInfo.EndMove();
             }
             #endregion
-        }
+        } 
+        private void MIO_02_FixtureCheck()
+        {
+            SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_02_FixtureCheck);
+            CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   阻挡气缸1-1上升，等待 阻挡2托盘检测=1）");
+
+            if (DeviceID.Equals(5))
+            {
+                SecondMoveInfo.TimeOutSeconds = 20;
+            }
+            IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
+            IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
+            SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
+        } 
         private void MO_16_Stop2Down()
         {
             if (LineManager.Line.Move9CanStop2Down(DeviceID, currTrayNum))

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -180,7 +180,8 @@ namespace OnlineStore.DeviceLibrary
                                     }
                                     else
                                     {
-                                        cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, timeOut);
+                                        //去掉halcon补充扫码
+                                        //cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, timeOut);
                                     }
                                     foreach (CodeInfo c in cc)
                                     {

source/DeviceLibrary/model/LineMoveInfo.cs

@@ -199,7 +199,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

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