修正料盘NG后 下一盘扫码排到旋转臂的问题

DeviceLibrary/AutoScanAndLabel/MainMachine _MiddleProcess.cs

@@ -261,12 +261,7 @@ namespace DeviceLibrary
                     }
                     }
                     break;
                     break;
                 case MoveStep.M20_1_ToNgBox:
                 case MoveStep.M20_1_ToNgBox:
-                    //检查是否在拍照，避免干涉 R06_GettedReelInfo
-                    if(RightMoveInfo.IsStep(MoveStep.R06_GettedReelInfo))
-                    {
-                        MiddleMoveInfo.log("等待右侧拍照完成，避免干涉");
-                        return;
-                    }
+
                     MiddleMoveInfo.NextMoveStep(MoveStep.M21);
                     MiddleMoveInfo.NextMoveStep(MoveStep.M21);
                     Take_Middle_Axis.AbsMove(MiddleMoveInfo, Config.Take_Middle_P5, Config.Take_Middle_P5_speed);
                     Take_Middle_Axis.AbsMove(MiddleMoveInfo, Config.Take_Middle_P5, Config.Take_Middle_P5_speed);
                     MiddleMoveInfo.log("旋转轴转到P5 NG位置");
                     MiddleMoveInfo.log("旋转轴转到P5 NG位置");
@@ -292,6 +287,12 @@ namespace DeviceLibrary
                     Msg.add(crc.GetString("Res0050", "等待夹爪放松"), MsgLevel.info);
                     Msg.add(crc.GetString("Res0050", "等待夹爪放松"), MsgLevel.info);
                     break;
                     break;
                 case MoveStep.M23:
                 case MoveStep.M23:
+                    //检查是否在拍照，避免干涉 R06_GettedReelInfo
+                    if (RightMoveInfo.IsStep(MoveStep.R06_GettedReelInfo))
+                    {
+                        MiddleMoveInfo.log("等待右侧拍照完成，避免干涉");
+                        return;
+                    }
                     MiddleMoveInfo.NextMoveStep(MoveStep.M_ReturnToP1);
                     MiddleMoveInfo.NextMoveStep(MoveStep.M_ReturnToP1);
                     Take_UpDown_Axis.AbsMove(MiddleMoveInfo, Config.Take_UpDown_P2, Config.Take_UpDown_P5_speed);
                     Take_UpDown_Axis.AbsMove(MiddleMoveInfo, Config.Take_UpDown_P2, Config.Take_UpDown_P5_speed);
                     MiddleMoveInfo.log("上下轴转到P2 位置");
                     MiddleMoveInfo.log("上下轴转到P2 位置");

DeviceLibrary/AutoScanAndLabel/MainMachine _RightProcess.cs

@@ -76,7 +76,8 @@ namespace DeviceLibrary
                         {
                         {
 
 
                         }
                         }
-                        else if ((MiddleMoveInfo.MoveStep >= MoveStep.M09) || MiddleMoveInfo.MoveStep < MoveStep.M02)
+                        else if (MiddleMoveInfo.MoveStep >= MoveStep.M09 && MiddleMoveInfo.MoveStep< MoveStep.M20_ToNgBox
+                            || MiddleMoveInfo.MoveStep < MoveStep.M02 || MiddleMoveInfo.MoveStep > MoveStep.M21) 
                         {
                         {
                             RightMoveInfo.NextMoveStep(MoveStep.R06_GettedReelInfo);
                             RightMoveInfo.NextMoveStep(MoveStep.R06_GettedReelInfo);
                             ScanCode();
                             ScanCode();