diff --git a/Rs.SkyLine/Flow/WorkFlow.cs b/Rs.SkyLine/Flow/WorkFlow.cs index 4fb52bc..1cac2f9 100644 --- a/Rs.SkyLine/Flow/WorkFlow.cs +++ b/Rs.SkyLine/Flow/WorkFlow.cs @@ -522,7 +522,7 @@ namespace Rs.MotionPlat.Flow break; case EWorkFlowStep.等待视觉处理结果: mrs = VisionProcess.Instance.MatchDownCam(imgs); - if (mrs != null && mrs.Count == imgs.Length && mrs.Where(m=>m.IsOK==true).Count()==imgs.Length) + if (mrs != null && mrs.Count == imgs.Length && (mrs.Where(m=>m.IsOK==true).Count()==imgs.Length || GlobalVar.DownCameraFlyRegrabNum==0)) { //foreach (Nozzle nozzle in NozzleManager.GetNozzles()) //{ @@ -535,6 +535,8 @@ namespace Rs.MotionPlat.Flow //File.AppendAllText("D://OFFSET.TXT",$"SN:{item.SN},X:{item.OffsetRow},Y:{item.OffsetCol},R:{AngleTool.Rad2Deg(item.Angle)}\r\n"); ni++; } + + //CameraOkEvent?.Invoke(imgs, mrs); OnMatchResult?.Invoke(mrs); //TestCenter.Instance.EndInput();