From bd21b8b1f4a84861ed8fd43c0488e4623de85ade Mon Sep 17 00:00:00 2001 From: lhiven Date: Sun, 7 Jan 2024 16:27:37 +0900 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=AB=98=E5=B7=AE=E5=80=BC=E6=94=B9?= =?UTF-8?q?=E4=B8=BA0.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/SubFlow/LaserFlow.cs | 4 ++-- Rs.SkyLine/TestFrm.cs | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs b/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs index ce2c564..879219f 100644 --- a/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs +++ b/Rs.SkyLine/Flow/SubFlow/LaserFlow.cs @@ -209,11 +209,11 @@ namespace Rs.MotionPlat.Flow.SubFlow { if (trayType == ETrayType.Test) { - HasProduct = Math.Abs(Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TestFixtureTrayOffsetHeight)>0.4; + HasProduct = Math.Abs(Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TestFixtureTrayOffsetHeight)>0.6; } else if (trayType == ETrayType.Turnover) { - HasProduct = Math.Abs((Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TurnoverTrayOffsetHeight))>0.4; + HasProduct = Math.Abs((Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TurnoverTrayOffsetHeight))>0.6; } } } diff --git a/Rs.SkyLine/TestFrm.cs b/Rs.SkyLine/TestFrm.cs index b66ee69..d6db3af 100644 --- a/Rs.SkyLine/TestFrm.cs +++ b/Rs.SkyLine/TestFrm.cs @@ -1,4 +1,5 @@ -using Rs.MotionPlat.Commom; +using Rs.Framework; +using Rs.MotionPlat.Commom; using Rs.MotionPlat.Entitys; using Rs.MotionPlat.Flow; using Rs.MotionPlat.Flow.NgFlow; @@ -213,7 +214,11 @@ namespace Rs.MotionPlat private void button24_Click(object sender, EventArgs e) { - TestHeightResult thr = LaserFlow.Instance.HasProduct(ETrayType.Test, 2); + TestHeightResult thr = LaserFlow.Instance.HasProduct(ETrayType.Test,5); + if (thr.HasProduct) + Msg.ShowInfo("有产品"); + else + Msg.ShowInfo("无产品"); } } }