diff --git a/Rs.DeweyTester/Commom/Ops.cs b/Rs.DeweyTester/Commom/Ops.cs index 3c14164..1afea2d 100644 --- a/Rs.DeweyTester/Commom/Ops.cs +++ b/Rs.DeweyTester/Commom/Ops.cs @@ -35,11 +35,14 @@ namespace Rs.MotionPlat.Commom InitDb(); SysConfigParam.Init(); int errNum = 0; - TestFixtureManager.Instance.StartLister(); - if (GlobalVar.IsSimTest) - { - SimulateTesterManager.Instance.Init(); - } + Task.Run(() => { + TestFixtureManager.Instance.StartLister(); + Thread.Sleep(500); + if (GlobalVar.IsSimTest) + { + SimulateTesterManager.Instance.Init(); + } + }); //Task.Run(() => { if (!GlobalVar.VirtualAxis) { @@ -86,13 +89,13 @@ namespace Rs.MotionPlat.Commom NozzleManager.Init(); TrayRunPointManager.Init(); TrayPointManager.LoadPoint(); - + MonitorSystemButton.Instance.Start(); DischargeFlow.Instance.Init(); GrrFlow.Instance.Init(); SysConfigParam.Update("EnableVirtuleBarCode", "False"); - + } static void InitDb() diff --git a/Rs.DeweyTester/Controls/UFixture.Designer.cs b/Rs.DeweyTester/Controls/UFixture.Designer.cs index 7a53e1e..cb16fb7 100644 --- a/Rs.DeweyTester/Controls/UFixture.Designer.cs +++ b/Rs.DeweyTester/Controls/UFixture.Designer.cs @@ -35,8 +35,6 @@ this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); @@ -47,8 +45,6 @@ this.lblStatus = new System.Windows.Forms.Label(); this.lblSN = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label(); - this.lblLotName = new System.Windows.Forms.Label(); - this.lblEnable = new System.Windows.Forms.Label(); this.lblLastCT = new System.Windows.Forms.Label(); this.lblPassCount = new System.Windows.Forms.Label(); this.lblTotalCount = new System.Windows.Forms.Label(); @@ -70,7 +66,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(304, 54); + this.panel1.Size = new System.Drawing.Size(304, 36); this.panel1.TabIndex = 0; // // lblFixtureName @@ -81,7 +77,7 @@ this.lblFixtureName.ForeColor = System.Drawing.Color.White; this.lblFixtureName.Location = new System.Drawing.Point(0, 0); this.lblFixtureName.Name = "lblFixtureName"; - this.lblFixtureName.Size = new System.Drawing.Size(302, 52); + this.lblFixtureName.Size = new System.Drawing.Size(302, 34); this.lblFixtureName.TabIndex = 1; this.lblFixtureName.Text = "title"; this.lblFixtureName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -96,44 +92,40 @@ this.tableLayoutPanel1.Controls.Add(this.label2, 1, 0); this.tableLayoutPanel1.Controls.Add(this.label3, 0, 1); this.tableLayoutPanel1.Controls.Add(this.label4, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.label5, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.label6, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.label7, 0, 5); - this.tableLayoutPanel1.Controls.Add(this.label8, 0, 6); - this.tableLayoutPanel1.Controls.Add(this.label9, 0, 7); - this.tableLayoutPanel1.Controls.Add(this.label10, 0, 8); - this.tableLayoutPanel1.Controls.Add(this.label11, 0, 9); - this.tableLayoutPanel1.Controls.Add(this.label12, 0, 10); - this.tableLayoutPanel1.Controls.Add(this.label13, 0, 11); - this.tableLayoutPanel1.Controls.Add(this.lblStatus, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.label7, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.label8, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.label9, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.label10, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.label11, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.label12, 0, 8); + this.tableLayoutPanel1.Controls.Add(this.label13, 0, 9); + this.tableLayoutPanel1.Controls.Add(this.lblStatus, 1, 3); this.tableLayoutPanel1.Controls.Add(this.lblSN, 1, 2); this.tableLayoutPanel1.Controls.Add(this.lblName, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.lblLotName, 1, 3); - this.tableLayoutPanel1.Controls.Add(this.lblEnable, 1, 4); - this.tableLayoutPanel1.Controls.Add(this.lblLastCT, 1, 6); - this.tableLayoutPanel1.Controls.Add(this.lblPassCount, 1, 7); - this.tableLayoutPanel1.Controls.Add(this.lblTotalCount, 1, 8); - this.tableLayoutPanel1.Controls.Add(this.lblYield, 1, 9); - this.tableLayoutPanel1.Controls.Add(this.lblResult, 1, 10); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 1, 11); + this.tableLayoutPanel1.Controls.Add(this.lblLastCT, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.lblPassCount, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.lblTotalCount, 1, 6); + this.tableLayoutPanel1.Controls.Add(this.lblYield, 1, 7); + this.tableLayoutPanel1.Controls.Add(this.lblResult, 1, 8); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 1, 9); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.ForeColor = System.Drawing.Color.White; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 54); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 36); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 12; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333333F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(304, 370); + this.tableLayoutPanel1.RowCount = 10; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(304, 388); this.tableLayoutPanel1.TabIndex = 1; // // label1 @@ -143,7 +135,7 @@ this.label1.ForeColor = System.Drawing.Color.IndianRed; this.label1.Location = new System.Drawing.Point(4, 1); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(84, 29); + this.label1.Size = new System.Drawing.Size(84, 37); this.label1.TabIndex = 0; this.label1.Text = "Header"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -155,7 +147,7 @@ this.label2.ForeColor = System.Drawing.Color.IndianRed; this.label2.Location = new System.Drawing.Point(95, 1); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(205, 29); + this.label2.Size = new System.Drawing.Size(205, 37); this.label2.TabIndex = 1; this.label2.Text = "Parameter"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -163,9 +155,9 @@ // label3 // this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Location = new System.Drawing.Point(4, 31); + this.label3.Location = new System.Drawing.Point(4, 39); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(84, 29); + this.label3.Size = new System.Drawing.Size(84, 37); this.label3.TabIndex = 2; this.label3.Text = "Name"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -173,39 +165,19 @@ // label4 // this.label4.Dock = System.Windows.Forms.DockStyle.Fill; - this.label4.Location = new System.Drawing.Point(4, 61); + this.label4.Location = new System.Drawing.Point(4, 77); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(84, 29); + this.label4.Size = new System.Drawing.Size(84, 37); this.label4.TabIndex = 2; this.label4.Text = "SN"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // label5 - // - this.label5.Dock = System.Windows.Forms.DockStyle.Fill; - this.label5.Location = new System.Drawing.Point(4, 91); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(84, 29); - this.label5.TabIndex = 2; - this.label5.Text = "Lot"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label6 - // - this.label6.Dock = System.Windows.Forms.DockStyle.Fill; - this.label6.Location = new System.Drawing.Point(4, 121); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(84, 29); - this.label6.TabIndex = 2; - this.label6.Text = "Enable"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // label7 // this.label7.Dock = System.Windows.Forms.DockStyle.Fill; - this.label7.Location = new System.Drawing.Point(4, 151); + this.label7.Location = new System.Drawing.Point(4, 115); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(84, 29); + this.label7.Size = new System.Drawing.Size(84, 37); this.label7.TabIndex = 2; this.label7.Text = "Status"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -213,9 +185,9 @@ // label8 // this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Location = new System.Drawing.Point(4, 181); + this.label8.Location = new System.Drawing.Point(4, 153); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(84, 29); + this.label8.Size = new System.Drawing.Size(84, 37); this.label8.TabIndex = 2; this.label8.Text = "LastCT"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -223,9 +195,9 @@ // label9 // this.label9.Dock = System.Windows.Forms.DockStyle.Fill; - this.label9.Location = new System.Drawing.Point(4, 211); + this.label9.Location = new System.Drawing.Point(4, 191); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(84, 29); + this.label9.Size = new System.Drawing.Size(84, 37); this.label9.TabIndex = 2; this.label9.Text = "Pass"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -233,9 +205,9 @@ // label10 // this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(4, 241); + this.label10.Location = new System.Drawing.Point(4, 229); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(84, 29); + this.label10.Size = new System.Drawing.Size(84, 37); this.label10.TabIndex = 2; this.label10.Text = "Total"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -243,9 +215,9 @@ // label11 // this.label11.Dock = System.Windows.Forms.DockStyle.Fill; - this.label11.Location = new System.Drawing.Point(4, 271); + this.label11.Location = new System.Drawing.Point(4, 267); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(84, 29); + this.label11.Size = new System.Drawing.Size(84, 37); this.label11.TabIndex = 2; this.label11.Text = "Yield"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -253,9 +225,9 @@ // label12 // this.label12.Dock = System.Windows.Forms.DockStyle.Fill; - this.label12.Location = new System.Drawing.Point(4, 301); + this.label12.Location = new System.Drawing.Point(4, 305); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(84, 29); + this.label12.Size = new System.Drawing.Size(84, 37); this.label12.TabIndex = 2; this.label12.Text = "Result"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -263,9 +235,9 @@ // label13 // this.label13.Dock = System.Windows.Forms.DockStyle.Fill; - this.label13.Location = new System.Drawing.Point(4, 331); + this.label13.Location = new System.Drawing.Point(4, 343); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(84, 38); + this.label13.Size = new System.Drawing.Size(84, 44); this.label13.TabIndex = 2; this.label13.Text = "Reset"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -274,10 +246,10 @@ // this.lblStatus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); this.lblStatus.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblStatus.Location = new System.Drawing.Point(92, 151); + this.lblStatus.Location = new System.Drawing.Point(92, 115); this.lblStatus.Margin = new System.Windows.Forms.Padding(0); this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(211, 29); + this.lblStatus.Size = new System.Drawing.Size(211, 37); this.lblStatus.TabIndex = 3; this.lblStatus.Text = "None"; this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -285,82 +257,64 @@ // lblSN // this.lblSN.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblSN.Location = new System.Drawing.Point(95, 61); + this.lblSN.Location = new System.Drawing.Point(95, 77); this.lblSN.Name = "lblSN"; - this.lblSN.Size = new System.Drawing.Size(205, 29); + this.lblSN.Size = new System.Drawing.Size(205, 37); this.lblSN.TabIndex = 4; this.lblSN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lblName // this.lblName.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblName.Location = new System.Drawing.Point(95, 31); + this.lblName.Location = new System.Drawing.Point(95, 39); this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(205, 29); + this.lblName.Size = new System.Drawing.Size(205, 37); this.lblName.TabIndex = 4; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // lblLotName - // - this.lblLotName.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblLotName.Location = new System.Drawing.Point(95, 91); - this.lblLotName.Name = "lblLotName"; - this.lblLotName.Size = new System.Drawing.Size(205, 29); - this.lblLotName.TabIndex = 4; - this.lblLotName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // lblEnable - // - this.lblEnable.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblEnable.Location = new System.Drawing.Point(95, 121); - this.lblEnable.Name = "lblEnable"; - this.lblEnable.Size = new System.Drawing.Size(205, 29); - this.lblEnable.TabIndex = 4; - this.lblEnable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // lblLastCT // this.lblLastCT.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblLastCT.Location = new System.Drawing.Point(95, 181); + this.lblLastCT.Location = new System.Drawing.Point(95, 153); this.lblLastCT.Name = "lblLastCT"; - this.lblLastCT.Size = new System.Drawing.Size(205, 29); + this.lblLastCT.Size = new System.Drawing.Size(205, 37); this.lblLastCT.TabIndex = 4; this.lblLastCT.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lblPassCount // this.lblPassCount.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblPassCount.Location = new System.Drawing.Point(95, 211); + this.lblPassCount.Location = new System.Drawing.Point(95, 191); this.lblPassCount.Name = "lblPassCount"; - this.lblPassCount.Size = new System.Drawing.Size(205, 29); + this.lblPassCount.Size = new System.Drawing.Size(205, 37); this.lblPassCount.TabIndex = 4; this.lblPassCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lblTotalCount // this.lblTotalCount.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblTotalCount.Location = new System.Drawing.Point(95, 241); + this.lblTotalCount.Location = new System.Drawing.Point(95, 229); this.lblTotalCount.Name = "lblTotalCount"; - this.lblTotalCount.Size = new System.Drawing.Size(205, 29); + this.lblTotalCount.Size = new System.Drawing.Size(205, 37); this.lblTotalCount.TabIndex = 4; this.lblTotalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lblYield // this.lblYield.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblYield.Location = new System.Drawing.Point(95, 271); + this.lblYield.Location = new System.Drawing.Point(95, 267); this.lblYield.Name = "lblYield"; - this.lblYield.Size = new System.Drawing.Size(205, 29); + this.lblYield.Size = new System.Drawing.Size(205, 37); this.lblYield.TabIndex = 4; this.lblYield.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lblResult // this.lblResult.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblResult.Location = new System.Drawing.Point(92, 301); + this.lblResult.Location = new System.Drawing.Point(92, 305); this.lblResult.Margin = new System.Windows.Forms.Padding(0); this.lblResult.Name = "lblResult"; - this.lblResult.Size = new System.Drawing.Size(211, 29); + this.lblResult.Size = new System.Drawing.Size(211, 37); this.lblResult.TabIndex = 4; this.lblResult.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -373,11 +327,11 @@ this.tableLayoutPanel2.Controls.Add(this.lblIndex, 2, 0); this.tableLayoutPanel2.Controls.Add(this.btnReset, 1, 0); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(95, 334); + this.tableLayoutPanel2.Location = new System.Drawing.Point(95, 346); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(205, 32); + this.tableLayoutPanel2.Size = new System.Drawing.Size(205, 38); this.tableLayoutPanel2.TabIndex = 5; // // lblIndex @@ -399,7 +353,7 @@ this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReset.Location = new System.Drawing.Point(44, 3); this.btnReset.Name = "btnReset"; - this.btnReset.Size = new System.Drawing.Size(117, 26); + this.btnReset.Size = new System.Drawing.Size(117, 32); this.btnReset.TabIndex = 2; this.btnReset.Text = "Reset"; this.btnReset.UseVisualStyleBackColor = false; @@ -431,8 +385,6 @@ private System.Windows.Forms.Label lblFixtureName; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label9; @@ -443,8 +395,6 @@ private System.Windows.Forms.Label lblStatus; private System.Windows.Forms.Label lblSN; private System.Windows.Forms.Label lblName; - private System.Windows.Forms.Label lblLotName; - private System.Windows.Forms.Label lblEnable; private System.Windows.Forms.Label lblLastCT; private System.Windows.Forms.Label lblPassCount; private System.Windows.Forms.Label lblTotalCount; diff --git a/Rs.DeweyTester/Controls/UFixture.cs b/Rs.DeweyTester/Controls/UFixture.cs index 0e0bdbb..08b73fc 100644 --- a/Rs.DeweyTester/Controls/UFixture.cs +++ b/Rs.DeweyTester/Controls/UFixture.cs @@ -188,15 +188,15 @@ namespace Rs.MotionPlat { lblName.Text = tf.MachineID; } - if(lblLotName.Text!= GlobalVar.LotName) - { - lblLotName.Text = GlobalVar.LotName; - } - if(lblEnable.Text!=tf.Enable.ToString()) - { - //this.lblFixtureName.Enabled = tf.Enable; - lblEnable.Text = tf.Enable.ToString(); - } + //if(lblLotName.Text!= GlobalVar.LotName) + //{ + // lblLotName.Text = GlobalVar.LotName; + //} + //if(lblEnable.Text!=tf.Enable.ToString()) + //{ + // //this.lblFixtureName.Enabled = tf.Enable; + // lblEnable.Text = tf.Enable.ToString(); + //} this.lblYield.Text = $"{(tf.Yield * 100).ToString("0.00")}%";