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