From 08137bae48bd5fd6e447815c05e7c2d886cfd032 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 07 十一月 2025 08:39:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs |  278 +++++++++++++++++++++++++++---------------------------
 1 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 4f38be2..fd192a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -31,36 +31,36 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -98,7 +98,7 @@
             this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
             this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
             this.txt_qt008 = new Gs.DevApp.UserControl.UcLookCk();
-            this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt016Name = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt018 = new Gs.DevApp.UserControl.UcLookSupplier();
             this.txt_qt022 = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
@@ -108,10 +108,10 @@
             this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
             this.txt_qt005 = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt001 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt030Name = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt029 = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt028 = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_qt034 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt034Name = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
             this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
@@ -241,17 +241,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt001.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030Name.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
@@ -723,7 +723,7 @@
             this.layoutMx1.Controls.Add(this.txt_qt010);
             this.layoutMx1.Controls.Add(this.ucLookHuoZhu1);
             this.layoutMx1.Controls.Add(this.txt_qt008);
-            this.layoutMx1.Controls.Add(this.txt_qt016);
+            this.layoutMx1.Controls.Add(this.txt_qt016Name);
             this.layoutMx1.Controls.Add(this.txt_qt018);
             this.layoutMx1.Controls.Add(this.txt_qt022);
             this.layoutMx1.Controls.Add(this.txt_qt009);
@@ -733,10 +733,10 @@
             this.layoutMx1.Controls.Add(this.txt_qt015);
             this.layoutMx1.Controls.Add(this.txt_qt005);
             this.layoutMx1.Controls.Add(this.txt_qt001);
-            this.layoutMx1.Controls.Add(this.txt_qt030);
+            this.layoutMx1.Controls.Add(this.txt_qt030Name);
             this.layoutMx1.Controls.Add(this.txt_qt029);
             this.layoutMx1.Controls.Add(this.txt_qt028);
-            this.layoutMx1.Controls.Add(this.txt_qt034);
+            this.layoutMx1.Controls.Add(this.txt_qt034Name);
             this.layoutMx1.Controls.Add(this.txt_qt033);
             this.layoutMx1.Controls.Add(this.txt_qt032);
             this.layoutMx1.Controls.Add(this.txt_qt035);
@@ -828,16 +828,16 @@
             this.txt_qt008.Size = new System.Drawing.Size(287, 28);
             this.txt_qt008.TabIndex = 301;
             // 
-            // txt_qt016
+            // txt_qt016Name
             // 
-            this.txt_qt016.Location = new System.Drawing.Point(954, 89);
-            this.txt_qt016.Margin = new System.Windows.Forms.Padding(4);
-            this.txt_qt016.Name = "txt_qt016";
-            this.txt_qt016.Properties.Appearance.Options.UseFont = true;
-            this.txt_qt016.Size = new System.Drawing.Size(287, 28);
-            this.txt_qt016.StyleController = this.layoutMx1;
-            this.txt_qt016.TabIndex = 267;
-            this.txt_qt016.Tag = "readonly";
+            this.txt_qt016Name.Location = new System.Drawing.Point(954, 89);
+            this.txt_qt016Name.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_qt016Name.Name = "txt_qt016Name";
+            this.txt_qt016Name.Properties.Appearance.Options.UseFont = true;
+            this.txt_qt016Name.Size = new System.Drawing.Size(287, 28);
+            this.txt_qt016Name.StyleController = this.layoutMx1;
+            this.txt_qt016Name.TabIndex = 267;
+            this.txt_qt016Name.Tag = "readonly";
             // 
             // txt_qt018
             // 
@@ -937,15 +937,15 @@
             this.txt_qt001.TabIndex = 332;
             this.txt_qt001.Tag = "readonly";
             // 
-            // txt_qt030
+            // txt_qt030Name
             // 
-            this.txt_qt030.Location = new System.Drawing.Point(1365, 128);
-            this.txt_qt030.Margin = new System.Windows.Forms.Padding(4);
-            this.txt_qt030.Name = "txt_qt030";
-            this.txt_qt030.Size = new System.Drawing.Size(289, 28);
-            this.txt_qt030.StyleController = this.layoutMx1;
-            this.txt_qt030.TabIndex = 334;
-            this.txt_qt030.Tag = "readonly";
+            this.txt_qt030Name.Location = new System.Drawing.Point(1365, 128);
+            this.txt_qt030Name.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_qt030Name.Name = "txt_qt030Name";
+            this.txt_qt030Name.Size = new System.Drawing.Size(289, 28);
+            this.txt_qt030Name.StyleController = this.layoutMx1;
+            this.txt_qt030Name.TabIndex = 334;
+            this.txt_qt030Name.Tag = "readonly";
             // 
             // txt_qt029
             // 
@@ -968,15 +968,15 @@
             this.txt_qt028.TabIndex = 336;
             this.txt_qt028.Tag = "readonly";
             // 
-            // txt_qt034
+            // txt_qt034Name
             // 
-            this.txt_qt034.Location = new System.Drawing.Point(1365, 12);
-            this.txt_qt034.Margin = new System.Windows.Forms.Padding(4);
-            this.txt_qt034.Name = "txt_qt034";
-            this.txt_qt034.Size = new System.Drawing.Size(289, 28);
-            this.txt_qt034.StyleController = this.layoutMx1;
-            this.txt_qt034.TabIndex = 337;
-            this.txt_qt034.Tag = "readonly";
+            this.txt_qt034Name.Location = new System.Drawing.Point(1365, 12);
+            this.txt_qt034Name.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_qt034Name.Name = "txt_qt034Name";
+            this.txt_qt034Name.Size = new System.Drawing.Size(289, 28);
+            this.txt_qt034Name.StyleController = this.layoutMx1;
+            this.txt_qt034Name.TabIndex = 337;
+            this.txt_qt034Name.Tag = "readonly";
             // 
             // txt_qt033
             // 
@@ -1118,38 +1118,38 @@
             this.layoutControlItem39});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11,
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14});
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition12.Height = 100D;
+            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition15.Height = 100D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition16.Height = 100D;
+            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6});
+            rowDefinition11,
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16});
             this.Root.Size = new System.Drawing.Size(1666, 253);
             this.Root.TextVisible = false;
             // 
@@ -1230,7 +1230,7 @@
             // 
             // layoutControlItem16
             // 
-            this.layoutControlItem16.Control = this.txt_qt030;
+            this.layoutControlItem16.Control = this.txt_qt030Name;
             this.layoutControlItem16.Location = new System.Drawing.Point(1233, 116);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1264,7 +1264,7 @@
             // 
             // layoutControlItem19
             // 
-            this.layoutControlItem19.Control = this.txt_qt034;
+            this.layoutControlItem19.Control = this.txt_qt034Name;
             this.layoutControlItem19.Location = new System.Drawing.Point(1233, 0);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1333,7 +1333,7 @@
             // 
             // layoutControlItem9
             // 
-            this.layoutControlItem9.Control = this.txt_qt016;
+            this.layoutControlItem9.Control = this.txt_qt016Name;
             this.layoutControlItem9.Location = new System.Drawing.Point(822, 77);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1542,17 +1542,17 @@
             this.layoutControlItem34});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "layoutControlGroup2";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
+            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition16.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15,
+            columnDefinition16});
+            rowDefinition17.Height = 100D;
+            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7});
+            rowDefinition17});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup2.Size = new System.Drawing.Size(407, 43);
             this.layoutControlGroup2.TextVisible = false;
@@ -1683,29 +1683,29 @@
             this.layoutControlItem31});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
-            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition10.Width = 100D;
+            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17.Width = 100D;
+            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition18.Width = 100D;
+            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition19.Width = 100D;
+            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition20.Width = 100D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9,
-            columnDefinition10});
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17,
+            columnDefinition18,
+            columnDefinition19,
+            columnDefinition20});
+            rowDefinition18.Height = 100D;
+            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition19.Height = 100D;
+            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition20.Height = 100D;
+            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition8,
-            rowDefinition9,
-            rowDefinition10});
+            rowDefinition18,
+            rowDefinition19,
+            rowDefinition20});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1664, 160);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -2122,10 +2122,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2149,9 +2149,9 @@
             // rptBl
             // 
             this.rptBl.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptBl.Name = "rptBl";
             this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
             // 
@@ -2323,7 +2323,7 @@
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鍏ュ簱浜�";
-            this.gridColumn18.FieldName = "rkUser";
+            this.gridColumn18.FieldName = "rkUserName";
             this.gridColumn18.MinWidth = 31;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
@@ -2393,17 +2393,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt001.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030Name.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
@@ -2518,7 +2518,7 @@
         private UserControl.UcLookCk txt_qt008;
         private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_qt016;
+        private DevExpress.XtraEditors.TextEdit txt_qt016Name;
         private DevExpress.XtraEditors.TextEdit txt_qt010;
         private DevExpress.XtraEditors.TextEdit txt_qt002;
         private DevExpress.XtraEditors.TextEdit txt_qtck;
@@ -2585,10 +2585,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
-        private DevExpress.XtraEditors.TextEdit txt_qt030;
+        private DevExpress.XtraEditors.TextEdit txt_qt030Name;
         private DevExpress.XtraEditors.TextEdit txt_qt029;
         private DevExpress.XtraEditors.CheckEdit txt_qt028;
-        private DevExpress.XtraEditors.TextEdit txt_qt034;
+        private DevExpress.XtraEditors.TextEdit txt_qt034Name;
         private DevExpress.XtraEditors.TextEdit txt_qt033;
         private DevExpress.XtraEditors.CheckEdit txt_qt032;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;

--
Gitblit v1.9.3