From 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 26 七月 2025 15:49:14 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient --- DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 447 ++++++++++++++++++------------------------------------- 1 files changed, 145 insertions(+), 302 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs index 6cd1249..7227e72 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs @@ -38,7 +38,6 @@ 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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -54,17 +53,13 @@ this.gv_unit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa014 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_mesEndProd = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_blState = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_blTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_blUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa018 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_wgTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_wgUser = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_pcTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remark = 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(); @@ -81,29 +76,24 @@ this.txt_wgUser = new DevExpress.XtraEditors.TextEdit(); this.txt_daa014 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa018 = new DevExpress.XtraEditors.TextEdit(); - this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit(); this.txt_blStateTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); this.txt_daa008 = new DevExpress.XtraEditors.TextEdit(); - this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit(); this.txt_dwName = new DevExpress.XtraEditors.TextEdit(); this.txt_cgd = new DevExpress.XtraEditors.TextEdit(); this.txt_cgdxh = new DevExpress.XtraEditors.TextEdit(); this.txt_erpProductionOrderNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_pcHNo = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); @@ -127,9 +117,8 @@ this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -155,29 +144,24 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_cgd.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); @@ -185,9 +169,8 @@ this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -274,17 +257,13 @@ this.gv_unit, this.gv_daa014, this.gv_daa011, - this.gv_mesStartProd, - this.gv_mesEndProd, this.gv_blState, this.gv_blTime, this.gv_blUser, this.gv_daa018, this.gv_wgTime, this.gv_wgUser, - this.gv_pcTime, this.gv_remark, - this.gridColumn7, this.gridColumn8, this.gridColumn9, this.gridColumn10, @@ -398,32 +377,6 @@ this.gv_daa011.Tag = "query_a.daa011"; this.gv_daa011.Width = 50; // - // gv_mesStartProd - // - this.gv_mesStartProd.AppearanceCell.Options.UseFont = true; - this.gv_mesStartProd.Caption = "Mes棰勮寮�宸�"; - this.gv_mesStartProd.FieldName = "mesStartProd"; - this.gv_mesStartProd.MinWidth = 50; - this.gv_mesStartProd.Name = "gv_mesStartProd"; - this.gv_mesStartProd.OptionsColumn.AllowEdit = false; - this.gv_mesStartProd.Tag = "query_a.mes_start_prod"; - this.gv_mesStartProd.Visible = true; - this.gv_mesStartProd.VisibleIndex = 8; - this.gv_mesStartProd.Width = 180; - // - // gv_mesEndProd - // - this.gv_mesEndProd.AppearanceCell.Options.UseFont = true; - this.gv_mesEndProd.Caption = "Mes棰勮瀹屽伐"; - this.gv_mesEndProd.FieldName = "mesEndProd"; - this.gv_mesEndProd.MinWidth = 50; - this.gv_mesEndProd.Name = "gv_mesEndProd"; - this.gv_mesEndProd.OptionsColumn.AllowEdit = false; - this.gv_mesEndProd.Tag = "query_a.mes_end_prod"; - this.gv_mesEndProd.Visible = true; - this.gv_mesEndProd.VisibleIndex = 9; - this.gv_mesEndProd.Width = 180; - // // gv_blState // this.gv_blState.AppearanceCell.Options.UseFont = true; @@ -492,19 +445,6 @@ this.gv_wgUser.Tag = "query_a.wg_user"; this.gv_wgUser.Width = 94; // - // gv_pcTime - // - this.gv_pcTime.AppearanceCell.Options.UseFont = true; - this.gv_pcTime.Caption = "鎺掍骇鏃堕棿 "; - this.gv_pcTime.FieldName = "pcTime"; - this.gv_pcTime.MinWidth = 50; - this.gv_pcTime.Name = "gv_pcTime"; - this.gv_pcTime.OptionsColumn.AllowEdit = false; - this.gv_pcTime.Tag = "query_a.pc_time"; - this.gv_pcTime.Visible = true; - this.gv_pcTime.VisibleIndex = 13; - this.gv_pcTime.Width = 180; - // // gv_remark // this.gv_remark.AppearanceCell.Options.UseFont = true; @@ -515,18 +455,8 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 10; + this.gv_remark.VisibleIndex = 8; this.gv_remark.Width = 94; - // - // gridColumn7 - // - this.gridColumn7.Caption = "鎺掍骇缂栧彿"; - this.gridColumn7.FieldName = "pcHNo"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 14; - this.gridColumn7.Width = 94; // // gridColumn8 // @@ -535,7 +465,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 11; + this.gridColumn8.VisibleIndex = 9; this.gridColumn8.Width = 94; // // gridColumn9 @@ -545,7 +475,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 12; + this.gridColumn9.VisibleIndex = 10; this.gridColumn9.Width = 94; // // gridColumn10 @@ -555,7 +485,7 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 15; + this.gridColumn10.VisibleIndex = 11; this.gridColumn10.Width = 94; // // gridColumn11 @@ -565,7 +495,7 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 16; + this.gridColumn11.VisibleIndex = 12; this.gridColumn11.Width = 94; // // gridColumn12 @@ -575,7 +505,7 @@ this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 17; + this.gridColumn12.VisibleIndex = 13; this.gridColumn12.Width = 94; // // pageBar1 @@ -615,7 +545,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 154; + this.splitMx1.SplitterPosition = 135; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -627,16 +557,13 @@ this.layoutMx1.Controls.Add(this.txt_wgUser); this.layoutMx1.Controls.Add(this.txt_daa014); this.layoutMx1.Controls.Add(this.txt_daa018); - this.layoutMx1.Controls.Add(this.txt_mesStartProd); this.layoutMx1.Controls.Add(this.txt_blStateTxt); this.layoutMx1.Controls.Add(this.txt_itemNo); this.layoutMx1.Controls.Add(this.txt_daa008); - this.layoutMx1.Controls.Add(this.txt_mesEndProd); this.layoutMx1.Controls.Add(this.txt_dwName); this.layoutMx1.Controls.Add(this.txt_cgd); this.layoutMx1.Controls.Add(this.txt_cgdxh); this.layoutMx1.Controls.Add(this.txt_erpProductionOrderNo); - this.layoutMx1.Controls.Add(this.txt_pcHNo); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem16}); @@ -644,7 +571,7 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 154); + this.layoutMx1.Size = new System.Drawing.Size(1126, 135); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -659,155 +586,127 @@ // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(111, 121); + this.txt_remark.Location = new System.Drawing.Point(99, 98); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; this.txt_remark.Properties.ReadOnly = true; - this.txt_remark.Size = new System.Drawing.Size(439, 24); + this.txt_remark.Size = new System.Drawing.Size(461, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 312; // // txt_daa001 // - this.txt_daa001.Location = new System.Drawing.Point(111, 9); + this.txt_daa001.Location = new System.Drawing.Point(99, 12); this.txt_daa001.Name = "txt_daa001"; this.txt_daa001.Properties.Appearance.Options.UseFont = true; this.txt_daa001.Properties.ReadOnly = true; - this.txt_daa001.Size = new System.Drawing.Size(168, 24); + this.txt_daa001.Size = new System.Drawing.Size(185, 24); this.txt_daa001.StyleController = this.layoutMx1; this.txt_daa001.TabIndex = 216; // // txt_wgTime // - this.txt_wgTime.Location = new System.Drawing.Point(653, 65); + this.txt_wgTime.Location = new System.Drawing.Point(927, 69); this.txt_wgTime.Name = "txt_wgTime"; this.txt_wgTime.Properties.Appearance.Options.UseFont = true; this.txt_wgTime.Properties.ReadOnly = true; - this.txt_wgTime.Size = new System.Drawing.Size(168, 24); + this.txt_wgTime.Size = new System.Drawing.Size(187, 24); this.txt_wgTime.StyleController = this.layoutMx1; this.txt_wgTime.TabIndex = 258; // // txt_wgUser // - this.txt_wgUser.Location = new System.Drawing.Point(653, 37); + this.txt_wgUser.Location = new System.Drawing.Point(927, 40); this.txt_wgUser.Name = "txt_wgUser"; this.txt_wgUser.Properties.Appearance.Options.UseFont = true; this.txt_wgUser.Properties.ReadOnly = true; - this.txt_wgUser.Size = new System.Drawing.Size(168, 24); + this.txt_wgUser.Size = new System.Drawing.Size(187, 24); this.txt_wgUser.StyleController = this.layoutMx1; this.txt_wgUser.TabIndex = 262; // // txt_daa014 // - this.txt_daa014.Location = new System.Drawing.Point(382, 9); + this.txt_daa014.Location = new System.Drawing.Point(375, 12); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Properties.Appearance.Options.UseFont = true; this.txt_daa014.Properties.ReadOnly = true; - this.txt_daa014.Size = new System.Drawing.Size(168, 24); + this.txt_daa014.Size = new System.Drawing.Size(185, 24); this.txt_daa014.StyleController = this.layoutMx1; this.txt_daa014.TabIndex = 226; // // txt_daa018 // - this.txt_daa018.Location = new System.Drawing.Point(653, 9); + this.txt_daa018.Location = new System.Drawing.Point(927, 12); this.txt_daa018.Name = "txt_daa018"; this.txt_daa018.Properties.Appearance.Options.UseFont = true; this.txt_daa018.Properties.ReadOnly = true; - this.txt_daa018.Size = new System.Drawing.Size(168, 24); + this.txt_daa018.Size = new System.Drawing.Size(187, 24); this.txt_daa018.StyleController = this.layoutMx1; this.txt_daa018.TabIndex = 252; // - // txt_mesStartProd - // - this.txt_mesStartProd.Location = new System.Drawing.Point(924, 9); - this.txt_mesStartProd.Name = "txt_mesStartProd"; - this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true; - this.txt_mesStartProd.Properties.ReadOnly = true; - this.txt_mesStartProd.Size = new System.Drawing.Size(169, 24); - this.txt_mesStartProd.StyleController = this.layoutMx1; - this.txt_mesStartProd.TabIndex = 231; - // // txt_blStateTxt // - this.txt_blStateTxt.Location = new System.Drawing.Point(924, 65); + this.txt_blStateTxt.Location = new System.Drawing.Point(651, 12); this.txt_blStateTxt.Name = "txt_blStateTxt"; this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true; this.txt_blStateTxt.Properties.ReadOnly = true; - this.txt_blStateTxt.Size = new System.Drawing.Size(169, 24); + this.txt_blStateTxt.Size = new System.Drawing.Size(185, 24); this.txt_blStateTxt.StyleController = this.layoutMx1; this.txt_blStateTxt.TabIndex = 240; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(111, 37); + this.txt_itemNo.Location = new System.Drawing.Point(99, 40); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Properties.ReadOnly = true; - this.txt_itemNo.Size = new System.Drawing.Size(168, 24); + this.txt_itemNo.Size = new System.Drawing.Size(185, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 217; // // txt_daa008 // - this.txt_daa008.Location = new System.Drawing.Point(382, 37); + this.txt_daa008.Location = new System.Drawing.Point(375, 40); this.txt_daa008.Name = "txt_daa008"; this.txt_daa008.Properties.Appearance.Options.UseFont = true; this.txt_daa008.Properties.ReadOnly = true; - this.txt_daa008.Size = new System.Drawing.Size(168, 24); + this.txt_daa008.Size = new System.Drawing.Size(185, 24); this.txt_daa008.StyleController = this.layoutMx1; this.txt_daa008.TabIndex = 219; // - // txt_mesEndProd - // - this.txt_mesEndProd.Location = new System.Drawing.Point(924, 37); - this.txt_mesEndProd.Name = "txt_mesEndProd"; - this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true; - this.txt_mesEndProd.Properties.ReadOnly = true; - this.txt_mesEndProd.Size = new System.Drawing.Size(169, 24); - this.txt_mesEndProd.StyleController = this.layoutMx1; - this.txt_mesEndProd.TabIndex = 235; - // // txt_dwName // - this.txt_dwName.Location = new System.Drawing.Point(382, 65); + this.txt_dwName.Location = new System.Drawing.Point(651, 40); this.txt_dwName.Name = "txt_dwName"; this.txt_dwName.Properties.Appearance.Options.UseFont = true; this.txt_dwName.Properties.ReadOnly = true; - this.txt_dwName.Size = new System.Drawing.Size(168, 24); + this.txt_dwName.Size = new System.Drawing.Size(185, 24); this.txt_dwName.StyleController = this.layoutMx1; this.txt_dwName.TabIndex = 222; // // txt_cgd // - this.txt_cgd.Location = new System.Drawing.Point(111, 65); + this.txt_cgd.Location = new System.Drawing.Point(99, 69); this.txt_cgd.Name = "txt_cgd"; - this.txt_cgd.Size = new System.Drawing.Size(168, 24); + this.txt_cgd.Size = new System.Drawing.Size(185, 24); this.txt_cgd.StyleController = this.layoutMx1; this.txt_cgd.TabIndex = 313; // // txt_cgdxh // - this.txt_cgdxh.Location = new System.Drawing.Point(111, 93); + this.txt_cgdxh.Location = new System.Drawing.Point(375, 69); this.txt_cgdxh.Name = "txt_cgdxh"; - this.txt_cgdxh.Size = new System.Drawing.Size(168, 24); + this.txt_cgdxh.Size = new System.Drawing.Size(185, 24); this.txt_cgdxh.StyleController = this.layoutMx1; this.txt_cgdxh.TabIndex = 314; // // txt_erpProductionOrderNo // - this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(382, 93); + this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(651, 69); this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo"; - this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24); + this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(185, 24); this.txt_erpProductionOrderNo.StyleController = this.layoutMx1; this.txt_erpProductionOrderNo.TabIndex = 315; - // - // txt_pcHNo - // - this.txt_pcHNo.Location = new System.Drawing.Point(653, 93); - this.txt_pcHNo.Name = "txt_pcHNo"; - this.txt_pcHNo.Size = new System.Drawing.Size(168, 24); - this.txt_pcHNo.StyleController = this.layoutMx1; - this.txt_pcHNo.TabIndex = 316; // // layoutControlItem16 // @@ -828,20 +727,17 @@ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, - this.layoutControlItem3, - this.layoutControlItem4, this.layoutControlItem5, this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem8, - this.layoutControlItem11, - this.layoutControlItem12, this.layoutControlItem17, + this.layoutControlItem3, + this.layoutControlItem7, + this.layoutControlItem12, + this.layoutControlItem11, this.layoutControlItem18, this.layoutControlItem13, - this.layoutControlItem10, this.layoutControlItem19, - this.layoutControlItem20}); + this.layoutControlItem10}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -865,15 +761,12 @@ 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1105, 160); + rowDefinition4}); + this.Root.Size = new System.Drawing.Size(1126, 135); this.Root.TextVisible = false; // // layoutControlItem1 @@ -882,40 +775,19 @@ this.layoutControlItem1.CustomizationFormText = "濮斿宸ュ崟鍙�"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(276, 28); this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_daa014; - this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(276, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 28); this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_daa018; - this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem3.Text = "宸ュ崟鐘舵�� "; - this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_mesStartProd; - this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�"; - this.layoutControlItem4.Location = new System.Drawing.Point(813, 0); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(272, 28); - this.layoutControlItem4.Text = "Mes棰勮寮�宸�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem5 // @@ -923,96 +795,94 @@ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(276, 29); this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_daa008; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 28); + this.layoutControlItem6.Location = new System.Drawing.Point(276, 28); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem6.Size = new System.Drawing.Size(276, 29); this.layoutControlItem6.Text = "宸ュ崟鏁伴噺"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(87, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_wgUser; - this.layoutControlItem7.Location = new System.Drawing.Point(542, 28); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem7.Text = "瀹屽伐浜哄憳"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_mesEndProd; - this.layoutControlItem8.CustomizationFormText = "Mes棰勮瀹屽伐"; - this.layoutControlItem8.Location = new System.Drawing.Point(813, 28); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(272, 28); - this.layoutControlItem8.Text = "Mes棰勮瀹屽伐"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_wgTime; - this.layoutControlItem11.Location = new System.Drawing.Point(542, 56); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem11.Text = "瀹屽伐鏃堕棿 "; - this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_blStateTxt; - this.layoutControlItem12.Location = new System.Drawing.Point(813, 56); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(272, 28); - this.layoutControlItem12.Text = "閫氱煡澶囨枡"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_cgd; - this.layoutControlItem17.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem17.Location = new System.Drawing.Point(0, 57); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem17.Size = new System.Drawing.Size(276, 29); this.layoutControlItem17.Text = "閲囪喘鍗曞彿"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_daa018; + this.layoutControlItem3.Location = new System.Drawing.Point(828, 0); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem3.Size = new System.Drawing.Size(278, 28); + this.layoutControlItem3.Text = "宸ュ崟鐘舵�� "; + this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_wgUser; + this.layoutControlItem7.Location = new System.Drawing.Point(828, 28); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem7.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem7.Text = "瀹屽伐浜哄憳"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_blStateTxt; + this.layoutControlItem12.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem12.Text = "閫氱煡澶囨枡"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_wgTime; + this.layoutControlItem11.Location = new System.Drawing.Point(828, 57); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem11.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem11.Text = "瀹屽伐鏃堕棿 "; + this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_cgdxh; - this.layoutControlItem18.Location = new System.Drawing.Point(0, 84); + this.layoutControlItem18.Location = new System.Drawing.Point(276, 57); this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem18.Size = new System.Drawing.Size(276, 29); this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_remark; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 112); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 86); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem13.Size = new System.Drawing.Size(542, 28); - this.layoutControlItem13.Text = "澶囨敞"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem13.Size = new System.Drawing.Size(552, 29); + this.layoutControlItem13.Text = "澶囨敞澶囨敞"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); // // tabMx // @@ -1020,7 +890,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1126, 404); + this.tabMx.Size = new System.Drawing.Size(1126, 423); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1029,7 +899,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 372); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 391); this.tabMxPage1.Text = "澶囨枡鍗曡韩"; // // gcMx1 @@ -1038,7 +908,7 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1124, 372); + this.gcMx1.Size = new System.Drawing.Size(1124, 391); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1246,38 +1116,27 @@ this.gvMx1dab002.VisibleIndex = 9; this.gvMx1dab002.Width = 50; // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_dwName; - this.layoutControlItem10.Location = new System.Drawing.Point(271, 56); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem10.Text = "鍗曚綅"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18); - // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_erpProductionOrderNo; - this.layoutControlItem19.Location = new System.Drawing.Point(271, 84); + this.layoutControlItem19.Location = new System.Drawing.Point(552, 57); this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem19.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem19.Size = new System.Drawing.Size(276, 29); this.layoutControlItem19.Text = "浠诲姟鍗曞彿"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18); // - // layoutControlItem20 + // layoutControlItem10 // - this.layoutControlItem20.Control = this.txt_pcHNo; - this.layoutControlItem20.Location = new System.Drawing.Point(542, 84); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem20.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem20.Text = "鎺掍骇缂栧彿"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(87, 18); + this.layoutControlItem10.Control = this.txt_dwName; + this.layoutControlItem10.Location = new System.Drawing.Point(552, 28); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem10.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem10.Text = "鍗曚綅"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); // // Frm_WwGd // @@ -1313,29 +1172,24 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_cgd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); @@ -1343,9 +1197,8 @@ this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); this.ResumeLayout(false); } @@ -1364,17 +1217,13 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_unit; private DevExpress.XtraGrid.Columns.GridColumn gv_daa014; private DevExpress.XtraGrid.Columns.GridColumn gv_daa011; - private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd; - private DevExpress.XtraGrid.Columns.GridColumn gv_mesEndProd; private DevExpress.XtraGrid.Columns.GridColumn gv_blState; private DevExpress.XtraGrid.Columns.GridColumn gv_blTime; private DevExpress.XtraGrid.Columns.GridColumn gv_blUser; private DevExpress.XtraGrid.Columns.GridColumn gv_daa018; private DevExpress.XtraGrid.Columns.GridColumn gv_wgTime; private DevExpress.XtraGrid.Columns.GridColumn gv_wgUser; - private DevExpress.XtraGrid.Columns.GridColumn gv_pcTime; private DevExpress.XtraGrid.Columns.GridColumn gv_remark; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraEditors.SplitContainerControl splitMx1; @@ -1384,8 +1233,6 @@ private DevExpress.XtraEditors.TextEdit txt_wgTime; private DevExpress.XtraEditors.TextEdit txt_daa018; private DevExpress.XtraEditors.TextEdit txt_blStateTxt; - private DevExpress.XtraEditors.TextEdit txt_mesEndProd; - private DevExpress.XtraEditors.TextEdit txt_mesStartProd; private DevExpress.XtraEditors.TextEdit txt_daa014; private DevExpress.XtraEditors.TextEdit txt_dwName; private DevExpress.XtraEditors.TextEdit txt_daa008; @@ -1395,14 +1242,8 @@ private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -1430,16 +1271,18 @@ private DevExpress.XtraEditors.TextEdit txt_cgd; private DevExpress.XtraEditors.TextEdit txt_cgdxh; private DevExpress.XtraEditors.TextEdit txt_erpProductionOrderNo; - private DevExpress.XtraEditors.TextEdit txt_pcHNo; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; } } \ No newline at end of file -- Gitblit v1.9.3