From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 03 四月 2025 23:58:51 +0800 Subject: [PATCH] 1 --- DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 584 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 295 insertions(+), 289 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs index 71f3813..a10442b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs @@ -29,22 +29,22 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition(); - 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.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + 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.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl(); - this.layTop1 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_gdbh = new DevExpress.XtraEditors.TextEdit(); this.txt_gx = new DevExpress.XtraEditors.TextEdit(); - this.txt_czz = new DevExpress.XtraEditors.TextEdit(); + this.txt_collectBy = new DevExpress.XtraEditors.TextEdit(); this.txt_barCode = new DevExpress.XtraEditors.TextEdit(); this.txt_currentBarCode = new DevExpress.XtraEditors.TextEdit(); this.txt_gwm = new DevExpress.XtraEditors.TextEdit(); @@ -82,7 +82,7 @@ this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton(); this.simpleButton4 = new DevExpress.XtraEditors.SimpleButton(); this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton(); - this.progressBarControl1 = new DevExpress.XtraEditors.ProgressBarControl(); + this.prog1 = new DevExpress.XtraEditors.ProgressBarControl(); this.panel3 = new System.Windows.Forms.Panel(); this.lbSum4 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); @@ -100,10 +100,8 @@ this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx2workLine = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -111,24 +109,25 @@ this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1itemNo = 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.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); @@ -142,11 +141,11 @@ ((System.ComponentModel.ISupportInitialize)(this.splitTop1.Panel2)).BeginInit(); this.splitTop1.Panel2.SuspendLayout(); this.splitTop1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layTop1)).BeginInit(); - this.layTop1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); + this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).BeginInit(); @@ -177,7 +176,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); @@ -208,6 +207,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(1367, 619); this.splitMx1.SplitterPosition = 191; this.splitMx1.TabIndex = 0; @@ -221,7 +221,7 @@ // // splitTop1.Panel1 // - this.splitTop1.Panel1.Controls.Add(this.layTop1); + this.splitTop1.Panel1.Controls.Add(this.layoutMx1); this.splitTop1.Panel1.Text = "Panel1"; // // splitTop1.Panel2 @@ -231,7 +231,7 @@ this.splitTop1.Panel2.Controls.Add(this.simpleButton5); this.splitTop1.Panel2.Controls.Add(this.simpleButton4); this.splitTop1.Panel2.Controls.Add(this.simpleButton3); - this.splitTop1.Panel2.Controls.Add(this.progressBarControl1); + this.splitTop1.Panel2.Controls.Add(this.prog1); this.splitTop1.Panel2.Controls.Add(this.panel3); this.splitTop1.Panel2.Controls.Add(this.panel2); this.splitTop1.Panel2.Controls.Add(this.panel4); @@ -242,72 +242,76 @@ this.splitTop1.SplitterPosition = 527; this.splitTop1.TabIndex = 0; // - // layTop1 + // layoutMx1 // - this.layTop1.Controls.Add(this.txt_gdbh); - this.layTop1.Controls.Add(this.txt_gx); - this.layTop1.Controls.Add(this.txt_czz); - this.layTop1.Controls.Add(this.txt_barCode); - this.layTop1.Controls.Add(this.txt_currentBarCode); - this.layTop1.Controls.Add(this.txt_gwm); - this.layTop1.Controls.Add(this.txt_itemNo); - this.layTop1.Controls.Add(this.txt_bc); - this.layTop1.Controls.Add(this.txt_gw); - this.layTop1.Controls.Add(this.txt_itemName); - this.layTop1.Controls.Add(this.txt_itemModel); - this.layTop1.Controls.Add(this.txt_sbNo); - this.layTop1.Controls.Add(this.txt_sjXt); - this.layTop1.Controls.Add(this.txt_yjDate); - this.layTop1.Controls.Add(this.txt_sjDate); - this.layTop1.Controls.Add(this.btnGood); - this.layTop1.Controls.Add(this.btnBad); - this.layTop1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layTop1.Location = new System.Drawing.Point(0, 0); - this.layTop1.Name = "layTop1"; - this.layTop1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500); - this.layTop1.Root = this.Root; - this.layTop1.Size = new System.Drawing.Size(828, 191); - this.layTop1.TabIndex = 0; - this.layTop1.Text = "layoutControl1"; + this.layoutMx1.Controls.Add(this.txt_gdbh); + this.layoutMx1.Controls.Add(this.txt_gx); + this.layoutMx1.Controls.Add(this.txt_collectBy); + this.layoutMx1.Controls.Add(this.txt_barCode); + this.layoutMx1.Controls.Add(this.txt_currentBarCode); + this.layoutMx1.Controls.Add(this.txt_gwm); + this.layoutMx1.Controls.Add(this.txt_itemNo); + this.layoutMx1.Controls.Add(this.txt_bc); + this.layoutMx1.Controls.Add(this.txt_gw); + this.layoutMx1.Controls.Add(this.txt_itemName); + this.layoutMx1.Controls.Add(this.txt_itemModel); + this.layoutMx1.Controls.Add(this.txt_sbNo); + this.layoutMx1.Controls.Add(this.txt_sjXt); + this.layoutMx1.Controls.Add(this.txt_yjDate); + this.layoutMx1.Controls.Add(this.txt_sjDate); + this.layoutMx1.Controls.Add(this.btnGood); + this.layoutMx1.Controls.Add(this.btnBad); + this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.Location = new System.Drawing.Point(0, 0); + this.layoutMx1.Name = "layoutMx1"; + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500); + this.layoutMx1.Root = this.Root; + this.layoutMx1.Size = new System.Drawing.Size(828, 191); + this.layoutMx1.TabIndex = 0; + this.layoutMx1.Text = "layoutControl1"; // // txt_gdbh // this.txt_gdbh.Location = new System.Drawing.Point(84, 12); this.txt_gdbh.Name = "txt_gdbh"; + this.txt_gdbh.Properties.ReadOnly = true; this.txt_gdbh.Size = new System.Drawing.Size(126, 24); - this.txt_gdbh.StyleController = this.layTop1; + this.txt_gdbh.StyleController = this.layoutMx1; this.txt_gdbh.TabIndex = 4; // // txt_gx // this.txt_gx.Location = new System.Drawing.Point(84, 40); this.txt_gx.Name = "txt_gx"; + this.txt_gx.Properties.ReadOnly = true; this.txt_gx.Size = new System.Drawing.Size(126, 24); - this.txt_gx.StyleController = this.layTop1; + this.txt_gx.StyleController = this.layoutMx1; this.txt_gx.TabIndex = 5; // - // txt_czz + // txt_collectBy // - this.txt_czz.Location = new System.Drawing.Point(84, 68); - this.txt_czz.Name = "txt_czz"; - this.txt_czz.Size = new System.Drawing.Size(126, 24); - this.txt_czz.StyleController = this.layTop1; - this.txt_czz.TabIndex = 6; + this.txt_collectBy.Location = new System.Drawing.Point(84, 68); + this.txt_collectBy.Name = "txt_collectBy"; + this.txt_collectBy.Properties.ReadOnly = true; + this.txt_collectBy.Size = new System.Drawing.Size(126, 24); + this.txt_collectBy.StyleController = this.layoutMx1; + this.txt_collectBy.TabIndex = 6; // // txt_barCode // this.txt_barCode.Location = new System.Drawing.Point(84, 96); this.txt_barCode.Name = "txt_barCode"; this.txt_barCode.Size = new System.Drawing.Size(328, 24); - this.txt_barCode.StyleController = this.layTop1; - this.txt_barCode.TabIndex = 7; + this.txt_barCode.StyleController = this.layoutMx1; + this.txt_barCode.TabIndex = 1; // // txt_currentBarCode // this.txt_currentBarCode.Location = new System.Drawing.Point(84, 124); this.txt_currentBarCode.Name = "txt_currentBarCode"; + this.txt_currentBarCode.Properties.ReadOnly = true; this.txt_currentBarCode.Size = new System.Drawing.Size(328, 24); - this.txt_currentBarCode.StyleController = this.layTop1; + this.txt_currentBarCode.StyleController = this.layoutMx1; this.txt_currentBarCode.TabIndex = 8; // // txt_gwm @@ -315,79 +319,88 @@ this.txt_gwm.Location = new System.Drawing.Point(84, 152); this.txt_gwm.Name = "txt_gwm"; this.txt_gwm.Size = new System.Drawing.Size(126, 24); - this.txt_gwm.StyleController = this.layTop1; + this.txt_gwm.StyleController = this.layoutMx1; this.txt_gwm.TabIndex = 9; // // txt_itemNo // this.txt_itemNo.Location = new System.Drawing.Point(286, 12); this.txt_itemNo.Name = "txt_itemNo"; + this.txt_itemNo.Properties.ReadOnly = true; this.txt_itemNo.Size = new System.Drawing.Size(126, 24); - this.txt_itemNo.StyleController = this.layTop1; + this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 10; // // txt_bc // this.txt_bc.Location = new System.Drawing.Point(286, 40); this.txt_bc.Name = "txt_bc"; + this.txt_bc.Properties.ReadOnly = true; this.txt_bc.Size = new System.Drawing.Size(126, 24); - this.txt_bc.StyleController = this.layTop1; + this.txt_bc.StyleController = this.layoutMx1; this.txt_bc.TabIndex = 11; // // txt_gw // this.txt_gw.Location = new System.Drawing.Point(286, 68); this.txt_gw.Name = "txt_gw"; + this.txt_gw.Properties.ReadOnly = true; this.txt_gw.Size = new System.Drawing.Size(126, 24); - this.txt_gw.StyleController = this.layTop1; + this.txt_gw.StyleController = this.layoutMx1; this.txt_gw.TabIndex = 12; // // txt_itemName // this.txt_itemName.Location = new System.Drawing.Point(488, 12); this.txt_itemName.Name = "txt_itemName"; + this.txt_itemName.Properties.ReadOnly = true; this.txt_itemName.Size = new System.Drawing.Size(126, 24); - this.txt_itemName.StyleController = this.layTop1; + this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 13; // // txt_itemModel // this.txt_itemModel.Location = new System.Drawing.Point(690, 12); this.txt_itemModel.Name = "txt_itemModel"; + this.txt_itemModel.Properties.ReadOnly = true; this.txt_itemModel.Size = new System.Drawing.Size(126, 24); - this.txt_itemModel.StyleController = this.layTop1; + this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 14; // // txt_sbNo // this.txt_sbNo.Location = new System.Drawing.Point(488, 68); this.txt_sbNo.Name = "txt_sbNo"; + this.txt_sbNo.Properties.ReadOnly = true; this.txt_sbNo.Size = new System.Drawing.Size(126, 24); - this.txt_sbNo.StyleController = this.layTop1; + this.txt_sbNo.StyleController = this.layoutMx1; this.txt_sbNo.TabIndex = 15; // // txt_sjXt // this.txt_sjXt.Location = new System.Drawing.Point(488, 40); this.txt_sjXt.Name = "txt_sjXt"; + this.txt_sjXt.Properties.ReadOnly = true; this.txt_sjXt.Size = new System.Drawing.Size(126, 24); - this.txt_sjXt.StyleController = this.layTop1; + this.txt_sjXt.StyleController = this.layoutMx1; this.txt_sjXt.TabIndex = 16; // // txt_yjDate // this.txt_yjDate.Location = new System.Drawing.Point(690, 40); this.txt_yjDate.Name = "txt_yjDate"; + this.txt_yjDate.Properties.ReadOnly = true; this.txt_yjDate.Size = new System.Drawing.Size(126, 24); - this.txt_yjDate.StyleController = this.layTop1; + this.txt_yjDate.StyleController = this.layoutMx1; this.txt_yjDate.TabIndex = 17; // // txt_sjDate // this.txt_sjDate.Location = new System.Drawing.Point(690, 68); this.txt_sjDate.Name = "txt_sjDate"; + this.txt_sjDate.Properties.ReadOnly = true; this.txt_sjDate.Size = new System.Drawing.Size(126, 24); - this.txt_sjDate.StyleController = this.layTop1; + this.txt_sjDate.StyleController = this.layoutMx1; this.txt_sjDate.TabIndex = 18; // // btnGood @@ -397,7 +410,7 @@ this.btnGood.Location = new System.Drawing.Point(416, 96); this.btnGood.Name = "btnGood"; this.btnGood.Size = new System.Drawing.Size(198, 83); - this.btnGood.StyleController = this.layTop1; + this.btnGood.StyleController = this.layoutMx1; this.btnGood.TabIndex = 19; this.btnGood.Text = "鑹搧"; // @@ -408,7 +421,7 @@ this.btnBad.Location = new System.Drawing.Point(618, 96); this.btnBad.Name = "btnBad"; this.btnBad.Size = new System.Drawing.Size(198, 83); - this.btnBad.StyleController = this.layTop1; + this.btnBad.StyleController = this.layoutMx1; this.btnBad.TabIndex = 20; this.btnBad.Text = "涓嶈壇鍝�"; // @@ -436,38 +449,38 @@ this.layoutControlItem11}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition9.Width = 100D; - columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition10.Width = 100D; - columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition11.Width = 100D; - columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition12.Width = 100D; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition9, - columnDefinition10, - columnDefinition11, - columnDefinition12}); - 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; - rowDefinition17.Height = 100D; - rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition18.Height = 100D; - rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + 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; + rowDefinition11.Height = 100D; + rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition12.Height = 100D; + rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition13, - rowDefinition14, - rowDefinition15, - rowDefinition16, - rowDefinition17, - rowDefinition18}); + rowDefinition7, + rowDefinition8, + rowDefinition9, + rowDefinition10, + rowDefinition11, + rowDefinition12}); this.Root.Size = new System.Drawing.Size(828, 191); this.Root.TextVisible = false; // @@ -487,17 +500,18 @@ this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem2.Text = "宸ュ簭"; + this.layoutControlItem2.Text = "褰撳墠宸ュ簭"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // - this.layoutControlItem3.Control = this.txt_czz; + this.layoutControlItem3.Control = this.txt_collectBy; + this.layoutControlItem3.CustomizationFormText = "鎿嶄綔鍛樺伐"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 56); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem3.Text = "鎿嶄綔鑰�"; + this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 @@ -508,7 +522,7 @@ this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(404, 28); - this.layoutControlItem4.Text = "鎵撴潯鐮�"; + this.layoutControlItem4.Text = "鎵拷婧爜"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 @@ -710,12 +724,13 @@ this.simpleButton3.TabIndex = 6; this.simpleButton3.Text = "鐗╂枡"; // - // progressBarControl1 + // prog1 // - this.progressBarControl1.Location = new System.Drawing.Point(21, 88); - this.progressBarControl1.Name = "progressBarControl1"; - this.progressBarControl1.Size = new System.Drawing.Size(489, 22); - this.progressBarControl1.TabIndex = 5; + this.prog1.Location = new System.Drawing.Point(21, 88); + this.prog1.Name = "prog1"; + this.prog1.Properties.ShowTitle = true; + this.prog1.Size = new System.Drawing.Size(489, 22); + this.prog1.TabIndex = 5; // // panel3 // @@ -864,10 +879,8 @@ this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn12, - this.gridColumn11, this.gvMx2status, this.gvMx2pbillNo, - this.gvMx2workLine, this.gvMx2itemNo, this.gridColumn5, this.gridColumn6, @@ -875,6 +888,7 @@ this.gvMx2tlQty, this.gridColumn2, this.gridColumn1, + this.gridColumn4, this.gridColumn14, this.gridColumn15}); this.gvMx1.GridControl = this.gcMx1; @@ -892,22 +906,12 @@ this.gridColumn12.OptionsColumn.ReadOnly = true; this.gridColumn12.Width = 94; // - // gridColumn11 - // - this.gridColumn11.Caption = "aboutGuid"; - this.gridColumn11.FieldName = "aboutGuid"; - this.gridColumn11.MinWidth = 25; - this.gridColumn11.Name = "gridColumn11"; - this.gridColumn11.OptionsColumn.ReadOnly = true; - this.gridColumn11.Width = 94; - // // gvMx2status // this.gvMx2status.AppearanceCell.Options.UseFont = true; this.gvMx2status.Caption = "宸ュ崟缂栧彿"; - this.gvMx2status.FieldName = "status"; - this.gvMx2status.MaxWidth = 50; - this.gvMx2status.MinWidth = 50; + this.gvMx2status.FieldName = "gdbh"; + this.gvMx2status.MinWidth = 10; this.gvMx2status.Name = "gvMx2status"; this.gvMx2status.OptionsColumn.ReadOnly = true; this.gvMx2status.Tag = "query_a.status"; @@ -919,25 +923,13 @@ // this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true; this.gvMx2pbillNo.Caption = "杩芥函鐮�"; - this.gvMx2pbillNo.FieldName = "pbillNo"; + this.gvMx2pbillNo.FieldName = "barCode"; this.gvMx2pbillNo.Name = "gvMx2pbillNo"; this.gvMx2pbillNo.OptionsColumn.ReadOnly = true; this.gvMx2pbillNo.Tag = "query_a.pbill_no"; this.gvMx2pbillNo.Visible = true; this.gvMx2pbillNo.VisibleIndex = 1; this.gvMx2pbillNo.Width = 94; - // - // gvMx2workLine - // - this.gvMx2workLine.AppearanceCell.Options.UseFont = true; - this.gvMx2workLine.Caption = "鐗╂枡鏉$爜"; - this.gvMx2workLine.FieldName = "workLine"; - this.gvMx2workLine.Name = "gvMx2workLine"; - this.gvMx2workLine.OptionsColumn.ReadOnly = true; - this.gvMx2workLine.Tag = "query_a.work_line"; - this.gvMx2workLine.Visible = true; - this.gvMx2workLine.VisibleIndex = 2; - this.gvMx2workLine.Width = 94; // // gvMx2itemNo // @@ -948,7 +940,7 @@ this.gvMx2itemNo.OptionsColumn.ReadOnly = true; this.gvMx2itemNo.Tag = "query_a.item_no"; this.gvMx2itemNo.Visible = true; - this.gvMx2itemNo.VisibleIndex = 3; + this.gvMx2itemNo.VisibleIndex = 2; this.gvMx2itemNo.Width = 94; // // gridColumn5 @@ -958,7 +950,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 4; + this.gridColumn5.VisibleIndex = 3; this.gridColumn5.Width = 94; // // gridColumn6 @@ -968,52 +960,65 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 5; + this.gridColumn6.VisibleIndex = 4; this.gridColumn6.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "鏁伴噺"; + this.gridColumn3.FieldName = "quantity"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 7; + this.gridColumn3.VisibleIndex = 6; this.gridColumn3.Width = 94; // // gvMx2tlQty // this.gvMx2tlQty.AppearanceCell.Options.UseFont = true; this.gvMx2tlQty.Caption = "鍗曚綅"; - this.gvMx2tlQty.FieldName = "tlQty"; + this.gvMx2tlQty.FieldName = "dwName"; this.gvMx2tlQty.Name = "gvMx2tlQty"; this.gvMx2tlQty.OptionsColumn.ReadOnly = true; this.gvMx2tlQty.Tag = "query_a.tl_qty"; this.gvMx2tlQty.Visible = true; - this.gvMx2tlQty.VisibleIndex = 6; + this.gvMx2tlQty.VisibleIndex = 5; this.gvMx2tlQty.Width = 94; // // gridColumn2 // this.gridColumn2.Caption = "宸ュ簭"; + this.gridColumn2.FieldName = "processNo"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 8; + this.gridColumn2.VisibleIndex = 7; this.gridColumn2.Width = 94; // // gridColumn1 // this.gridColumn1.Caption = "澶囨敞"; + this.gridColumn1.FieldName = "remark"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 9; + this.gridColumn1.VisibleIndex = 8; this.gridColumn1.Width = 94; + // + // gridColumn4 + // + this.gridColumn4.Caption = "缁撴灉"; + this.gridColumn4.FieldName = "checkResult"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 9; + this.gridColumn4.Width = 94; // // gridColumn14 // - this.gridColumn14.Caption = "鍒涘缓浜�"; - this.gridColumn14.FieldName = "createBy"; + this.gridColumn14.Caption = "鎿嶄綔鍛樺伐"; + this.gridColumn14.FieldName = "collectByName"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; @@ -1022,7 +1027,7 @@ // // gridColumn15 // - this.gridColumn15.Caption = "鍒涘缓鏃堕棿"; + this.gridColumn15.Caption = "鎿嶄綔鏃堕棿"; this.gridColumn15.FieldName = "createDate"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; @@ -1052,160 +1057,162 @@ // this.gvMx2.Appearance.Row.Options.UseFont = true; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gvMx1guid, - this.gvMx1itemBarcode, - this.gvMx1itemNo, + this.gridColumn7, this.gridColumn8, this.gridColumn9, - this.gvMx1quantity, this.gridColumn10, - this.gvMx1depotCode, - this.gvMx1depotSectionCode, - this.gvMx1ebelnK3id, - this.gvMx1lineK3id, + this.gridColumn11, + this.gridColumn13, this.gridColumn16, - this.gridColumn17}); + this.gridColumn17, + this.gridColumn18, + this.gridColumn19, + this.gridColumn20, + this.gridColumn21, + this.gridColumn22}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; - this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; this.gvMx2.OptionsFind.ShowSearchNavButtons = false; this.gvMx2.OptionsView.ShowGroupPanel = false; // - // gvMx1guid + // gridColumn7 // - this.gvMx1guid.AppearanceCell.Options.UseFont = true; - this.gvMx1guid.Caption = "guid "; - this.gvMx1guid.FieldName = "guid"; - this.gvMx1guid.MinWidth = 50; - this.gvMx1guid.Name = "gvMx1guid"; - this.gvMx1guid.Tag = "query_a.guid"; - this.gvMx1guid.Width = 94; - // - // gvMx1itemBarcode - // - this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true; - this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜 "; - this.gvMx1itemBarcode.FieldName = "itemBarcode"; - this.gvMx1itemBarcode.Name = "gvMx1itemBarcode"; - this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE"; - this.gvMx1itemBarcode.Visible = true; - this.gvMx1itemBarcode.VisibleIndex = 1; - this.gvMx1itemBarcode.Width = 94; - // - // gvMx1itemNo - // - this.gvMx1itemNo.AppearanceCell.Options.UseFont = true; - this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜"; - this.gvMx1itemNo.FieldName = "itemNo"; - this.gvMx1itemNo.Name = "gvMx1itemNo"; - this.gvMx1itemNo.Tag = "query_a.ITEM_NO"; - this.gvMx1itemNo.Visible = true; - this.gvMx1itemNo.VisibleIndex = 0; - this.gvMx1itemNo.Width = 94; + this.gridColumn7.Caption = "guid"; + this.gridColumn7.FieldName = "guid"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.OptionsColumn.ReadOnly = true; + this.gridColumn7.Width = 94; // // gridColumn8 // - this.gridColumn8.Caption = "鐗╂枡鍚嶇О"; - this.gridColumn8.FieldName = "itemName"; + this.gridColumn8.AppearanceCell.Options.UseFont = true; + this.gridColumn8.Caption = "宸ュ崟缂栧彿"; + this.gridColumn8.FieldName = "gdbh"; + this.gridColumn8.MinWidth = 10; this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.OptionsColumn.ReadOnly = true; + this.gridColumn8.Tag = "query_a.status"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 2; - this.gridColumn8.Width = 94; + this.gridColumn8.VisibleIndex = 0; + this.gridColumn8.Width = 50; // // gridColumn9 // - this.gridColumn9.Caption = "瑙勬牸鍨嬪彿"; - this.gridColumn9.FieldName = "itemModel"; + this.gridColumn9.AppearanceCell.Options.UseFont = true; + this.gridColumn9.Caption = "杩芥函鐮�"; + this.gridColumn9.FieldName = "barCode"; this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.OptionsColumn.ReadOnly = true; + this.gridColumn9.Tag = "query_a.pbill_no"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 3; + this.gridColumn9.VisibleIndex = 1; this.gridColumn9.Width = 94; - // - // gvMx1quantity - // - this.gvMx1quantity.AppearanceCell.Options.UseFont = true; - this.gvMx1quantity.Caption = "鏁伴噺"; - this.gvMx1quantity.FieldName = "quantity"; - this.gvMx1quantity.MinWidth = 50; - this.gvMx1quantity.Name = "gvMx1quantity"; - this.gvMx1quantity.Tag = "query_a.QUANTITY"; - this.gvMx1quantity.Visible = true; - this.gvMx1quantity.VisibleIndex = 4; - this.gvMx1quantity.Width = 94; // // gridColumn10 // - this.gridColumn10.Caption = "鍗曚綅"; - this.gridColumn10.FieldName = "kcUnit"; - this.gridColumn10.MinWidth = 50; + this.gridColumn10.AppearanceCell.Options.UseFont = true; + this.gridColumn10.Caption = "鐗╂枡缂栫爜"; + this.gridColumn10.FieldName = "itemNo"; this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.OptionsColumn.ReadOnly = true; + this.gridColumn10.Tag = "query_a.item_no"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 5; + this.gridColumn10.VisibleIndex = 2; this.gridColumn10.Width = 94; // - // gvMx1depotCode + // gridColumn11 // - this.gvMx1depotCode.AppearanceCell.Options.UseFont = true; - this.gvMx1depotCode.Caption = "浠撳簱缂栫爜 "; - this.gvMx1depotCode.FieldName = "depotCode"; - this.gvMx1depotCode.Name = "gvMx1depotCode"; - this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE"; - this.gvMx1depotCode.Visible = true; - this.gvMx1depotCode.VisibleIndex = 6; - this.gvMx1depotCode.Width = 94; + this.gridColumn11.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn11.FieldName = "itemName"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.OptionsColumn.ReadOnly = true; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 3; + this.gridColumn11.Width = 94; // - // gvMx1depotSectionCode + // gridColumn13 // - this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true; - this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜 "; - this.gvMx1depotSectionCode.FieldName = "depotSectionCode"; - this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode"; - this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE"; - this.gvMx1depotSectionCode.Visible = true; - this.gvMx1depotSectionCode.VisibleIndex = 7; - this.gvMx1depotSectionCode.Width = 94; - // - // gvMx1ebelnK3id - // - this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true; - this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID "; - this.gvMx1ebelnK3id.FieldName = "ebelnK3id"; - this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id"; - this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID"; - this.gvMx1ebelnK3id.Visible = true; - this.gvMx1ebelnK3id.VisibleIndex = 8; - this.gvMx1ebelnK3id.Width = 94; - // - // gvMx1lineK3id - // - this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true; - this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D "; - this.gvMx1lineK3id.FieldName = "lineK3id"; - this.gvMx1lineK3id.Name = "gvMx1lineK3id"; - this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID"; - this.gvMx1lineK3id.Visible = true; - this.gvMx1lineK3id.VisibleIndex = 9; - this.gvMx1lineK3id.Width = 94; + this.gridColumn13.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn13.FieldName = "itemModel"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.OptionsColumn.ReadOnly = true; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 4; + this.gridColumn13.Width = 94; // // gridColumn16 // - this.gridColumn16.Caption = "鍒涘缓浜�"; - this.gridColumn16.FieldName = "createBy"; + this.gridColumn16.Caption = "鏁伴噺"; + this.gridColumn16.FieldName = "quantity"; this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 10; + this.gridColumn16.VisibleIndex = 6; this.gridColumn16.Width = 94; // // gridColumn17 // - this.gridColumn17.Caption = "鍒涘缓鏃堕棿"; - this.gridColumn17.FieldName = "createDate"; - this.gridColumn17.MinWidth = 25; + this.gridColumn17.AppearanceCell.Options.UseFont = true; + this.gridColumn17.Caption = "鍗曚綅"; + this.gridColumn17.FieldName = "dwName"; this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.OptionsColumn.ReadOnly = true; + this.gridColumn17.Tag = "query_a.tl_qty"; this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 11; + this.gridColumn17.VisibleIndex = 5; this.gridColumn17.Width = 94; + // + // gridColumn18 + // + this.gridColumn18.Caption = "宸ュ簭"; + this.gridColumn18.FieldName = "processNo"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 7; + this.gridColumn18.Width = 94; + // + // gridColumn19 + // + this.gridColumn19.Caption = "澶囨敞"; + this.gridColumn19.FieldName = "remark"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 8; + this.gridColumn19.Width = 94; + // + // gridColumn20 + // + this.gridColumn20.Caption = "缁撴灉"; + this.gridColumn20.FieldName = "checkResult"; + this.gridColumn20.MinWidth = 25; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 9; + this.gridColumn20.Width = 94; + // + // gridColumn21 + // + this.gridColumn21.Caption = "鎿嶄綔鍛樺伐"; + this.gridColumn21.FieldName = "collectByName"; + this.gridColumn21.MinWidth = 25; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 10; + this.gridColumn21.Width = 94; + // + // gridColumn22 + // + this.gridColumn22.Caption = "鎿嶄綔鏃堕棿"; + this.gridColumn22.FieldName = "createDate"; + this.gridColumn22.MinWidth = 25; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Visible = true; + this.gridColumn22.VisibleIndex = 11; + this.gridColumn22.Width = 94; // // Frm_Work01 // @@ -1231,11 +1238,11 @@ this.splitTop1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitTop1)).EndInit(); this.splitTop1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layTop1)).EndInit(); - this.layTop1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); + this.layoutMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).EndInit(); @@ -1266,7 +1273,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); this.panel2.ResumeLayout(false); @@ -1296,10 +1303,8 @@ private DevExpress.XtraGrid.GridControl gcMx1; private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gvMx2status; private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo; - private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine; private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; @@ -1307,26 +1312,11 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraTab.XtraTabPage tabMxPage2; - private DevExpress.XtraGrid.GridControl gcMx2; - private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; - private DevExpress.XtraLayout.LayoutControl layTop1; + private DevExpress.XtraLayout.LayoutControl layoutMx1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraEditors.TextEdit txt_gdbh; private DevExpress.XtraEditors.TextEdit txt_gx; - private DevExpress.XtraEditors.TextEdit txt_czz; + private DevExpress.XtraEditors.TextEdit txt_collectBy; private DevExpress.XtraEditors.TextEdit txt_barCode; private DevExpress.XtraEditors.TextEdit txt_currentBarCode; private DevExpress.XtraEditors.TextEdit txt_gwm; @@ -1369,7 +1359,7 @@ private DevExpress.XtraEditors.SimpleButton simpleButton5; private DevExpress.XtraEditors.SimpleButton simpleButton4; private DevExpress.XtraEditors.SimpleButton simpleButton3; - private DevExpress.XtraEditors.ProgressBarControl progressBarControl1; + private DevExpress.XtraEditors.ProgressBarControl prog1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; @@ -1380,5 +1370,21 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraBars.Alerter.AlertControl alertControl1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.GridControl gcMx2; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; } } \ No newline at end of file -- Gitblit v1.9.3