From a8ea8c08dfd1c811404b5bc093bd46ff020dd199 Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 30 Oct 2024 14:20:37 +0800 Subject: [PATCH] =?UTF-8?q?1.20.24.18=20=E4=BF=AE=E5=A4=8D=E6=8E=92?= =?UTF-8?q?=E6=96=99=E6=B5=81=E7=A8=8B=E5=8D=A1=E4=BD=8F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Data/DataRecords.cs | 1 + Rs.DeweyTester/Entitys/TestFixtureManager.cs | 4 ++-- Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs | 2 +- Rs.DeweyTester/Home.cs | 4 ++-- Rs.DeweyTester/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Rs.DeweyTester/Data/DataRecords.cs b/Rs.DeweyTester/Data/DataRecords.cs index 9ae3f43..d216d60 100644 --- a/Rs.DeweyTester/Data/DataRecords.cs +++ b/Rs.DeweyTester/Data/DataRecords.cs @@ -50,6 +50,7 @@ namespace Rs.MotionPlat.Data querySql += $" and SN='{txtSn.Text.Trim()}'"; } } + querySql += " order by id desc"; DataSet ds = Rs.MotionPlat.Commom.MySqlHelper.GetDataSet(querySql); if(ds!=null && ds.Tables.Count > 0) { diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs index 59da7ef..33a18df 100644 --- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs +++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs @@ -561,7 +561,7 @@ namespace Rs.MotionPlat.Entitys if(Status == ETestFixtureStatus.Testing ||(Status== ETestFixtureStatus.IDLE && Product!=null &&String.IsNullOrEmpty(Result))) { Send("Result$"); - LogHelper.Debug($"<<< TC{Index} Result$"); + LogHelper.Debug($"<<< TC{Index} Result$,Status={Status},Result={Result}"); if (CheckPrintLog()) { //lock (this) @@ -613,6 +613,7 @@ namespace Rs.MotionPlat.Entitys { lock(this) { + Status = ETestFixtureStatus.IDLE; if (Product != null) { LogHelper.Debug($"治具{Index}测试完成，测试总数量由{TotalCount}增加到{TotalCount + 1}"); @@ -638,7 +639,6 @@ namespace Rs.MotionPlat.Entitys string csvContent = string.Join(",", items[3], items[4], items[5]); LogHelper.Debug($"Result:{items[2]},{items[3]}"); DevLog.Summary(CsvTitle, csvContent); - Status = ETestFixtureStatus.IDLE; dataEvent.Set(); } } diff --git a/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs b/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs index 675b1c9..84a8c02 100644 --- a/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs @@ -224,7 +224,7 @@ namespace Rs.MotionPlat.Flow.SubFlow curNozzle.Product = curFixture.Product; if(GlobalVar.TestMode!="GRR" && GlobalVar.TestMode!="AUDIT") { - if (curFixture.Product.Result == "PASS" || curFixture.Product.TestNum == 3) + if (curFixture.Product.Result == "PASS" || curFixture.Product.TestNum >= 3) { curNozzle.Status = ENozzleStatus.ToUnload; } diff --git a/Rs.DeweyTester/Home.cs b/Rs.DeweyTester/Home.cs index 4013516..09b8a2d 100644 --- a/Rs.DeweyTester/Home.cs +++ b/Rs.DeweyTester/Home.cs @@ -420,8 +420,8 @@ namespace Rs.MotionPlat btnMain.Selected = true; } timer1.Enabled = true; - lblVersion.Text ="Version:"+System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); - + lblVersion.Text ="V:"+System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); + this.Text = this.Text + $" ({System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()})"; new HotKeyManager(Keys.G, 1, (o, arg) => { //VisionHelper.trayLocationVision.ClearQueue(); UpCameraHelper.Grab(); diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index 2a733b7..8ac45a7 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.17")] + [assembly: AssemblyVersion("1.20.24.18")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]