From 2cf6d2fd3e71a910091c2f5dc88f4900843d3257 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Tue, 20 Aug 2024 13:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=B2=BB=E5=85=B7=E5=8F=91=E9=80=81?=
 =?UTF-8?q?1=EF=BC=8C=E5=85=B6=E4=BD=99=E6=B2=BB=E5=85=B7=E5=8F=91?=
 =?UTF-8?q?=E9=80=810?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/NormalFlow/DischargeFlow.cs          | 37 ++++++++++---------
 Rs.DeweyTester/FormMain.cs                    |  4 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
index aeb7e0e..cb66760 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
@@ -156,28 +156,29 @@ namespace Rs.MotionPlat.Flow
                             EButtonType button =Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, $"Please confim LOT info:{GlobalVar.LotName}\r\n ok click ok button \r\n error click Cancel button");
                             if(button== EButtonType.Ok)
                             {
+                                CreateCheckFixtureQueue(6);
+                                List<TestFixture> enableFixtureList = TestFixtureManager.Instance.GetEnableFixtureList();
+                                if (enableFixtureList.Count > 0)
+                                {
+                                    int i = 0;
+                                    foreach (var fix in enableFixtureList)
+                                    {
+                                        if (i == 0)
+                                            fix.IsFirstFixture = true;
+                                        else
+                                            fix.IsFirstFixture = false;
+                                        i++;
+                                    }
+                                }
+
                                 button = Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure clean data ?\r\n clean click OK\r\n no clean click Cancel");
                                 if(button== EButtonType.Ok)
                                 {
+                                    logInfo = GetClassName() + "选择了OK";
+                                    MessageQueue.Instance.Insert(logInfo);
                                     CleanDataEvent?.Invoke();
                                     //lastFixtureIndex = TestFixtureManager.Instance.GetEnableFixtureList().Select(f => f.Index).Min() - 1;
-                                    CreateCheckFixtureQueue(6);
-
-                                    if(checkFixtureList!=null && checkFixtureList.Count>0)
-                                    {
-                                        for(int i=0;i<checkFixtureList.Count;i++)
-                                        {
-                                            if(i==0)
-                                            {
-                                                TestFixtureManager.Instance.GetTestFixture(checkFixtureList[i]).IsFirstFixture = true;
-                                            }
-                                            else
-                                            {
-                                                TestFixtureManager.Instance.GetTestFixture(checkFixtureList[i]).IsFirstFixture = false;
-                                            }
-                                        }
-                                        
-                                    }
+                                   
                                     //lastFixtureIndex = checkFixtureList[0] - 1;
                                     TestFixtureManager.Instance.GetTestFixture(1).ClearData();
                                     TestFixtureManager.Instance.GetTestFixture(2).ClearData();
@@ -192,6 +193,8 @@ namespace Rs.MotionPlat.Flow
                                 }
                                 else if(button== EButtonType.Cancel)
                                 {
+                                    logInfo = GetClassName() + "选择了Cancel";
+                                    MessageQueue.Instance.Insert(logInfo);
                                     flowStep = EDischargeFlowStep.工作前准备;
                                 }
                                 
diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs
index 4299cf9..afeda26 100644
--- a/Rs.DeweyTester/FormMain.cs
+++ b/Rs.DeweyTester/FormMain.cs
@@ -668,8 +668,8 @@ namespace Rs.MotionPlat
 
         private void btnClearData_Click(object sender, EventArgs e)
         {
-            EButtonType btn =  Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure to clear data?");
-            if(btn== EButtonType.Ok)
+            //EButtonType btn =  Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure to clear data?");
+            //if(btn== EButtonType.Ok)
             {
                 TestFixtureManager.Instance.GetTestFixture(1).ClearData();
                 TestFixtureManager.Instance.GetTestFixture(2).ClearData();