From 45b0abd8850da515734792f01addd8aa5f18dd62 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期五, 01 八月 2025 23:31:42 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 943 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 511 insertions(+), 432 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs index 24d7bf3..76328e5 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs @@ -29,28 +29,27 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); 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(); + this.txt_gongWei = new DevExpress.XtraEditors.TextEdit(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); this.txt_bc = new DevExpress.XtraEditors.TextEdit(); - this.txt_gw = new DevExpress.XtraEditors.TextEdit(); this.txt_itemName = new DevExpress.XtraEditors.TextEdit(); this.txt_itemModel = new DevExpress.XtraEditors.TextEdit(); this.txt_sbNo = new DevExpress.XtraEditors.TextEdit(); @@ -59,6 +58,7 @@ this.txt_sjDate = new DevExpress.XtraEditors.TextEdit(); this.btnGood = new DevExpress.XtraEditors.SimpleButton(); this.btnBad = new DevExpress.XtraEditors.SimpleButton(); + this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -66,23 +66,17 @@ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem(); this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton(); this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton(); 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(); @@ -109,25 +103,35 @@ 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.gridColumn24 = 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.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); this.splitMx1.Panel1.SuspendLayout(); @@ -140,23 +144,23 @@ ((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(); + ((System.ComponentModel.ISupportInitialize)(this.txt_gongWei.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); @@ -164,18 +168,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((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.layDianJian)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); @@ -188,6 +186,12 @@ this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); this.SuspendLayout(); // // splitMx1 @@ -206,6 +210,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; @@ -219,7 +224,7 @@ // // splitTop1.Panel1 // - this.splitTop1.Panel1.Controls.Add(this.layTop1); + this.splitTop1.Panel1.Controls.Add(this.layoutMx1); this.splitTop1.Panel1.Text = "Panel1"; // // splitTop1.Panel2 @@ -229,7 +234,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); @@ -240,165 +245,164 @@ 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_gongWei); + this.layoutMx1.Controls.Add(this.txt_itemNo); + this.layoutMx1.Controls.Add(this.txt_bc); + 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.Controls.Add(this.txt_dianJianPath); + 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.Location = new System.Drawing.Point(111, 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.Size = new System.Drawing.Size(99, 24); + 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.Location = new System.Drawing.Point(111, 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.Size = new System.Drawing.Size(99, 24); + 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.Properties.ReadOnly = true; - 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(111, 68); + this.txt_collectBy.Name = "txt_collectBy"; + this.txt_collectBy.Properties.ReadOnly = true; + this.txt_collectBy.Size = new System.Drawing.Size(99, 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.Location = new System.Drawing.Point(111, 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.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); + this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200))))); + this.txt_barCode.Properties.Appearance.Options.UseFont = true; + this.txt_barCode.Properties.Appearance.Options.UseForeColor = true; + this.txt_barCode.Size = new System.Drawing.Size(301, 24); + 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.Location = new System.Drawing.Point(111, 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.Size = new System.Drawing.Size(301, 24); + this.txt_currentBarCode.StyleController = this.layoutMx1; this.txt_currentBarCode.TabIndex = 8; // - // txt_gwm + // txt_gongWei // - 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.TabIndex = 9; + this.txt_gongWei.Location = new System.Drawing.Point(111, 152); + this.txt_gongWei.Name = "txt_gongWei"; + this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); + this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200))))); + this.txt_gongWei.Properties.Appearance.Options.UseFont = true; + this.txt_gongWei.Properties.Appearance.Options.UseForeColor = true; + this.txt_gongWei.Size = new System.Drawing.Size(99, 24); + this.txt_gongWei.StyleController = this.layoutMx1; + this.txt_gongWei.TabIndex = 9; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(286, 12); + this.txt_itemNo.Location = new System.Drawing.Point(313, 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.Size = new System.Drawing.Size(99, 24); + 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.Location = new System.Drawing.Point(313, 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.Size = new System.Drawing.Size(99, 24); + 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.TabIndex = 12; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(488, 12); + this.txt_itemName.Location = new System.Drawing.Point(515, 40); 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.Size = new System.Drawing.Size(99, 24); + 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.Location = new System.Drawing.Point(515, 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.Size = new System.Drawing.Size(301, 24); + 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.Location = new System.Drawing.Point(313, 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.Size = new System.Drawing.Size(99, 24); + 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.Location = new System.Drawing.Point(515, 68); 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.Size = new System.Drawing.Size(99, 24); + 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.Location = new System.Drawing.Point(717, 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.Size = new System.Drawing.Size(99, 24); + 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.Location = new System.Drawing.Point(717, 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.Size = new System.Drawing.Size(99, 24); + this.txt_sjDate.StyleController = this.layoutMx1; this.txt_sjDate.TabIndex = 18; // // btnGood @@ -408,7 +412,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 = "鑹搧"; // @@ -419,9 +423,18 @@ 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 = "涓嶈壇鍝�"; + // + // txt_dianJianPath + // + this.txt_dianJianPath.Location = new System.Drawing.Point(313, 152); + this.txt_dianJianPath.Name = "txt_dianJianPath"; + this.txt_dianJianPath.Properties.ReadOnly = true; + this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24); + this.txt_dianJianPath.StyleController = this.layoutMx1; + this.txt_dianJianPath.TabIndex = 21; // // Root // @@ -434,51 +447,51 @@ this.layoutControlItem4, this.layoutControlItem7, this.layoutControlItem8, - this.layoutControlItem9, - this.layoutControlItem10, - this.layoutControlItem12, - this.layoutControlItem14, - this.layoutControlItem15, this.layoutControlItem5, - this.layoutControlItem6, + this.layShuiJian, this.layoutControlItem16, this.layoutControlItem17, + this.layDianJian, + this.layoutControlItem12, + this.layoutControlItem15, + this.layoutControlItem14, this.layoutControlItem13, + this.layoutControlItem10, this.layoutControlItem11}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - 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; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - 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; + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition4.Height = 100D; + rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7, - rowDefinition8, - rowDefinition9, - rowDefinition10, - rowDefinition11, - rowDefinition12}); + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5, + rowDefinition6}); this.Root.Size = new System.Drawing.Size(828, 191); this.Root.TextVisible = false; // @@ -489,7 +502,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(202, 28); this.layoutControlItem1.Text = "宸ュ崟缂栧彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem2 // @@ -498,18 +511,19 @@ this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem2.Text = "宸ュ簭"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem2.Text = "褰撳墠宸ュ簭"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 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.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem4 // @@ -519,8 +533,8 @@ this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(404, 28); - this.layoutControlItem4.Text = "鎵潯鐮�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem4.Text = "鎵拷婧爜"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem7 // @@ -530,7 +544,7 @@ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(202, 28); this.layoutControlItem7.Text = "浜у搧缂栫爜"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem8 // @@ -541,61 +555,7 @@ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(202, 28); this.layoutControlItem8.Text = "鐝"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_gw; - this.layoutControlItem9.Location = new System.Drawing.Point(202, 56); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem9.Text = "宸ヤ綅"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_itemName; - this.layoutControlItem10.Location = new System.Drawing.Point(404, 0); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem10.Text = "浜у搧鍚嶇О"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_sbNo; - this.layoutControlItem12.Location = new System.Drawing.Point(404, 56); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem12.Text = "璁惧缂栫爜"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_yjDate; - this.layoutControlItem14.Location = new System.Drawing.Point(606, 28); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem14.Text = "璁″垝鏃堕棿"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_sjDate; - this.layoutControlItem15.Location = new System.Drawing.Point(606, 56); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem15.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem15.Text = "瀹為檯鏃堕棿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem5 // @@ -606,17 +566,17 @@ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem5.Size = new System.Drawing.Size(404, 28); this.layoutControlItem5.Text = "褰撳墠鏉$爜"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18); // - // layoutControlItem6 + // layShuiJian // - this.layoutControlItem6.Control = this.txt_gwm; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 140); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem6.Size = new System.Drawing.Size(202, 31); - this.layoutControlItem6.Text = "鎵伐浣嶇爜"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + this.layShuiJian.Control = this.txt_gongWei; + this.layShuiJian.Location = new System.Drawing.Point(0, 140); + this.layShuiJian.Name = "layShuiJian"; + this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5; + this.layShuiJian.Size = new System.Drawing.Size(202, 31); + this.layShuiJian.Text = "鎵伐浣嶇爜"; + this.layShuiJian.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem16 // @@ -650,26 +610,16 @@ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem17.TextVisible = false; // - // layoutControlItem13 + // layDianJian // - this.layoutControlItem13.Control = this.txt_sjXt; - this.layoutControlItem13.Location = new System.Drawing.Point(404, 28); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem13.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem13.Text = "绾垮埆"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_itemModel; - this.layoutControlItem11.Location = new System.Drawing.Point(606, 0); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem11.Size = new System.Drawing.Size(202, 28); - this.layoutControlItem11.Text = "浜у搧瑙勬牸"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); + this.layDianJian.Control = this.txt_dianJianPath; + this.layDianJian.Location = new System.Drawing.Point(202, 140); + this.layDianJian.Name = "layDianJian"; + this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1; + this.layDianJian.OptionsTableLayoutItem.RowIndex = 5; + this.layDianJian.Size = new System.Drawing.Size(202, 31); + this.layDianJian.Text = "鐢垫璺緞"; + this.layDianJian.TextSize = new System.Drawing.Size(87, 18); // // simpleButton7 // @@ -721,12 +671,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 // @@ -789,9 +740,9 @@ this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.panel4.Controls.Add(this.lbSum2); this.panel4.Controls.Add(this.label8); - this.panel4.Location = new System.Drawing.Point(151, 7); + this.panel4.Location = new System.Drawing.Point(143, 7); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(99, 71); + this.panel4.Size = new System.Drawing.Size(110, 71); this.panel4.TabIndex = 2; // // lbSum2 @@ -806,11 +757,11 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(18, 10); + this.label8.Location = new System.Drawing.Point(1, 10); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(68, 18); + this.label8.Size = new System.Drawing.Size(107, 18); this.label8.TabIndex = 0; - this.label8.Text = "鎶曞叆鏁伴噺"; + this.label8.Text = "G001:鎶曞叆鏁伴噺"; // // panel1 // @@ -884,8 +835,10 @@ this.gvMx2tlQty, this.gridColumn2, this.gridColumn1, + this.gridColumn4, this.gridColumn14, - this.gridColumn15}); + this.gridColumn15, + this.gridColumn24}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -964,6 +917,7 @@ this.gridColumn3.FieldName = "quantity"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.OptionsColumn.ReadOnly = true; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 6; this.gridColumn3.Width = 94; @@ -986,39 +940,63 @@ this.gridColumn2.FieldName = "processNo"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.OptionsColumn.ReadOnly = true; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 7; this.gridColumn2.Width = 94; // // gridColumn1 // - this.gridColumn1.Caption = "澶囨敞"; - this.gridColumn1.FieldName = "remark"; + this.gridColumn1.Caption = "涓嶈壇鎻忚堪"; + this.gridColumn1.FieldName = "badDescription"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 8; + this.gridColumn1.OptionsColumn.ReadOnly = true; this.gridColumn1.Width = 94; + // + // gridColumn4 + // + this.gridColumn4.Caption = "缁撴灉"; + this.gridColumn4.FieldName = "checkResult"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.OptionsColumn.ReadOnly = true; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 8; + this.gridColumn4.Width = 94; // // gridColumn14 // - this.gridColumn14.Caption = "鍒涘缓浜�"; + this.gridColumn14.Caption = "涓婃姤浜�"; this.gridColumn14.FieldName = "createBy"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.OptionsColumn.ReadOnly = true; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 9; this.gridColumn14.Width = 94; // // gridColumn15 // - this.gridColumn15.Caption = "鍒涘缓鏃堕棿"; + this.gridColumn15.Caption = "鏈�鍚庝笂鎶ユ椂闂�"; this.gridColumn15.FieldName = "createDate"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.OptionsColumn.ReadOnly = true; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 10; this.gridColumn15.Width = 94; + // + // gridColumn24 + // + this.gridColumn24.Caption = "鏁版嵁鐘舵��"; + this.gridColumn24.FieldName = "barCodeStatusTxt"; + this.gridColumn24.MinWidth = 25; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.OptionsColumn.ReadOnly = true; + this.gridColumn24.Visible = true; + this.gridColumn24.VisibleIndex = 11; + this.gridColumn24.Width = 94; // // tabMxPage2 // @@ -1042,160 +1020,257 @@ // 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.gridColumn23, + this.gridColumn25}); 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.OptionsColumn.ReadOnly = true; 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.OptionsColumn.ReadOnly = true; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 7; + this.gridColumn18.Width = 94; + // + // gridColumn19 + // + this.gridColumn19.Caption = "涓嶈壇鎻忚堪"; + this.gridColumn19.FieldName = "badDescription"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.OptionsColumn.ReadOnly = true; + 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.OptionsColumn.ReadOnly = true; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 9; + this.gridColumn20.Width = 94; + // + // gridColumn21 + // + this.gridColumn21.Caption = "涓婃姤浜�"; + this.gridColumn21.FieldName = "createBy"; + this.gridColumn21.MinWidth = 25; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.OptionsColumn.ReadOnly = true; + 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.OptionsColumn.ReadOnly = true; + this.gridColumn22.Visible = true; + this.gridColumn22.VisibleIndex = 11; + this.gridColumn22.Width = 94; + // + // gridColumn23 + // + this.gridColumn23.Caption = "涓嶈壇椤圭洰"; + this.gridColumn23.FieldName = "badReson"; + this.gridColumn23.MinWidth = 25; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.OptionsColumn.ReadOnly = true; + this.gridColumn23.Width = 94; + // + // gridColumn25 + // + this.gridColumn25.Caption = "鏁版嵁鐘舵��"; + this.gridColumn25.FieldName = "barCodeStatus"; + this.gridColumn25.MinWidth = 25; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.OptionsColumn.ReadOnly = true; + this.gridColumn25.Visible = true; + this.gridColumn25.VisibleIndex = 12; + this.gridColumn25.Width = 94; + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_sbNo; + this.layoutControlItem12.Location = new System.Drawing.Point(202, 56); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem12.Size = new System.Drawing.Size(202, 28); + this.layoutControlItem12.Text = "璁惧缂栫爜"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_sjDate; + this.layoutControlItem15.Location = new System.Drawing.Point(606, 56); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem15.Size = new System.Drawing.Size(202, 28); + this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_yjDate; + this.layoutControlItem14.Location = new System.Drawing.Point(606, 28); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem14.Size = new System.Drawing.Size(202, 28); + this.layoutControlItem14.Text = "Mes璁″垝寮�宸�"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_sjXt; + this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆"; + this.layoutControlItem13.Location = new System.Drawing.Point(404, 56); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem13.Size = new System.Drawing.Size(202, 28); + this.layoutControlItem13.Text = "鐢熶骇绾垮埆"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_itemName; + this.layoutControlItem10.Location = new System.Drawing.Point(404, 28); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem10.Size = new System.Drawing.Size(202, 28); + this.layoutControlItem10.Text = "浜у搧鍚嶇О"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_itemModel; + this.layoutControlItem11.Location = new System.Drawing.Point(404, 0); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem11.Size = new System.Drawing.Size(404, 28); + this.layoutControlItem11.Text = "浜у搧瑙勬牸"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18); // // Frm_Work01 // @@ -1207,7 +1282,7 @@ this.MinimizeBox = false; this.Name = "Frm_Work01"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "宸ュ簭閲囬泦-鎶曞叆"; + this.Text = "宸ュ簭閲囬泦"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit(); this.splitMx1.Panel1.ResumeLayout(false); @@ -1221,23 +1296,23 @@ 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(); + ((System.ComponentModel.ISupportInitialize)(this.txt_gongWei.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); @@ -1245,18 +1320,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((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.layDianJian)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); this.panel2.ResumeLayout(false); @@ -1273,6 +1342,12 @@ this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); this.ResumeLayout(false); } @@ -1295,36 +1370,20 @@ 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; + private DevExpress.XtraEditors.TextEdit txt_gongWei; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraEditors.TextEdit txt_itemNo; private DevExpress.XtraEditors.TextEdit txt_bc; - private DevExpress.XtraEditors.TextEdit txt_gw; private DevExpress.XtraEditors.TextEdit txt_itemName; private DevExpress.XtraEditors.TextEdit txt_itemModel; private DevExpress.XtraEditors.TextEdit txt_sbNo; @@ -1333,11 +1392,6 @@ private DevExpress.XtraEditors.TextEdit txt_sjDate; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraEditors.SimpleButton btnGood; private DevExpress.XtraEditors.SimpleButton btnBad; private System.Windows.Forms.Panel panel3; @@ -1357,16 +1411,41 @@ 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 layShuiJian; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; 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; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraEditors.TextEdit txt_dianJianPath; + private DevExpress.XtraLayout.LayoutControlItem layDianJian; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; } } \ No newline at end of file -- Gitblit v1.9.3