From 550cb6847bf4c8586bd5430b10ac9d25e8469f5a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 134 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 65 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index c7a3bc0..932351e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -96,13 +96,13 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.layWeight = new DevExpress.XtraLayout.LayoutControl();
- this.txtW1 = new DevExpress.XtraEditors.TextEdit();
- this.txtW2 = new DevExpress.XtraEditors.TextEdit();
- this.txtW3 = new DevExpress.XtraEditors.TextEdit();
- this.txtW4 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight3 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight4 = new DevExpress.XtraEditors.TextEdit();
this.btnW = new DevExpress.XtraEditors.SimpleButton();
this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
- this.txtW5 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight5 = new DevExpress.XtraEditors.TextEdit();
this.btnClean = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -249,12 +249,12 @@
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layWeight)).BeginInit();
this.layWeight.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight4.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
@@ -894,13 +894,13 @@
// layWeight
//
this.layWeight.BackColor = System.Drawing.Color.LightBlue;
- this.layWeight.Controls.Add(this.txtW1);
- this.layWeight.Controls.Add(this.txtW2);
- this.layWeight.Controls.Add(this.txtW3);
- this.layWeight.Controls.Add(this.txtW4);
+ this.layWeight.Controls.Add(this.txt_weight1);
+ this.layWeight.Controls.Add(this.txt_weight2);
+ this.layWeight.Controls.Add(this.txt_weight3);
+ this.layWeight.Controls.Add(this.txt_weight4);
this.layWeight.Controls.Add(this.btnW);
this.layWeight.Controls.Add(this.txtWCurrent);
- this.layWeight.Controls.Add(this.txtW5);
+ this.layWeight.Controls.Add(this.txt_weight5);
this.layWeight.Controls.Add(this.btnClean);
this.layWeight.Location = new System.Drawing.Point(10, 227);
this.layWeight.Margin = new System.Windows.Forms.Padding(0);
@@ -910,41 +910,41 @@
this.layWeight.TabIndex = 818;
this.layWeight.Text = "layoutControl1";
//
- // txtW1
+ // txt_weight1
//
- this.txtW1.Location = new System.Drawing.Point(52, 2);
- this.txtW1.Name = "txtW1";
- this.txtW1.Properties.ReadOnly = true;
- this.txtW1.Size = new System.Drawing.Size(76, 24);
- this.txtW1.StyleController = this.layWeight;
- this.txtW1.TabIndex = 4;
+ this.txt_weight1.Location = new System.Drawing.Point(52, 2);
+ this.txt_weight1.Name = "txt_weight1";
+ this.txt_weight1.Properties.ReadOnly = true;
+ this.txt_weight1.Size = new System.Drawing.Size(76, 24);
+ this.txt_weight1.StyleController = this.layWeight;
+ this.txt_weight1.TabIndex = 4;
//
- // txtW2
+ // txt_weight2
//
- this.txtW2.Location = new System.Drawing.Point(182, 2);
- this.txtW2.Name = "txtW2";
- this.txtW2.Properties.ReadOnly = true;
- this.txtW2.Size = new System.Drawing.Size(79, 24);
- this.txtW2.StyleController = this.layWeight;
- this.txtW2.TabIndex = 5;
+ this.txt_weight2.Location = new System.Drawing.Point(182, 2);
+ this.txt_weight2.Name = "txt_weight2";
+ this.txt_weight2.Properties.ReadOnly = true;
+ this.txt_weight2.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight2.StyleController = this.layWeight;
+ this.txt_weight2.TabIndex = 5;
//
- // txtW3
+ // txt_weight3
//
- this.txtW3.Location = new System.Drawing.Point(315, 2);
- this.txtW3.Name = "txtW3";
- this.txtW3.Properties.ReadOnly = true;
- this.txtW3.Size = new System.Drawing.Size(79, 24);
- this.txtW3.StyleController = this.layWeight;
- this.txtW3.TabIndex = 6;
+ this.txt_weight3.Location = new System.Drawing.Point(315, 2);
+ this.txt_weight3.Name = "txt_weight3";
+ this.txt_weight3.Properties.ReadOnly = true;
+ this.txt_weight3.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight3.StyleController = this.layWeight;
+ this.txt_weight3.TabIndex = 6;
//
- // txtW4
+ // txt_weight4
//
- this.txtW4.Location = new System.Drawing.Point(448, 2);
- this.txtW4.Name = "txtW4";
- this.txtW4.Properties.ReadOnly = true;
- this.txtW4.Size = new System.Drawing.Size(79, 24);
- this.txtW4.StyleController = this.layWeight;
- this.txtW4.TabIndex = 7;
+ this.txt_weight4.Location = new System.Drawing.Point(448, 2);
+ this.txt_weight4.Name = "txt_weight4";
+ this.txt_weight4.Properties.ReadOnly = true;
+ this.txt_weight4.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight4.StyleController = this.layWeight;
+ this.txt_weight4.TabIndex = 7;
//
// btnW
//
@@ -963,19 +963,23 @@
//
this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
this.txtWCurrent.Name = "txtWCurrent";
+ this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
+ this.txtWCurrent.Properties.Appearance.Options.UseBackColor = true;
+ this.txtWCurrent.Properties.Appearance.Options.UseForeColor = true;
this.txtWCurrent.Properties.ReadOnly = true;
this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
this.txtWCurrent.StyleController = this.layWeight;
this.txtWCurrent.TabIndex = 10;
//
- // txtW5
+ // txt_weight5
//
- this.txtW5.Location = new System.Drawing.Point(581, 2);
- this.txtW5.Name = "txtW5";
- this.txtW5.Properties.ReadOnly = true;
- this.txtW5.Size = new System.Drawing.Size(79, 24);
- this.txtW5.StyleController = this.layWeight;
- this.txtW5.TabIndex = 11;
+ this.txt_weight5.Location = new System.Drawing.Point(581, 2);
+ this.txt_weight5.Name = "txt_weight5";
+ this.txt_weight5.Properties.ReadOnly = true;
+ this.txt_weight5.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight5.StyleController = this.layWeight;
+ this.txt_weight5.TabIndex = 11;
//
// btnClean
//
@@ -1038,7 +1042,7 @@
//
// layoutControlItem31
//
- this.layoutControlItem31.Control = this.txtW1;
+ this.layoutControlItem31.Control = this.txt_weight1;
this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
@@ -1047,7 +1051,7 @@
//
// layoutControlItem32
//
- this.layoutControlItem32.Control = this.txtW2;
+ this.layoutControlItem32.Control = this.txt_weight2;
this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1057,7 +1061,7 @@
//
// layoutControlItem33
//
- this.layoutControlItem33.Control = this.txtW3;
+ this.layoutControlItem33.Control = this.txt_weight3;
this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1067,7 +1071,7 @@
//
// layoutControlItem34
//
- this.layoutControlItem34.Control = this.txtW4;
+ this.layoutControlItem34.Control = this.txt_weight4;
this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1099,7 +1103,7 @@
//
// layoutControlItem35
//
- this.layoutControlItem35.Control = this.txtW5;
+ this.layoutControlItem35.Control = this.txt_weight5;
this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
@@ -2471,12 +2475,12 @@
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layWeight)).EndInit();
this.layWeight.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight4.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
@@ -2735,10 +2739,10 @@
private DevExpress.XtraLayout.LayoutControl layWeight;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraEditors.TextEdit txtW1;
- private DevExpress.XtraEditors.TextEdit txtW2;
- private DevExpress.XtraEditors.TextEdit txtW3;
- private DevExpress.XtraEditors.TextEdit txtW4;
+ private DevExpress.XtraEditors.TextEdit txt_weight1;
+ private DevExpress.XtraEditors.TextEdit txt_weight2;
+ private DevExpress.XtraEditors.TextEdit txt_weight3;
+ private DevExpress.XtraEditors.TextEdit txt_weight4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
@@ -2748,7 +2752,7 @@
private DevExpress.XtraEditors.TextEdit txtWCurrent;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraEditors.TextEdit txtW5;
+ private DevExpress.XtraEditors.TextEdit txt_weight5;
private DevExpress.XtraEditors.SimpleButton btnClean;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
--
Gitblit v1.9.3