From 2f54c08cf76d2a4332bd6224fa7608101017cd5a Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Thu, 7 Nov 2024 08:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95NG=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=8C=89AAB=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=96=E6=94=BE=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Entitys/SimulateTesterManager.cs | 2 +-
 Rs.DeweyTester/Entitys/TestFixtureManager.cs    | 3 +--
 Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Rs.DeweyTester/Entitys/SimulateTesterManager.cs b/Rs.DeweyTester/Entitys/SimulateTesterManager.cs
index c5f4810..fbf1015 100644
--- a/Rs.DeweyTester/Entitys/SimulateTesterManager.cs
+++ b/Rs.DeweyTester/Entitys/SimulateTesterManager.cs
@@ -59,7 +59,7 @@ namespace Rs.MotionPlat.Entitys
         void CheckTest()
         {
             if (!_btest) return;
-            if (GlobalVar.SimulateTestTime > 0 && GlobalVar.SimulateTestYield > 0)
+            if (GlobalVar.SimulateTestTime > 0 && GlobalVar.SimulateTestYield >= 0)
             {
                 if (_start.ElapsedMilliseconds > GlobalVar.SimulateTestTime * 1000)
                 {
diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs
index 80edb90..36a8bbb 100644
--- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs
+++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs
@@ -622,11 +622,9 @@ namespace Rs.MotionPlat.Entitys
                         {
                             lock(this)
                             {
-                                Status = ETestFixtureStatus.IDLE;
                                 if (Product != null)
                                 {
                                     LogHelper.Debug($"治具{Index}测试完成，测试总数量由{TotalCount}增加到{TotalCount + 1}");
-                                    
                                     if (items[2] == "1")
                                     {
                                         Result = "PASS";
@@ -643,6 +641,7 @@ namespace Rs.MotionPlat.Entitys
                                     TotalCount++;
                                     Yield = (double)((double)PassCount / TotalCount);
                                     AddTestRecordToProduct();
+                                    Status = ETestFixtureStatus.IDLE;
                                     //this.Product.AddResult(this.Index, Result, items[6]);
                                 }
                                 string csvContent = string.Join(",", items[3], items[4], items[5]);
diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
index 330f3af..6f39e81 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
@@ -517,6 +517,7 @@ namespace Rs.MotionPlat.Flow
                                         needPlaceNozzle = GetPlaceNozzle(curFixture);
                                         if (needPlaceNozzle != null)
                                         {
+                                            MessageQueue.Instance.Insert($"{GetClassName()} 需要放料的吸嘴:{needPlaceNozzle.NozzleIndex}");
                                             flowStep = EDischargeFlowStep.治具取料;
                                             break;
                                         }
@@ -533,10 +534,12 @@ namespace Rs.MotionPlat.Flow
                                     }
                                     else
                                     {
+
                                         needPlaceNozzle=GetPlaceNozzle(curFixture);
                                         //needPlaceNozzle = NozzleManager.GetToTestNozzle();
                                         if (needPlaceNozzle != null)
                                         {
+                                            MessageQueue.Instance.Insert($"{GetClassName()} 治具中无产品,需要放料的吸嘴:{needPlaceNozzle.NozzleIndex}");
                                             flowStep = EDischargeFlowStep.治具放料;
                                             break;
                                         }