diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs index 5b1180d..cfe5770 100644 --- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs +++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs @@ -295,6 +295,10 @@ namespace Rs.MotionPlat.Entitys } } /// + /// 是否是第一个启用的治具 + /// + public bool IsFirstFixture { get; set; } = false; + /// /// CSV文件标题 /// public string CsvTitle { get; set; } @@ -435,12 +439,13 @@ namespace Rs.MotionPlat.Entitys VisionHelper.sideCameraVision.ClearQueue(this.Index); int noise = GlobalVar.Noise ? 1 : 0; int mtcp=GlobalVar.Mtcp ? 1 : 0; + int isFirstFixture = IsFirstFixture ? 1 : 0; string msg = string.Empty; if(string.IsNullOrEmpty(sn)) { //StartTest#SN#Machine#User#Config#Lot#Mode#SiteID#ProjectID#RetryMode#Mes#Mtcp#configD#DualMode#TakeIndex#SubLotName$ //msg = $"StartTest#{Product.SN}#MS001#OP#DXD#GRR_GRR_DXD_202203120320#Production#LF1#MOS#T1#0#0#Paint#0#R1C5#SP0012#1$"; - msg = $"StartTest#{Product.SN}#{GlobalVar.MachineID}#op#{GlobalVar.ConfigName}#{GlobalVar.LotName}#{GlobalVar.TestMode}#{GlobalVar.SiteID}#{GlobalVar.ProjectID}#T1#0#{mtcp}#{GlobalVar.Config}#0#{Product.From}#{GlobalVar.SubLotName}#{noise}$"; + msg = $"StartTest#{Product.SN}#{GlobalVar.MachineID}#op#{GlobalVar.ConfigName}#{GlobalVar.LotName}#{GlobalVar.TestMode}#{GlobalVar.SiteID}#{GlobalVar.ProjectID}#T1#0#{mtcp}#{GlobalVar.Config}#0#{Product.From}#{GlobalVar.SubLotName}#{noise}#{isFirstFixture}$"; } else { diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs index cb184a0..57717bc 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs @@ -160,6 +160,10 @@ namespace Rs.MotionPlat.Flow { //lastFixtureIndex = TestFixtureManager.Instance.GetEnableFixtureList().Select(f => f.Index).Min() - 1; CreateCheckFixtureQueue(6); + if(checkFixtureList!=null && checkFixtureList.Count>0) + { + TestFixtureManager.Instance.GetTestFixture(checkFixtureList[0]).IsFirstFixture = true; + } //lastFixtureIndex = checkFixtureList[0] - 1; TestFixtureManager.Instance.GetTestFixture(1).ClearData(); TestFixtureManager.Instance.GetTestFixture(2).ClearData();