diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index d0cc74d..3d9865a 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -355,5 +355,16 @@ namespace Rs.Framework return SysConfigParam.GetValue(nameof(FlyGrabGain)); } } + + /// + /// 下相机飞拍重拍次数 + /// + public static int DownCameraFlyRegrabNum + { + get + { + return SysConfigParam.GetValue(nameof(DownCameraFlyRegrabNum)); + } + } } } diff --git a/Rs.SkyLine/Flow/WorkFlow.cs b/Rs.SkyLine/Flow/WorkFlow.cs index ecb3ed9..1c63e1a 100644 --- a/Rs.SkyLine/Flow/WorkFlow.cs +++ b/Rs.SkyLine/Flow/WorkFlow.cs @@ -112,6 +112,7 @@ namespace Rs.MotionPlat.Flow TraySlot downSlot = new TraySlot(); OffsetPoint turnoverOffsetPoint = new OffsetPoint(); int needGrabNum = 0;//需要拍照的吸嘴数量 + int reGrabCount = 0;//重拍次数 ErrorCode errCode = ErrorCode.Ok; public override void Run() { @@ -513,15 +514,25 @@ namespace Rs.MotionPlat.Flow ni++; } OnMatchResult?.Invoke(mrs); - DialogResult dr = Msg.ShowQuestion($"吸嘴{string.Join(",",errCodeList)}扫描失败,点击取消则不再扫码", System.Windows.Forms.MessageBoxButtons.RetryCancel); - if(dr== DialogResult.Cancel) + if(reGrabCount