From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 09 六月 2025 09:53:37 +0800 Subject: [PATCH] 采购明细报表 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 298 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 141 insertions(+), 157 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs index 9e4e02b..28d56cb 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs @@ -29,6 +29,7 @@ /// </summary> private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); @@ -63,6 +64,8 @@ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); 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.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -107,7 +110,7 @@ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); - this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -120,7 +123,7 @@ this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -130,9 +133,10 @@ this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); - this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -192,10 +196,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); - this.tabMxPage1.SuspendLayout(); + this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - this.tabMxPage2.SuspendLayout(); + this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); @@ -239,6 +243,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -252,14 +257,14 @@ // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1346, 570); - this.split1.SplitterPosition = 558; + this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; @@ -270,7 +275,6 @@ // // gridView1 // - this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_status, @@ -303,7 +307,6 @@ // // gv_status // - this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_status.AppearanceCell.Options.UseFont = true; this.gv_status.Caption = "瀹℃牳鏍囪瘑"; this.gv_status.FieldName = "checkStatus"; @@ -317,7 +320,6 @@ // // gv_billNo // - this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_billNo.AppearanceCell.Options.UseFont = true; this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 "; this.gv_billNo.FieldName = "billNo"; @@ -331,7 +333,6 @@ // // gv_taskNo // - this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_taskNo.AppearanceCell.Options.UseFont = true; this.gv_taskNo.Caption = "鐢宠鍗曞彿"; this.gv_taskNo.FieldName = "taskNo"; @@ -345,7 +346,6 @@ // // gv_depotsCode // - this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depotsCode.AppearanceCell.Options.UseFont = true; this.gv_depotsCode.Caption = "浠撳簱ID"; this.gv_depotsCode.FieldName = "ckId"; @@ -359,7 +359,6 @@ // // gv_depotsId // - this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depotsId.AppearanceCell.Options.UseFont = true; this.gv_depotsId.Caption = "浠撳簱缂栧彿"; this.gv_depotsId.FieldName = "ckNo"; @@ -383,7 +382,6 @@ // // gv_createBy // - this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "鍒涘缓浜� "; this.gv_createBy.FieldName = "createBy"; @@ -397,7 +395,6 @@ // // gv_createDate // - this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_createDate.AppearanceCell.Options.UseFont = true; this.gv_createDate.Caption = "鍒涘缓鏃堕棿 "; this.gv_createDate.FieldName = "createDate"; @@ -411,7 +408,6 @@ // // gv_lastupdateBy // - this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 "; this.gv_lastupdateBy.FieldName = "lastupdateBy"; @@ -425,7 +421,6 @@ // // gv_lastupdateDate // - this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� "; this.gv_lastupdateDate.FieldName = "lastupdateDate"; @@ -439,7 +434,6 @@ // // gv_remark // - this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_remark.AppearanceCell.Options.UseFont = true; this.gv_remark.Caption = "鐢宠澶囨敞 "; this.gv_remark.FieldName = "sqRemark"; @@ -463,7 +457,6 @@ // // gv_checkUser // - this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_checkUser.AppearanceCell.Options.UseFont = true; this.gv_checkUser.Caption = "瀹℃牳浜� "; this.gv_checkUser.FieldName = "checkUser"; @@ -477,7 +470,6 @@ // // gv_checkDate // - this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_checkDate.AppearanceCell.Options.UseFont = true; this.gv_checkDate.Caption = "瀹℃牳鏃堕棿"; this.gv_checkDate.FieldName = "checkDate"; @@ -511,7 +503,6 @@ // // gv_guid // - this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_guid.AppearanceCell.Options.UseFont = true; this.gv_guid.Caption = "涓婚敭GUID"; this.gv_guid.FieldName = "guid"; @@ -540,6 +531,26 @@ this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 17; this.gridColumn8.Width = 94; + // + // gridColumn9 + // + this.gridColumn9.Caption = "閮ㄩ棬"; + this.gridColumn9.FieldName = "bmName"; + this.gridColumn9.MinWidth = 25; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 18; + this.gridColumn9.Width = 94; + // + // gridColumn10 + // + this.gridColumn10.Caption = "渚涘簲鍟�"; + this.gridColumn10.FieldName = "gysName"; + this.gridColumn10.MinWidth = 25; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 19; + this.gridColumn10.Width = 94; // // pageBar1 // @@ -576,6 +587,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1346, 570); this.splitMx1.SplitterPosition = 176; this.splitMx1.TabIndex = 0; @@ -614,7 +626,6 @@ // // lbGuid // - this.lbGuid.Font = new System.Drawing.Font("Tahoma", 10F); this.lbGuid.Location = new System.Drawing.Point(990, 108); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(323, 28); @@ -623,31 +634,28 @@ // // txt_ckName // - this.txt_ckName.Location = new System.Drawing.Point(445, 108); + this.txt_ckName.Location = new System.Drawing.Point(445, 105); this.txt_ckName.Name = "txt_ckName"; - this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ckName.Properties.Appearance.Options.UseFont = true; - this.txt_ckName.Size = new System.Drawing.Size(225, 28); + this.txt_ckName.Size = new System.Drawing.Size(225, 24); this.txt_ckName.StyleController = this.layoutMx1; this.txt_ckName.TabIndex = 609; // // txt_sqRemark // - this.txt_sqRemark.Location = new System.Drawing.Point(114, 140); + this.txt_sqRemark.Location = new System.Drawing.Point(114, 136); this.txt_sqRemark.Name = "txt_sqRemark"; - this.txt_sqRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_sqRemark.Properties.Appearance.Options.UseFont = true; - this.txt_sqRemark.Size = new System.Drawing.Size(556, 28); + this.txt_sqRemark.Size = new System.Drawing.Size(556, 24); this.txt_sqRemark.StyleController = this.layoutMx1; this.txt_sqRemark.TabIndex = 240; // // txt_hz // - this.txt_hz.Location = new System.Drawing.Point(114, 108); + this.txt_hz.Location = new System.Drawing.Point(114, 105); this.txt_hz.Name = "txt_hz"; - this.txt_hz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_hz.Properties.Appearance.Options.UseFont = true; - this.txt_hz.Size = new System.Drawing.Size(225, 28); + this.txt_hz.Size = new System.Drawing.Size(225, 24); this.txt_hz.StyleController = this.layoutMx1; this.txt_hz.TabIndex = 602; // @@ -655,49 +663,44 @@ // this.txt_checkUser.Location = new System.Drawing.Point(1107, 12); this.txt_checkUser.Name = "txt_checkUser"; - this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(227, 28); + this.txt_checkUser.Size = new System.Drawing.Size(227, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 608; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(776, 108); + this.txt_createDate.Location = new System.Drawing.Point(776, 105); this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(225, 28); + this.txt_createDate.Size = new System.Drawing.Size(225, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 222; // // txt_lyfx // - this.txt_lyfx.Location = new System.Drawing.Point(776, 44); + this.txt_lyfx.Location = new System.Drawing.Point(776, 43); this.txt_lyfx.Name = "txt_lyfx"; - this.txt_lyfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lyfx.Properties.Appearance.Options.UseFont = true; - this.txt_lyfx.Size = new System.Drawing.Size(225, 28); + this.txt_lyfx.Size = new System.Drawing.Size(225, 24); this.txt_lyfx.StyleController = this.layoutMx1; this.txt_lyfx.TabIndex = 604; // // txt_hzlx // - this.txt_hzlx.Location = new System.Drawing.Point(114, 76); + this.txt_hzlx.Location = new System.Drawing.Point(114, 74); this.txt_hzlx.Name = "txt_hzlx"; - this.txt_hzlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_hzlx.Properties.Appearance.Options.UseFont = true; - this.txt_hzlx.Size = new System.Drawing.Size(225, 28); + this.txt_hzlx.Size = new System.Drawing.Size(225, 24); this.txt_hzlx.StyleController = this.layoutMx1; this.txt_hzlx.TabIndex = 600; // // txt_gysName // - this.txt_gysName.Location = new System.Drawing.Point(445, 76); + this.txt_gysName.Location = new System.Drawing.Point(445, 74); this.txt_gysName.Name = "txt_gysName"; - this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_gysName.Properties.Appearance.Options.UseFont = true; - this.txt_gysName.Size = new System.Drawing.Size(225, 28); + this.txt_gysName.Size = new System.Drawing.Size(225, 24); this.txt_gysName.StyleController = this.layoutMx1; this.txt_gysName.TabIndex = 595; // @@ -705,9 +708,8 @@ // this.txt_billNo.Location = new System.Drawing.Point(114, 12); this.txt_billNo.Name = "txt_billNo"; - this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(225, 28); + this.txt_billNo.Size = new System.Drawing.Size(225, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; // @@ -715,9 +717,8 @@ // this.txt_abtNo.Location = new System.Drawing.Point(445, 12); this.txt_abtNo.Name = "txt_abtNo"; - this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_abtNo.Properties.Appearance.Options.UseFont = true; - this.txt_abtNo.Size = new System.Drawing.Size(225, 28); + this.txt_abtNo.Size = new System.Drawing.Size(225, 24); this.txt_abtNo.StyleController = this.layoutMx1; this.txt_abtNo.TabIndex = 507; // @@ -725,55 +726,50 @@ // this.txt_djlx.Location = new System.Drawing.Point(776, 12); this.txt_djlx.Name = "txt_djlx"; - this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_djlx.Properties.Appearance.Options.UseFont = true; - this.txt_djlx.Size = new System.Drawing.Size(225, 28); + this.txt_djlx.Size = new System.Drawing.Size(225, 24); this.txt_djlx.StyleController = this.layoutMx1; this.txt_djlx.TabIndex = 598; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(776, 76); + this.txt_createBy.Location = new System.Drawing.Point(776, 74); this.txt_createBy.Name = "txt_createBy"; - this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(225, 28); + this.txt_createBy.Size = new System.Drawing.Size(225, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 219; // // txt_dptName // - this.txt_dptName.Location = new System.Drawing.Point(445, 44); + this.txt_dptName.Location = new System.Drawing.Point(445, 43); this.txt_dptName.Name = "txt_dptName"; - this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(225, 28); + this.txt_dptName.Size = new System.Drawing.Size(225, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 596; // // txt_kcOrg // - this.txt_kcOrg.Location = new System.Drawing.Point(114, 44); + this.txt_kcOrg.Location = new System.Drawing.Point(114, 43); this.txt_kcOrg.Name = "txt_kcOrg"; - this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_kcOrg.Properties.Appearance.Options.UseFont = true; - this.txt_kcOrg.Size = new System.Drawing.Size(225, 28); + this.txt_kcOrg.Size = new System.Drawing.Size(225, 24); this.txt_kcOrg.StyleController = this.layoutMx1; this.txt_kcOrg.TabIndex = 593; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(1107, 44); + this.txt_checkDate.Location = new System.Drawing.Point(1107, 43); this.txt_checkDate.Name = "txt_checkDate"; - this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(227, 28); + this.txt_checkDate.Size = new System.Drawing.Size(227, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 587; // // txt_status // - this.txt_status.Location = new System.Drawing.Point(1005, 76); + this.txt_status.Location = new System.Drawing.Point(1005, 74); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_status.Size = new System.Drawing.Size(329, 24); @@ -782,21 +778,19 @@ // // txt_lastupdateBy // - this.txt_lastupdateBy.Location = new System.Drawing.Point(1107, 108); + this.txt_lastupdateBy.Location = new System.Drawing.Point(1107, 105); this.txt_lastupdateBy.Name = "txt_lastupdateBy"; - this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; - this.txt_lastupdateBy.Size = new System.Drawing.Size(227, 28); + this.txt_lastupdateBy.Size = new System.Drawing.Size(227, 24); this.txt_lastupdateBy.StyleController = this.layoutMx1; this.txt_lastupdateBy.TabIndex = 610; // // txt_lastupdateDate // - this.txt_lastupdateDate.Location = new System.Drawing.Point(1107, 140); + this.txt_lastupdateDate.Location = new System.Drawing.Point(1107, 136); this.txt_lastupdateDate.Name = "txt_lastupdateDate"; - this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; - this.txt_lastupdateDate.Size = new System.Drawing.Size(227, 28); + this.txt_lastupdateDate.Size = new System.Drawing.Size(227, 24); this.txt_lastupdateDate.StyleController = this.layoutMx1; this.txt_lastupdateDate.TabIndex = 611; // @@ -866,7 +860,7 @@ rowDefinition3, rowDefinition4, rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1346, 180); + this.Root.Size = new System.Drawing.Size(1346, 176); this.Root.TextVisible = false; // // layoutControlItem1 @@ -874,7 +868,7 @@ this.layoutControlItem1.Control = this.txt_billNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(331, 31); this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // @@ -884,7 +878,7 @@ this.layoutControlItem2.Location = new System.Drawing.Point(331, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(331, 31); this.layoutControlItem2.Text = "鐢宠鍗曞彿"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // @@ -894,7 +888,7 @@ this.layoutControlItem3.Location = new System.Drawing.Point(662, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(331, 31); this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // @@ -904,93 +898,93 @@ this.layoutControlItem4.Location = new System.Drawing.Point(993, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(333, 32); - this.layoutControlItem4.Text = "瀹℃牳浜�"; + this.layoutControlItem4.Size = new System.Drawing.Size(333, 31); + this.layoutControlItem4.Text = "瀹℃牳浜哄憳"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_kcOrg; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem5.Location = new System.Drawing.Point(0, 31); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(331, 31); this.layoutControlItem5.Text = "搴撳瓨缁勭粐"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_dptName; - this.layoutControlItem6.Location = new System.Drawing.Point(331, 32); + this.layoutControlItem6.Location = new System.Drawing.Point(331, 31); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem6.Size = new System.Drawing.Size(331, 31); this.layoutControlItem6.Text = "閮ㄩ棬"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_lyfx; - this.layoutControlItem7.Location = new System.Drawing.Point(662, 32); + this.layoutControlItem7.Location = new System.Drawing.Point(662, 31); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem7.Size = new System.Drawing.Size(331, 31); this.layoutControlItem7.Text = "搴撳瓨鏂瑰悜"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_checkDate; - this.layoutControlItem8.Location = new System.Drawing.Point(993, 32); + this.layoutControlItem8.Location = new System.Drawing.Point(993, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem8.Size = new System.Drawing.Size(333, 31); this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_hzlx; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem9.Location = new System.Drawing.Point(0, 62); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem9.Size = new System.Drawing.Size(331, 31); this.layoutControlItem9.Text = "璐т富绫诲瀷"; this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_gysName; - this.layoutControlItem10.Location = new System.Drawing.Point(331, 64); + this.layoutControlItem10.Location = new System.Drawing.Point(331, 62); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem10.Size = new System.Drawing.Size(331, 31); this.layoutControlItem10.Text = "渚涘簲鍟�"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_createBy; - this.layoutControlItem11.Location = new System.Drawing.Point(662, 64); + this.layoutControlItem11.Location = new System.Drawing.Point(662, 62); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem11.Text = "鍒涘缓浜�"; + this.layoutControlItem11.Size = new System.Drawing.Size(331, 31); + this.layoutControlItem11.Text = "鍒涘缓浜哄憳"; this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_status; - this.layoutControlItem12.Location = new System.Drawing.Point(993, 64); + this.layoutControlItem12.Location = new System.Drawing.Point(993, 62); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem12.Size = new System.Drawing.Size(333, 31); this.layoutControlItem12.Text = "瀹℃牳鐘舵��"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; @@ -998,39 +992,39 @@ // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_hz; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 93); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem13.Size = new System.Drawing.Size(331, 31); this.layoutControlItem13.Text = "璐т富"; this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_ckName; - this.layoutControlItem14.Location = new System.Drawing.Point(331, 96); + this.layoutControlItem14.Location = new System.Drawing.Point(331, 93); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem14.Size = new System.Drawing.Size(331, 31); this.layoutControlItem14.Text = "浠撳簱鍚嶇О"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_createDate; - this.layoutControlItem15.Location = new System.Drawing.Point(662, 96); + this.layoutControlItem15.Location = new System.Drawing.Point(662, 93); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem15.Size = new System.Drawing.Size(331, 31); this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_sqRemark; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 128); + this.layoutControlItem16.Location = new System.Drawing.Point(0, 124); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; @@ -1041,18 +1035,18 @@ // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_lastupdateBy; - this.layoutControlItem17.Location = new System.Drawing.Point(993, 96); + this.layoutControlItem17.Location = new System.Drawing.Point(993, 93); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem17.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem17.Size = new System.Drawing.Size(333, 31); this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉"; this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_lastupdateDate; - this.layoutControlItem18.Location = new System.Drawing.Point(993, 128); + this.layoutControlItem18.Location = new System.Drawing.Point(993, 124); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; @@ -1065,19 +1059,19 @@ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; - this.tabMx.SelectedTabPage = this.tabMxPage1; + this.tabMx.SelectedTabPage = this.tabMxPage2; this.tabMx.Size = new System.Drawing.Size(1346, 382); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { - this.tabMxPage2, - this.tabMxPage1}); + this.tabMxPage1, + this.tabMxPage2}); // - // tabMxPage1 + // tabMxPage2 // - this.tabMxPage1.Controls.Add(this.gcMx2); - this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1344, 350); - this.tabMxPage1.Text = "鍏ュ簱鏉$爜"; + this.tabMxPage2.Controls.Add(this.gcMx2); + this.tabMxPage2.Name = "tabMxPage2"; + this.tabMxPage2.Size = new System.Drawing.Size(1344, 350); + this.tabMxPage2.Text = "鍏ュ簱鏉$爜"; // // gcMx2 // @@ -1111,7 +1105,6 @@ // // gvMx1itemBarcode // - this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true; this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜"; this.gvMx1itemBarcode.FieldName = "itemBarcode"; @@ -1124,7 +1117,6 @@ // // gvMx1cItemCode // - this.gvMx1cItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true; this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜"; this.gvMx1cItemCode.FieldName = "itemNo"; @@ -1137,7 +1129,6 @@ // // gvMx1itemSname // - this.gvMx1itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1itemSname.AppearanceCell.Options.UseFont = true; this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О"; this.gvMx1itemSname.FieldName = "itemName"; @@ -1150,7 +1141,6 @@ // // gvMx1itemNo // - this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1itemNo.AppearanceCell.Options.UseFont = true; this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿"; this.gvMx1itemNo.FieldName = "itemModel"; @@ -1163,7 +1153,6 @@ // // gvMx1quantity // - this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1quantity.AppearanceCell.Options.UseFont = true; this.gvMx1quantity.Caption = "鏁伴噺"; this.gvMx1quantity.FieldName = "quantity"; @@ -1176,7 +1165,6 @@ // // gvMx1unit // - this.gvMx1unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1unit.AppearanceCell.Options.UseFont = true; this.gvMx1unit.Caption = "搴撳瓨鍗曚綅"; this.gvMx1unit.FieldName = "kcUnit"; @@ -1189,7 +1177,6 @@ // // gvMx1depotCode // - this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1depotCode.AppearanceCell.Options.UseFont = true; this.gvMx1depotCode.Caption = "浠撳簱缂栫爜"; this.gvMx1depotCode.FieldName = "depotCode"; @@ -1202,7 +1189,6 @@ // // gvMx1depotSectionCode // - this.gvMx1depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true; this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜"; this.gvMx1depotSectionCode.FieldName = "depotSectionCode"; @@ -1215,7 +1201,6 @@ // // gridColumn1 // - this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gridColumn1.AppearanceCell.Options.UseFont = true; this.gridColumn1.Caption = "寤虹珛鑰�"; this.gridColumn1.FieldName = "createBy"; @@ -1227,7 +1212,6 @@ // // gridColumn2 // - this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gridColumn2.AppearanceCell.Options.UseFont = true; this.gridColumn2.Caption = "寤虹珛鏃堕棿"; this.gridColumn2.FieldName = "createDate"; @@ -1237,12 +1221,12 @@ this.gridColumn2.VisibleIndex = 9; this.gridColumn2.Width = 94; // - // tabMxPage2 + // tabMxPage1 // - this.tabMxPage2.Controls.Add(this.gcMx1); - this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1344, 350); - this.tabMxPage2.Text = "鐗╂枡鏄庣粏"; + this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Name = "tabMxPage1"; + this.tabMxPage1.Size = new System.Drawing.Size(1344, 350); + this.tabMxPage1.Text = "鐗╂枡鏄庣粏"; // // gcMx1 // @@ -1264,7 +1248,9 @@ this.gvMx2quantity, this.gvMx2unit, this.gridColumn5, - this.gridColumn6}); + this.gridColumn6, + this.gridColumn11, + this.gridColumn12}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1293,7 +1279,6 @@ // // gvMx2itemSname // - this.gvMx2itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx2itemSname.AppearanceCell.Options.UseFont = true; this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О"; this.gvMx2itemSname.FieldName = "itemName"; @@ -1306,7 +1291,6 @@ // // gvMx2quantity // - this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx2quantity.AppearanceCell.Options.UseFont = true; this.gvMx2quantity.Caption = "鏁伴噺"; this.gvMx2quantity.FieldName = "quantity"; @@ -1319,7 +1303,6 @@ // // gvMx2unit // - this.gvMx2unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx2unit.AppearanceCell.Options.UseFont = true; this.gvMx2unit.Caption = "搴撳瓨鍗曚綅"; this.gvMx2unit.FieldName = "kcUnit"; @@ -1332,7 +1315,6 @@ // // gridColumn5 // - this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gridColumn5.AppearanceCell.Options.UseFont = true; this.gridColumn5.Caption = "寤虹珛鑰�"; this.gridColumn5.FieldName = "createBy"; @@ -1344,7 +1326,6 @@ // // gridColumn6 // - this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gridColumn6.AppearanceCell.Options.UseFont = true; this.gridColumn6.Caption = "寤虹珛鏃堕棿"; this.gridColumn6.FieldName = "createDate"; @@ -1353,6 +1334,26 @@ this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 6; this.gridColumn6.Width = 94; + // + // gridColumn11 + // + this.gridColumn11.Caption = "鐢宠澶囨敞"; + this.gridColumn11.FieldName = "sqRemark"; + this.gridColumn11.MinWidth = 25; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 7; + this.gridColumn11.Width = 94; + // + // gridColumn12 + // + this.gridColumn12.Caption = "鐗╂枡ID"; + this.gridColumn12.FieldName = "itemId"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 8; + this.gridColumn12.Width = 94; // // picCheckBox // @@ -1364,26 +1365,6 @@ this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; - // - // gridColumn9 - // - this.gridColumn9.Caption = "閮ㄩ棬"; - this.gridColumn9.FieldName = "bmName"; - this.gridColumn9.MinWidth = 25; - this.gridColumn9.Name = "gridColumn9"; - this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 18; - this.gridColumn9.Width = 94; - // - // gridColumn10 - // - this.gridColumn10.Caption = "渚涘簲鍟�"; - this.gridColumn10.FieldName = "gysName"; - this.gridColumn10.MinWidth = 25; - this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 19; - this.gridColumn10.Width = 94; // // Frm_MesItemQtrkDj // @@ -1454,10 +1435,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); - this.tabMxPage1.ResumeLayout(false); + this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - this.tabMxPage2.ResumeLayout(false); + this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); @@ -1533,7 +1514,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraTab.XtraTabControl tabMx; - private DevExpress.XtraTab.XtraTabPage tabMxPage1; + private DevExpress.XtraTab.XtraTabPage tabMxPage2; private DevExpress.XtraGrid.GridControl gcMx2; private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode; @@ -1546,7 +1527,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraTab.XtraTabPage tabMxPage2; + private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; @@ -1560,5 +1541,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.Utils.ToolTipController tips; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; } } \ No newline at end of file -- Gitblit v1.9.3