From 3e53679b00e0e0979262f00729e2aae3349e1e8d Mon Sep 17 00:00:00 2001 From: lhiven Date: Mon, 28 Apr 2025 18:41:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=AE=9A=E6=8B=8D?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=97=B6=E6=B5=81=E7=A8=8B=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Flow/SubFlow/FixedGrabProductFlow.cs | 2 ++ Rs.DeweyTester/Properties/AssemblyInfo.cs | 2 +- Rs.DeweyTester/Vision/OneGrabOneVision.cs | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Rs.DeweyTester/Flow/SubFlow/FixedGrabProductFlow.cs b/Rs.DeweyTester/Flow/SubFlow/FixedGrabProductFlow.cs index 2885789..c1b8151 100644 --- a/Rs.DeweyTester/Flow/SubFlow/FixedGrabProductFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/FixedGrabProductFlow.cs @@ -150,6 +150,7 @@ namespace Rs.MotionPlat.Flow.SubFlow //VisionResult vResult = VisionHelper.Grab(EVisionScene.SingleScanBarcode); if ((result != null && result.Result == EOneGrabSixteenResult.Ok) || GlobalVar.RunSpace) { + LogHelper.Debug("result=ok"); finished = true; if (GlobalVar.RunSpace) { @@ -159,6 +160,7 @@ namespace Rs.MotionPlat.Flow.SubFlow } else { + LogHelper.Debug("result=ng"); if (curGrabNum <= 3) { step = EFixedGrabProductFlowStep.到拍照位上方; diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index efe2604..2bf7cdd 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("20.25.28.1")] + [assembly: AssemblyVersion("20.25.29.1")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Rs.DeweyTester/Vision/OneGrabOneVision.cs b/Rs.DeweyTester/Vision/OneGrabOneVision.cs index 8527ea0..face0f6 100644 --- a/Rs.DeweyTester/Vision/OneGrabOneVision.cs +++ b/Rs.DeweyTester/Vision/OneGrabOneVision.cs @@ -31,7 +31,8 @@ namespace Rs.MotionPlat.Vision { MessageQueue.Instance.Insert($">>> {data}"); } - else if (Regex.IsMatch( data,"C\\d{0,1},0"))// == "C,0") + //else if (Regex.IsMatch( data,"C\\d{0,1},0"))// == "C,0") + else if (data == "C,0" || data == "C2,0") { visionGrabEvent.Set(); MessageQueue.Instance.Insert($" >>> {data}");