From 1f3e9f5d424b0f7eddd30d90eb27ba3045b1c48a Mon Sep 17 00:00:00 2001 From: lhiven Date: Tue, 25 Jun 2024 09:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8AGRR=E7=9A=84=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=94=BE=E5=88=B0=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/FormMain.cs | 33 ++- Rs.DeweyTester/FormMain.designer.cs | 140 ++++++++---- Rs.DeweyTester/FormMain.resx | 6 - .../SysConfig/CommonConfig.Designer.cs | 58 +---- Rs.DeweyTester/SysConfig/CommonConfig.resx | 216 ++++-------------- 5 files changed, 175 insertions(+), 278 deletions(-) diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs index 815faad..f72821d 100644 --- a/Rs.DeweyTester/FormMain.cs +++ b/Rs.DeweyTester/FormMain.cs @@ -47,6 +47,10 @@ 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; } else @@ -61,6 +65,10 @@ namespace Rs.MotionPlat cboxMtcp.Enabled = false; if(cboxNoise.Enabled) cboxNoise.Enabled = false; + if (txtGrrProductNum.Enabled) + txtGrrProductNum.Enabled = false; + if (txtGrrTestNum.Enabled) + txtGrrTestNum.Enabled = false; } //获取运行信息 while (MessageQueue.Instance.HaveMessage()) @@ -189,7 +197,7 @@ namespace Rs.MotionPlat //uTestCell6.BindEntity(TestFixtureManager.Instance.GetTestFixture(6)); - PositionHelper.BindSinglePosition(txtLotName,"string"); + //PositionHelper.BindSinglePosition(txtLotName,"string"); for(int i=1;i<=6;i++) { switch (i) @@ -256,6 +264,8 @@ namespace Rs.MotionPlat cboxNoise.Checked = GlobalVar.Noise; cboxTestMode.SelectedItem = GlobalVar.TestMode; cboxTestMethod.SelectedItem = GlobalVar.TestMethod; + txtGrrProductNum.Text = GlobalVar.GrrProductNum.ToString(); + txtGrrTestNum.Text = GlobalVar.GrrTestNum.ToString(); } private void btnWholeHome_Load(object sender, EventArgs e) @@ -587,7 +597,7 @@ namespace Rs.MotionPlat private void cboxTestMode_SelectedIndexChanged(object sender, EventArgs e) { SysConfigParam.Update("TestMode", cboxTestMode.SelectedItem.ToString()); - if(cboxTestMode.SelectedItem!=null && cboxTestMode.SelectedItem.ToString()=="GRR") + if(cboxTestMode.SelectedItem!=null && (cboxTestMode.SelectedItem.ToString()=="GRR" || cboxTestMode.SelectedItem.ToString()=="AUDIT")) { GlobalTray.GrrTray.ChangeStatus(ESlotStatus.NotHave); for (int i=0;i True - - True - - - True - 107, 17 diff --git a/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs b/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs index 5bfad6e..39d4a3d 100644 --- a/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs +++ b/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs @@ -56,13 +56,8 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.cboxMsgShowEn = new System.Windows.Forms.CheckBox(); this.cboxMsgShowCn = new System.Windows.Forms.CheckBox(); - this.txtGrrTestNum = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.txtGrrProductNum = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); this.txtSimulateTestYield = new System.Windows.Forms.TextBox(); this.txtSimulateTestTime = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); @@ -79,6 +74,7 @@ this.cboxEnableTC3 = new System.Windows.Forms.CheckBox(); this.cboxEnableTC2 = new System.Windows.Forms.CheckBox(); this.cboxEnableTC1 = new System.Windows.Forms.CheckBox(); + this.cboxDisableBuzzer = new System.Windows.Forms.CheckBox(); this.cboxCheckVisionSwOpened = new System.Windows.Forms.CheckBox(); this.cboxIsSimTest = new System.Windows.Forms.CheckBox(); this.cboxPrintTC6Communicate = new System.Windows.Forms.CheckBox(); @@ -112,7 +108,6 @@ this.txtControlCenterPort = new System.Windows.Forms.TextBox(); this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox(); this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox(); - this.cboxDisableBuzzer = new System.Windows.Forms.CheckBox(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox8.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -313,13 +308,8 @@ // this.groupBox1.Controls.Add(this.cboxMsgShowEn); this.groupBox1.Controls.Add(this.cboxMsgShowCn); - this.groupBox1.Controls.Add(this.txtGrrTestNum); - this.groupBox1.Controls.Add(this.label9); - this.groupBox1.Controls.Add(this.txtGrrProductNum); - this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.txtSimulateTestYield); this.groupBox1.Controls.Add(this.txtSimulateTestTime); - this.groupBox1.Controls.Add(this.label11); this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.label10); this.groupBox1.Controls.Add(this.label12); @@ -367,28 +357,6 @@ this.cboxMsgShowCn.Name = "cboxMsgShowCn"; this.cboxMsgShowCn.UseVisualStyleBackColor = true; // - // txtGrrTestNum - // - resources.ApplyResources(this.txtGrrTestNum, "txtGrrTestNum"); - this.txtGrrTestNum.Name = "txtGrrTestNum"; - this.txtGrrTestNum.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); - // - // label9 - // - resources.ApplyResources(this.label9, "label9"); - this.label9.Name = "label9"; - // - // txtGrrProductNum - // - resources.ApplyResources(this.txtGrrProductNum, "txtGrrProductNum"); - this.txtGrrProductNum.Name = "txtGrrProductNum"; - this.txtGrrProductNum.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); - // - // label8 - // - resources.ApplyResources(this.label8, "label8"); - this.label8.Name = "label8"; - // // txtSimulateTestYield // resources.ApplyResources(this.txtSimulateTestYield, "txtSimulateTestYield"); @@ -401,11 +369,6 @@ this.txtSimulateTestTime.Name = "txtSimulateTestTime"; this.txtSimulateTestTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); // - // label11 - // - resources.ApplyResources(this.label11, "label11"); - this.label11.Name = "label11"; - // // label13 // resources.ApplyResources(this.label13, "label13"); @@ -521,6 +484,13 @@ this.cboxEnableTC1.UseVisualStyleBackColor = true; this.cboxEnableTC1.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged); // + // cboxDisableBuzzer + // + resources.ApplyResources(this.cboxDisableBuzzer, "cboxDisableBuzzer"); + this.cboxDisableBuzzer.Name = "cboxDisableBuzzer"; + this.cboxDisableBuzzer.UseVisualStyleBackColor = true; + this.cboxDisableBuzzer.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged); + // // cboxCheckVisionSwOpened // resources.ApplyResources(this.cboxCheckVisionSwOpened, "cboxCheckVisionSwOpened"); @@ -758,13 +728,6 @@ this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera"; this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true; // - // cboxDisableBuzzer - // - resources.ApplyResources(this.cboxDisableBuzzer, "cboxDisableBuzzer"); - this.cboxDisableBuzzer.Name = "cboxDisableBuzzer"; - this.cboxDisableBuzzer.UseVisualStyleBackColor = true; - this.cboxDisableBuzzer.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged); - // // CommonConfig // resources.ApplyResources(this, "$this"); @@ -847,10 +810,6 @@ private System.Windows.Forms.CheckBox cboxEnableTC3; private System.Windows.Forms.CheckBox cboxEnableTC2; private System.Windows.Forms.CheckBox cboxEnableTC1; - private System.Windows.Forms.TextBox txtGrrTestNum; - private System.Windows.Forms.TextBox txtGrrProductNum; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label8; private System.Windows.Forms.CheckBox cboxIsSimTest; private System.Windows.Forms.CheckBox cboxPrintTC6Communicate; private System.Windows.Forms.CheckBox cboxPrintTC3Communicate; @@ -858,7 +817,6 @@ private System.Windows.Forms.CheckBox cboxPrintTC2Communicate; private System.Windows.Forms.CheckBox cboxPrintTC4Communicate; private System.Windows.Forms.CheckBox cboxPrintTC1Communicate; - private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label10; private System.Windows.Forms.CheckBox cboxCheckVisionSwOpened; private System.Windows.Forms.TextBox txtSimulateTestYield; diff --git a/Rs.DeweyTester/SysConfig/CommonConfig.resx b/Rs.DeweyTester/SysConfig/CommonConfig.resx index 9e93312..8f7b9d0 100644 --- a/Rs.DeweyTester/SysConfig/CommonConfig.resx +++ b/Rs.DeweyTester/SysConfig/CommonConfig.resx @@ -802,7 +802,7 @@ NoControl - 702, 329 + 705, 294 48, 16 @@ -835,7 +835,7 @@ NoControl - 638, 329 + 641, 294 48, 16 @@ -861,108 +861,6 @@ 1 - - 376, 325 - - - 51, 21 - - - 11 - - - txtGrrTestNum - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - True - - - NoControl - - - 298, 328 - - - 59, 12 - - - 10 - - - 测试次数: - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 3 - - - 227, 325 - - - 51, 21 - - - 11 - - - txtGrrProductNum - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 4 - - - True - - - NoControl - - - 149, 328 - - - 59, 12 - - - 10 - - - 产品数量: - - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 5 - 386, 142 @@ -982,7 +880,7 @@ groupBox1 - 6 + 2 386, 107 @@ -1003,37 +901,7 @@ groupBox1 - 7 - - - True - - - NoControl - - - 110, 328 - - - 29, 12 - - - 10 - - - GRR: - - - label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 8 + 3 True @@ -1063,7 +931,7 @@ groupBox1 - 9 + 4 True @@ -1072,7 +940,7 @@ NoControl - 561, 330 + 564, 295 59, 12 @@ -1096,7 +964,7 @@ groupBox1 - 10 + 5 True @@ -1126,7 +994,7 @@ groupBox1 - 11 + 6 True @@ -1156,7 +1024,7 @@ groupBox1 - 12 + 7 Bottom, Right @@ -1273,7 +1141,7 @@ groupBox1 - 13 + 8 False @@ -1300,7 +1168,7 @@ groupBox1 - 14 + 9 False @@ -1327,7 +1195,7 @@ groupBox1 - 15 + 10 True @@ -1357,7 +1225,7 @@ groupBox1 - 16 + 11 True @@ -1387,7 +1255,7 @@ groupBox1 - 17 + 12 True @@ -1417,7 +1285,7 @@ groupBox1 - 18 + 13 True @@ -1447,7 +1315,7 @@ groupBox1 - 19 + 14 True @@ -1477,7 +1345,7 @@ groupBox1 - 20 + 15 True @@ -1507,7 +1375,7 @@ groupBox1 - 21 + 16 True @@ -1537,7 +1405,7 @@ groupBox1 - 22 + 17 True @@ -1567,7 +1435,7 @@ groupBox1 - 23 + 18 True @@ -1597,7 +1465,7 @@ groupBox1 - 24 + 19 True @@ -1606,7 +1474,7 @@ NoControl - 448, 294 + 448, 312 90, 16 @@ -1627,7 +1495,7 @@ groupBox1 - 25 + 20 True @@ -1636,7 +1504,7 @@ NoControl - 448, 260 + 448, 278 90, 16 @@ -1657,7 +1525,7 @@ groupBox1 - 26 + 21 True @@ -1666,7 +1534,7 @@ NoControl - 299, 294 + 299, 312 90, 16 @@ -1687,7 +1555,7 @@ groupBox1 - 27 + 22 True @@ -1696,7 +1564,7 @@ NoControl - 299, 260 + 299, 278 90, 16 @@ -1717,7 +1585,7 @@ groupBox1 - 28 + 23 True @@ -1726,7 +1594,7 @@ NoControl - 153, 294 + 153, 312 90, 16 @@ -1747,7 +1615,7 @@ groupBox1 - 29 + 24 True @@ -1756,7 +1624,7 @@ NoControl - 153, 260 + 153, 278 90, 16 @@ -1777,7 +1645,7 @@ groupBox1 - 30 + 25 True @@ -1807,7 +1675,7 @@ groupBox1 - 31 + 26 False @@ -1834,7 +1702,7 @@ groupBox1 - 32 + 27 True @@ -1864,7 +1732,7 @@ groupBox1 - 33 + 28 True @@ -1894,7 +1762,7 @@ groupBox1 - 34 + 29 True @@ -1924,7 +1792,7 @@ groupBox1 - 35 + 30 True @@ -1954,7 +1822,7 @@ groupBox1 - 36 + 31 True @@ -1984,7 +1852,7 @@ groupBox1 - 37 + 32 True @@ -2014,7 +1882,7 @@ groupBox1 - 38 + 33 Fill @@ -2515,6 +2383,6 @@ CommonConfig - Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.1, Culture=neutral, PublicKeyToken=null + Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.2, Culture=neutral, PublicKeyToken=null \ No newline at end of file