diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs
index ce5476f..e5dd448 100644
--- a/Rs.DeweyTester/FormMain.cs
+++ b/Rs.DeweyTester/FormMain.cs
@@ -790,12 +790,21 @@ namespace Rs.MotionPlat
             SysConfigParam.Update("TestMode", cboxTestMode.SelectedItem.ToString());
             if (cboxTestMode.SelectedItem != null && (cboxTestMode.SelectedItem.ToString() == "GRR" || cboxTestMode.SelectedItem.ToString() == "AUDIT"))
             {
-                SysConfigParam.Update("GrrProductNum", txtGrrProductNum.Text);
-                SysConfigParam.Update("GrrTestNum", txtGrrTestNum.Text);
-                GlobalTray.GrrTray.ChangeStatus(ESlotStatus.NotHave);
-                for (int i = 0; i < GlobalVar.GrrProductNum; i++)
+                int.TryParse(txtGrrProductNum.Text, out int productNum);
+                if(productNum>TestFixtureManager.Instance.GetEnableFixtureList().Count+1 && cboxTestMode.SelectedItem.ToString() == "GRR")
+                {
+                    Msg.ShowError("1. The number of products can be less than that of the fixtures.\r\n2. The number of products is equal to that of the fixtures.\r\n3. The number of products is 1 more than that of the fixtures.");
+                    return;
+                }
+                else
                 {
-                    GlobalTray.GrrTray.ChangeStatus(i + 1, ESlotStatus.Have);
+                    SysConfigParam.Update("GrrProductNum", txtGrrProductNum.Text);
+                    SysConfigParam.Update("GrrTestNum", txtGrrTestNum.Text);
+                    GlobalTray.GrrTray.ChangeStatus(ESlotStatus.NotHave);
+                    for (int i = 0; i < GlobalVar.GrrProductNum; i++)
+                    {
+                        GlobalTray.GrrTray.ChangeStatus(i + 1, ESlotStatus.Have);
+                    }
                 }
             }
             SysConfigParam.Update("Mtcp", cboxMtcp.Checked.ToString());
diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs
index 6849adf..2e17e09 100644
--- a/Rs.DeweyTester/Properties/AssemblyInfo.cs
+++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("1.20.25.12")]
+ [assembly: AssemblyVersion("1.20.25.13")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]