diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs index 342d198..50b4327 100644 --- a/Rs.DeweyTester/FormMain.cs +++ b/Rs.DeweyTester/FormMain.cs @@ -47,11 +47,13 @@ namespace Rs.MotionPlat cboxMtcp.Enabled = true; if (cboxNoise.Enabled == false) cboxNoise.Enabled = true; - if(txtGrrProductNum.Enabled==false) - txtGrrProductNum.Enabled = true; - if(txtGrrTestNum.Enabled==false) - txtGrrTestNum.Enabled = true; - + if (cboxTestMode.SelectedItem != null && (cboxTestMode.SelectedItem.ToString() == "GRR" || cboxTestMode.SelectedItem.ToString() == "AUDIT")) + { + if (txtGrrProductNum.Enabled == false) + txtGrrProductNum.Enabled = true; + if (txtGrrTestNum.Enabled == false) + txtGrrTestNum.Enabled = true; + } } else { @@ -617,9 +619,13 @@ namespace Rs.MotionPlat { GlobalTray.GrrTray.ChangeStatus(i+1,ESlotStatus.Have); } + txtGrrProductNum.Enabled = true; + txtGrrTestNum.Enabled = true; } else { + txtGrrProductNum.Enabled = false; + txtGrrTestNum.Enabled = false; GlobalTray.GrrTray.ChangeStatus(ESlotStatus.NotHave); } } diff --git a/Rs.DeweyTester/FormMain.designer.cs b/Rs.DeweyTester/FormMain.designer.cs index 80c120a..0a1c42f 100644 --- a/Rs.DeweyTester/FormMain.designer.cs +++ b/Rs.DeweyTester/FormMain.designer.cs @@ -841,21 +841,21 @@ namespace Rs.MotionPlat // this.label9.AutoSize = true; this.label9.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label9.Location = new System.Drawing.Point(3, 56); + this.label9.Location = new System.Drawing.Point(-1, 56); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(59, 12); this.label9.TabIndex = 15; - this.label9.Text = "测试次数:"; + this.label9.Text = "test num:"; // // label8 // this.label8.AutoSize = true; this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label8.Location = new System.Drawing.Point(3, 34); + this.label8.Location = new System.Drawing.Point(-1, 34); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(59, 12); + this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 14; - this.label8.Text = "产品数量:"; + this.label8.Text = "grr count:"; // // txtGrrTestNum //