diff --git a/Rs.DeweyTester/Controls/UFixture.cs b/Rs.DeweyTester/Controls/UFixture.cs index 54577de..0e0bdbb 100644 --- a/Rs.DeweyTester/Controls/UFixture.cs +++ b/Rs.DeweyTester/Controls/UFixture.cs @@ -127,7 +127,7 @@ namespace Rs.MotionPlat { if(!string.IsNullOrEmpty(tf.Product.Result) && lblResult.Text!=tf.Product.Result) { - if(tf.Product.Result=="true") + if(tf.Product.Result=="PASS") { lblResult.BackColor = Color.Green; } diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs index f323816..b00eaf1 100644 --- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs +++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs @@ -566,6 +566,7 @@ namespace Rs.MotionPlat.Entitys //{ // LogHelper.Info($">>> 治具{Index} StartTest"); //} + this.Result = ""; this.StartTestTime=DateTime.Now; this.Status= ETestFixtureStatus.Testing; dataEvent.Set(); @@ -580,12 +581,12 @@ namespace Rs.MotionPlat.Entitys if (items[2] == "1") { - Result = "true"; + Result = "PASS"; PassCount++; } else { - Result = "false"; + Result = "NG"; } this.Product.AddResult(this.Index, Result); } diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs index ca01f50..932c43b 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs @@ -510,7 +510,7 @@ namespace Rs.MotionPlat.Flow int placeNozzleIndex = placeNozzle.NozzleIndex; //placeNozzle.Product.Result //这里先方到OK料仓 - if(placeNozzle.Product.Result=="true") + if(placeNozzle.Product.Result=="PASS") { logInfo = GetClassName()+$"检查到吸嘴{placeNozzle.NozzleIndex}号吸嘴产品检测结果{placeNozzle.Product.Result}"; MessageQueue.Instance.Insert(logInfo); @@ -542,6 +542,7 @@ namespace Rs.MotionPlat.Flow { //提示更换料盘 Msgbox.ShowDialog(EButtonType.Ok, "NG料盘已满,请更换料盘,更换完成后点击确定"); + ThreePointLocationFlow.Instance.Location(ETrayType.Ng); GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave); } } @@ -717,7 +718,7 @@ namespace Rs.MotionPlat.Flow } break; case "AAB": - if(fixture.Product!=null && fixture.Product.TestNum==1 && fixture.Product.Result=="false") + if(fixture.Product!=null && fixture.Product.TestNum==1 && fixture.Product.Result=="NG") { return NozzleManager.GetIdelNozzle(); } diff --git a/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs b/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs index fc932a8..89e0892 100644 --- a/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs @@ -211,7 +211,7 @@ namespace Rs.MotionPlat.Flow.SubFlow logInfo = $"{GetClassName()}治具{curFixture.Index}中产品SN:{curFixture.Product.SN}被吸嘴{curNozzle.NozzleIndex}取出"; MessageQueue.Instance.Insert(logInfo); curNozzle.Product = curFixture.Product; - if (curFixture.Product.Result == "true" || curFixture.Product.TestNum == 3) + if (curFixture.Product.Result == "PASS" || curFixture.Product.TestNum == 3) { curNozzle.Status = ENozzleStatus.ToUnload; }