1.20.24.18

修复排料流程卡住的问题

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)
             {

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();
                             }
                         }

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;
                                     }

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();

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")]