From fa113f04a917e85af84813487f033fb6bc43a5d7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 15:04:35 +0800
Subject: [PATCH] bug

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 9e06e3d..5b3e7ef 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();
@@ -86,6 +86,7 @@
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -180,11 +181,11 @@
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
             this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -420,7 +421,8 @@
             this.gridColumn24,
             this.gridColumn25,
             this.gridColumn26,
-            this.gridColumn27});
+            this.gridColumn27,
+            this.gridColumn28});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -439,19 +441,21 @@
             this.gv_qt015.OptionsColumn.AllowEdit = false;
             this.gv_qt015.Tag = "query_a.qt015";
             this.gv_qt015.Visible = true;
-            this.gv_qt015.VisibleIndex = 0;
+            this.gv_qt015.VisibleIndex = 1;
             this.gv_qt015.Width = 50;
             // 
             // gv_qt014
             // 
             this.gv_qt014.AppearanceCell.Options.UseFont = true;
             this.gv_qt014.Caption = "瀹岀粨鏍囪瘑 ";
-            this.gv_qt014.FieldName = "isWj";
+            this.gv_qt014.FieldName = "txtColor";
             this.gv_qt014.MaxWidth = 50;
             this.gv_qt014.MinWidth = 50;
             this.gv_qt014.Name = "gv_qt014";
             this.gv_qt014.OptionsColumn.AllowEdit = false;
             this.gv_qt014.Tag = "query_a.qt014";
+            this.gv_qt014.Visible = true;
+            this.gv_qt014.VisibleIndex = 0;
             this.gv_qt014.Width = 50;
             // 
             // gv_qtck
@@ -464,7 +468,7 @@
             this.gv_qtck.OptionsColumn.AllowEdit = false;
             this.gv_qtck.Tag = "query_a.qtck";
             this.gv_qtck.Visible = true;
-            this.gv_qtck.VisibleIndex = 3;
+            this.gv_qtck.VisibleIndex = 4;
             this.gv_qtck.Width = 180;
             // 
             // gv_qt003
@@ -477,7 +481,7 @@
             this.gv_qt003.OptionsColumn.AllowEdit = false;
             this.gv_qt003.Tag = "query_a.qt003";
             this.gv_qt003.Visible = true;
-            this.gv_qt003.VisibleIndex = 12;
+            this.gv_qt003.VisibleIndex = 14;
             this.gv_qt003.Width = 94;
             // 
             // gv_qt019
@@ -490,7 +494,7 @@
             this.gv_qt019.OptionsColumn.AllowEdit = false;
             this.gv_qt019.Tag = "query_a.qt019";
             this.gv_qt019.Visible = true;
-            this.gv_qt019.VisibleIndex = 13;
+            this.gv_qt019.VisibleIndex = 15;
             this.gv_qt019.Width = 94;
             // 
             // gv_qt005
@@ -503,7 +507,7 @@
             this.gv_qt005.OptionsColumn.AllowEdit = false;
             this.gv_qt005.Tag = "query_a.qt005";
             this.gv_qt005.Visible = true;
-            this.gv_qt005.VisibleIndex = 4;
+            this.gv_qt005.VisibleIndex = 6;
             this.gv_qt005.Width = 94;
             // 
             // gv_qt001
@@ -516,7 +520,7 @@
             this.gv_qt001.OptionsColumn.AllowEdit = false;
             this.gv_qt001.Tag = "query_a.qt001";
             this.gv_qt001.Visible = true;
-            this.gv_qt001.VisibleIndex = 5;
+            this.gv_qt001.VisibleIndex = 7;
             this.gv_qt001.Width = 200;
             // 
             // gv_qt016
@@ -529,7 +533,7 @@
             this.gv_qt016.OptionsColumn.AllowEdit = false;
             this.gv_qt016.Tag = "query_a.qt016";
             this.gv_qt016.Visible = true;
-            this.gv_qt016.VisibleIndex = 9;
+            this.gv_qt016.VisibleIndex = 11;
             this.gv_qt016.Width = 94;
             // 
             // gv_qt002
@@ -542,7 +546,7 @@
             this.gv_qt002.OptionsColumn.AllowEdit = false;
             this.gv_qt002.Tag = "query_a.qt002";
             this.gv_qt002.Visible = true;
-            this.gv_qt002.VisibleIndex = 10;
+            this.gv_qt002.VisibleIndex = 12;
             this.gv_qt002.Width = 180;
             // 
             // gv_qt010
@@ -555,7 +559,7 @@
             this.gv_qt010.OptionsColumn.AllowEdit = false;
             this.gv_qt010.Tag = "query_a.qt010";
             this.gv_qt010.Visible = true;
-            this.gv_qt010.VisibleIndex = 11;
+            this.gv_qt010.VisibleIndex = 13;
             this.gv_qt010.Width = 94;
             // 
             // gridColumn13
@@ -565,7 +569,7 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 14;
+            this.gridColumn13.VisibleIndex = 16;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn14
@@ -575,7 +579,7 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 15;
+            this.gridColumn14.VisibleIndex = 17;
             this.gridColumn14.Width = 94;
             // 
             // gridColumn21
@@ -585,7 +589,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 16;
+            this.gridColumn21.VisibleIndex = 18;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -595,7 +599,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 6;
+            this.gridColumn22.VisibleIndex = 8;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -605,7 +609,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 7;
+            this.gridColumn23.VisibleIndex = 9;
             this.gridColumn23.Width = 94;
             // 
             // gridColumn24
@@ -615,7 +619,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 8;
+            this.gridColumn24.VisibleIndex = 10;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -634,7 +638,7 @@
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Tag = "query_a.qt028";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 2;
+            this.gridColumn26.VisibleIndex = 3;
             this.gridColumn26.Width = 94;
             // 
             // gridColumn27
@@ -645,8 +649,18 @@
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Tag = "query_a.qt032";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 1;
+            this.gridColumn27.VisibleIndex = 2;
             this.gridColumn27.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
+            this.gridColumn28.FieldName = "qtlx";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 5;
+            this.gridColumn28.Width = 94;
             // 
             // pageBar1
             // 
@@ -971,9 +985,11 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_qtlx.Properties.Items.AddRange(new object[] {
             "璇烽�夋嫨",
-            "1:渚涘簲鍟嗚禒閫�",
-            "2:鍞悗缁翠慨",
-            "3:鎷嗗嵏鍏ュ簱"});
+            "1:鍞悗缁翠慨",
+            "2:鎷嗗嵏鍏ュ簱",
+            "3:渚涘簲鍟嗚禒閫�",
+            "4:鏃犳簮鍗曞澶栭��鏉愭枡",
+            "5:鐩樼泩"});
             this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
             this.txt_qtlx.StyleController = this.layoutMx1;
@@ -1054,38 +1070,38 @@
             this.layoutControlItem3});
             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(1332, 207);
             this.Root.TextVisible = false;
             // 
@@ -1398,11 +1414,11 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
             this.ucBtnPrint1.TabIndex = 480;
             // 
             // radOut
@@ -1416,7 +1432,7 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(336, 32);
+            this.radOut.Size = new System.Drawing.Size(336, 33);
             this.radOut.StyleController = this.lay99;
             this.radOut.TabIndex = 479;
             // 
@@ -1424,10 +1440,10 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(692, 84);
+            this.layoutControl1.Location = new System.Drawing.Point(692, 86);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(336, 32);
+            this.layoutControl1.Size = new System.Drawing.Size(336, 33);
             this.layoutControl1.TabIndex = 478;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -1459,19 +1475,19 @@
             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(336, 32);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem33
@@ -1479,7 +1495,7 @@
             this.layoutControlItem33.Control = this.txt_iCount_1;
             this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
+            this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
             this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1489,7 +1505,7 @@
             this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
+            this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
             this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1507,7 +1523,7 @@
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
             this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1526,7 +1542,7 @@
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(454, 48);
+            this.txt_yQty.Location = new System.Drawing.Point(454, 49);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
@@ -1546,7 +1562,7 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(114, 48);
+            this.txtWlmc.Location = new System.Drawing.Point(114, 49);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
@@ -1556,7 +1572,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(114, 84);
+            this.txtWlgg.Location = new System.Drawing.Point(114, 86);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
@@ -1593,30 +1609,30 @@
             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});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
+            rowDefinition18,
+            rowDefinition19,
+            rowDefinition20});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem23
@@ -1625,7 +1641,7 @@
             this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -1633,11 +1649,11 @@
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.layoutControl1;
-            this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
+            this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1650,7 +1666,7 @@
             this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1659,11 +1675,11 @@
             this.layoutControlItem28.Control = this.txt_psnQty_1;
             this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
+            this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1675,7 +1691,7 @@
             this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1684,11 +1700,11 @@
             this.layoutControlItem26.Control = this.txt_yQty;
             this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
+            this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1699,7 +1715,7 @@
             this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
             this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
-            this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1708,10 +1724,10 @@
             this.layoutControlItem29.Control = this.txtWlmc;
             this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
-            this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
+            this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
             this.layoutControlItem29.Name = "layoutControlItem29";
             this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1720,22 +1736,22 @@
             this.layoutControlItem30.Control = this.txtWlgg;
             this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
-            this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
+            this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
             this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.ucBtnPrint1;
-            this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
+            this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
+            this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
             this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem31.TextVisible = false;
@@ -1845,16 +1861,6 @@
             this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.gridView2.OptionsView.ShowGroupPanel = false;
             // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "浣跨敤缁勭粐";
-            this.gridColumn7.FieldName = "fSubsidiary";
-            this.gridColumn7.MinWidth = 200;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 0;
-            this.gridColumn7.Width = 200;
-            // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鐗╂枡ID";
@@ -1892,6 +1898,16 @@
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 3;
             this.gridColumn11.Width = 120;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "浣跨敤缁勭粐";
+            this.gridColumn7.FieldName = "fSubsidiary";
+            this.gridColumn7.MinWidth = 200;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 0;
+            this.gridColumn7.Width = 200;
             // 
             // gvMx1qd002
             // 
@@ -2028,10 +2044,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);
@@ -2055,9 +2071,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);
             // 
@@ -2545,5 +2561,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3