From 498eeaca4d7180096a8bd57dde5ec09cea93223d Mon Sep 17 00:00:00 2001 From: lhiven Date: Thu, 12 Dec 2024 16:02:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=89=88=E6=9C=AC=E5=8F=B7:1.20.24.3?= =?UTF-8?q?0=202=E3=80=81=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=9A=E5=90=91summary=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=A4=9A=E5=86=99=E5=85=A5=E4=B8=80=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Entitys/TestFixtureManager.cs | 3 ++- Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs | 4 ++-- Rs.DeweyTester/Properties/AssemblyInfo.cs | 2 +- Rs.DeweyTester/TestFrm.cs | 12 +----------- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs index 36a8bbb..18d3b44 100644 --- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs +++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs @@ -439,7 +439,7 @@ namespace Rs.MotionPlat.Entitys /// /// 通知治具启动测试 /// - public void StartTest(string sn="") + public void StartTest(TestProduct _product, string sn = "") { while (true) { @@ -452,6 +452,7 @@ namespace Rs.MotionPlat.Entitys Thread.Sleep(100); } } + Product=_product; //先把侧相机数据清空 if(!GlobalVar.IsSimTest) { diff --git a/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs b/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs index 19a0dbf..907d0a8 100644 --- a/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs @@ -252,8 +252,8 @@ namespace Rs.MotionPlat.Flow.SubFlow { logInfo = $"{GetClassName()} 治具{curFixture.Index}放料完成后抬起,吸嘴{curNozzle.NozzleIndex}把产品SN: {curNozzle.Product.SN} 放入治具{curFixture.Index}"; MessageQueue.Instance.Insert(logInfo); - curFixture.Product = curNozzle.Product; - curFixture.StartTest(); + //curFixture.Product = curNozzle.Product; + curFixture.StartTest(curNozzle.Product); curNozzle.Clear(); finished = true; flowStep = EFixturePlaceFlowStep.待触发; diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index 368cdb1..e13b478 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("1.20.24.29")] + [assembly: AssemblyVersion("1.20.24.30")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Rs.DeweyTester/TestFrm.cs b/Rs.DeweyTester/TestFrm.cs index b1566d2..da33ced 100644 --- a/Rs.DeweyTester/TestFrm.cs +++ b/Rs.DeweyTester/TestFrm.cs @@ -79,16 +79,6 @@ namespace Rs.MotionPlat } - private void button18_Click(object sender, EventArgs e) - { - Task.Run(() => { - TestFixtureManager.Instance.GetTestFixture(1).StartTest(); - }); - - } - - - private void button22_Click(object sender, EventArgs e) { AxisControl.LoadY2.ComparePulse(1, false); @@ -215,7 +205,7 @@ namespace Rs.MotionPlat private void button11_Click(object sender, EventArgs e) { int.TryParse(this.comboBox1.SelectedItem.ToString(), out int fixtureIndex); - TestFixtureManager.Instance.GetTestFixture(fixtureIndex).StartTest(this.textBox1.Text); + TestFixtureManager.Instance.GetTestFixture(fixtureIndex).StartTest(null,this.textBox1.Text); } private void button13_Click(object sender, EventArgs e)