From fe734d42ae97dc1666ca1f0aee24fded3d52ff0d Mon Sep 17 00:00:00 2001 From: lhiven Date: Thu, 13 Mar 2025 17:06:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81GRR=E6=A8=A1=E5=BC=8F=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E6=B5=8B=E8=AF=95=E4=BA=A7=E5=93=81=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=A4=A7=E4=BA=8E=E5=90=AF=E7=94=A8=E7=9A=84=E6=B2=BB?= =?UTF-8?q?=E5=85=B7=E6=95=B0=E5=8A=A01=E6=97=B6=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/FormMain.cs | 19 ++++++++++++++----- Rs.DeweyTester/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) 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")]