From 77f3775a659a7898ba589df3ffbaa4bb93fe03a9 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Fri, 18 Apr 2025 14:38:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=BD=93=E5=9C=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=B5=8B=E8=AF=95=E6=97=B6=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=BC=80=E7=85=A7=E6=98=8E=E7=81=AF=202=E3=80=81=E5=BD=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=A8=A1=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=B9=E6=B3=95=E6=97=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/FormMain.cs                | 44 +++++++++++++++--------
 Rs.DeweyTester/Properties/AssemblyInfo.cs |  2 +-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs
index 5cfe73f..843f06f 100644
--- a/Rs.DeweyTester/FormMain.cs
+++ b/Rs.DeweyTester/FormMain.cs
@@ -692,13 +692,20 @@ namespace Rs.MotionPlat
 
         private void cboxTestMethod_SelectedIndexChanged(object sender, EventArgs e)
         {
-            //SysConfigParam.Update("TestMethod", cboxTestMethod.SelectedItem.ToString());
+            if(cboxTestMethod.SelectedItem!=null)
+            {
+                SysConfigParam.Update("TestMethod", cboxTestMethod.SelectedItem.ToString());
+            }
         }
 
         private void cboxTestMode_SelectedIndexChanged(object sender, EventArgs e)
         {
+            if (cboxTestMode.SelectedItem != null)
+            {
+                SysConfigParam.Update("TestMode", cboxTestMode.SelectedItem.ToString());
+            }
             //SysConfigParam.Update("TestMode", cboxTestMode.SelectedItem.ToString());
-            if(cboxTestMode.SelectedItem!=null && (cboxTestMode.SelectedItem.ToString()=="GRR" || cboxTestMode.SelectedItem.ToString()=="AUDIT"))
+            if (cboxTestMode.SelectedItem!=null && (cboxTestMode.SelectedItem.ToString()=="GRR" || cboxTestMode.SelectedItem.ToString()=="AUDIT"))
             {
                 GlobalTray.GrrTray.ChangeStatus(ESlotStatus.NotHave);
                 for (int i=0;i<GlobalVar.GrrProductNum;i++)
@@ -707,12 +714,16 @@ namespace Rs.MotionPlat
                 }
                 txtGrrProductNum.Enabled = true;
                 txtGrrTestNum.Enabled = true;
+                //SysConfigParam.Update("LotName", txtLotName.Text.Trim());
+                //SysConfigParam.Update("TestMethod", cboxTestMethod.SelectedItem.ToString());
+                //SysConfigParam.Update("TestMode", cboxTestMode.SelectedItem.ToString());
             }
             else
             {
                 txtGrrProductNum.Enabled = false;
                 txtGrrTestNum.Enabled = false;
                 GlobalTray.GrrTray.ChangeStatus(ESlotStatus.NotHave);
+                
             }
         }
 
@@ -868,23 +879,26 @@ namespace Rs.MotionPlat
 
         private void timerLight_Tick(object sender, EventArgs e)
         {
-            if(MachineManage.Instance.MachineStatus== EMachineStatus.Working)
+            if(!GlobalVar.IsSimTest)
             {
-                if(btnLight.Visible)
-                {
-                    btnLight.Visible = false;
-                }
-                if (Ops.IsOutOn("照明灯"))
+                if (MachineManage.Instance.MachineStatus == EMachineStatus.Working)
                 {
-                    Ops.Off("照明灯");
-                    LogHelper.Debug("关闭照明灯");
+                    if (btnLight.Visible)
+                    {
+                        btnLight.Visible = false;
+                    }
+                    if (Ops.IsOutOn("照明灯"))
+                    {
+                        Ops.Off("照明灯");
+                        LogHelper.Debug("关闭照明灯");
+                    }
                 }
-            }
-            else
-            {
-                if (!btnLight.Visible)
+                else
                 {
-                    btnLight.Visible = true;
+                    if (!btnLight.Visible)
+                    {
+                        btnLight.Visible = true;
+                    }
                 }
             }
         }
diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs
index f142c28..1c1e6d1 100644
--- a/Rs.DeweyTester/Properties/AssemblyInfo.cs
+++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("20.25.23.2")]
+ [assembly: AssemblyVersion("20.25.24.1")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]