From b6a8042efef7d95b39b9e985a7f5c47b2a90c4a0 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Thu, 1 Aug 2024 13:11:12 +0800
Subject: [PATCH] =?UTF-8?q?StartTest=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=A1=B9?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E7=9A=84=E6=B2=BB=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Entitys/TestFixtureManager.cs    | 7 ++++++-
 Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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
             }
         }
         /// <summary>
+        /// 是否是第一个启用的治具
+        /// </summary>
+        public bool IsFirstFixture { get; set; } = false;
+        /// <summary>
         /// CSV文件标题
         /// </summary>
         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();