From 437425784b7612e10d4a54bd64905c508347514d Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 06 五月 2025 15:12:50 +0800 Subject: [PATCH] fqc --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 718 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 365 insertions(+), 353 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs index ac7360f..d64a341 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs @@ -30,34 +30,35 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.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.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - 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.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -67,10 +68,7 @@ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa027 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -89,7 +87,6 @@ this.gv_cust = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -216,14 +213,16 @@ this.txt_printRemark = new DevExpress.XtraEditors.TextEdit(); this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); + this.txt_zQty = new DevExpress.XtraEditors.TextEdit(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx3 = new DevExpress.XtraGrid.GridControl(); this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -242,12 +241,14 @@ this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit(); this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit(); this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit(); + this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit(); this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx4 = new DevExpress.XtraGrid.GridControl(); this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -260,8 +261,8 @@ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panMx100 = new System.Windows.Forms.Panel(); - this.tips = new DevExpress.Utils.ToolTipController(this.components); this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint(); + this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -345,14 +346,16 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit(); @@ -363,12 +366,14 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit(); this.xtraTabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit(); @@ -413,6 +418,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -426,8 +432,9 @@ // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1267, 708); - this.split1.SplitterPosition = 696; + this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // // gcMain1 @@ -451,10 +458,7 @@ this.gridColumn5, this.gv_daa027, this.gridColumn7, - this.gridColumn8, - this.gridColumn9, this.gridColumn10, - this.gridColumn11, this.gridColumn12, this.gridColumn6, this.gridColumn27, @@ -473,7 +477,6 @@ this.gv_cust, this.gridColumn1, this.gv_daa015, - this.gridColumn2, this.gv_daa009, this.gv_prepareTime, this.gv_daa028, @@ -534,28 +537,6 @@ this.gridColumn7.VisibleIndex = 2; this.gridColumn7.Width = 50; // - // gridColumn8 - // - this.gridColumn8.Caption = "鏄惁涓夊ぉ"; - this.gridColumn8.FieldName = "isThree"; - this.gridColumn8.MaxWidth = 50; - this.gridColumn8.MinWidth = 50; - this.gridColumn8.Name = "gridColumn8"; - this.gridColumn8.Tag = "query_a.jabs"; - this.gridColumn8.Width = 50; - // - // gridColumn9 - // - this.gridColumn9.Caption = "鏄惁瓒呮椂"; - this.gridColumn9.FieldName = "isCs"; - this.gridColumn9.MaxWidth = 50; - this.gridColumn9.MinWidth = 50; - this.gridColumn9.Name = "gridColumn9"; - this.gridColumn9.Tag = "query_a.jabs"; - this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 3; - this.gridColumn9.Width = 50; - // // gridColumn10 // this.gridColumn10.Caption = "鏄惁棣栨"; @@ -565,20 +546,8 @@ this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Tag = "query_a.jabs"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 4; + this.gridColumn10.VisibleIndex = 3; this.gridColumn10.Width = 50; - // - // gridColumn11 - // - this.gridColumn11.Caption = "鏄惁宸℃"; - this.gridColumn11.FieldName = "isXj"; - this.gridColumn11.MaxWidth = 50; - this.gridColumn11.MinWidth = 50; - this.gridColumn11.Name = "gridColumn11"; - this.gridColumn11.Tag = "query_a.jabs"; - this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 5; - this.gridColumn11.Width = 50; // // gridColumn12 // @@ -589,7 +558,7 @@ this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Tag = "query_a.jabs"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 6; + this.gridColumn12.VisibleIndex = 5; this.gridColumn12.Width = 50; // // gridColumn6 @@ -601,7 +570,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "query_a.jabs"; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 7; + this.gridColumn6.VisibleIndex = 6; this.gridColumn6.Width = 50; // // gridColumn27 @@ -611,7 +580,7 @@ this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 8; + this.gridColumn27.VisibleIndex = 7; this.gridColumn27.Width = 94; // // gv_daa018 @@ -624,7 +593,7 @@ this.gv_daa018.OptionsColumn.AllowEdit = false; this.gv_daa018.Tag = "query_a.daa018"; this.gv_daa018.Visible = true; - this.gv_daa018.VisibleIndex = 9; + this.gv_daa018.VisibleIndex = 8; this.gv_daa018.Width = 90; // // gridColoun100 @@ -635,7 +604,7 @@ this.gridColoun100.Name = "gridColoun100"; this.gridColoun100.Tag = "org.fnamber"; this.gridColoun100.Visible = true; - this.gridColoun100.VisibleIndex = 10; + this.gridColoun100.VisibleIndex = 9; this.gridColoun100.Width = 250; // // gv_daa001 @@ -648,7 +617,7 @@ this.gv_daa001.OptionsColumn.AllowEdit = false; this.gv_daa001.Tag = "query_a.daa001"; this.gv_daa001.Visible = true; - this.gv_daa001.VisibleIndex = 11; + this.gv_daa001.VisibleIndex = 10; this.gv_daa001.Width = 120; // // gv_daa021 @@ -661,7 +630,7 @@ this.gv_daa021.OptionsColumn.AllowEdit = false; this.gv_daa021.Tag = "query_a.daa021"; this.gv_daa021.Visible = true; - this.gv_daa021.VisibleIndex = 12; + this.gv_daa021.VisibleIndex = 11; this.gv_daa021.Width = 100; // // gridColumn3 @@ -671,7 +640,7 @@ this.gridColumn3.MinWidth = 50; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 13; + this.gridColumn3.VisibleIndex = 12; this.gridColumn3.Width = 94; // // gv_daa003 @@ -684,7 +653,7 @@ this.gv_daa003.OptionsColumn.AllowEdit = false; this.gv_daa003.Tag = "query_a.daa003"; this.gv_daa003.Visible = true; - this.gv_daa003.VisibleIndex = 14; + this.gv_daa003.VisibleIndex = 13; this.gv_daa003.Width = 150; // // gv_daa004 @@ -697,7 +666,7 @@ this.gv_daa004.OptionsColumn.AllowEdit = false; this.gv_daa004.Tag = "query_a.daa004"; this.gv_daa004.Visible = true; - this.gv_daa004.VisibleIndex = 15; + this.gv_daa004.VisibleIndex = 14; this.gv_daa004.Width = 150; // // gv_daa008 @@ -711,7 +680,7 @@ this.gv_daa008.OptionsColumn.AllowEdit = false; this.gv_daa008.Tag = "query_a.daa008"; this.gv_daa008.Visible = true; - this.gv_daa008.VisibleIndex = 16; + this.gv_daa008.VisibleIndex = 15; this.gv_daa008.Width = 50; // // gv_daa011 @@ -725,7 +694,7 @@ this.gv_daa011.OptionsColumn.AllowEdit = false; this.gv_daa011.Tag = "query_a.daa011"; this.gv_daa011.Visible = true; - this.gv_daa011.VisibleIndex = 17; + this.gv_daa011.VisibleIndex = 16; this.gv_daa011.Width = 50; // // gridColumn4 @@ -736,7 +705,7 @@ this.gridColumn4.MinWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 18; + this.gridColumn4.VisibleIndex = 17; this.gridColumn4.Width = 50; // // gv_daa010 @@ -750,7 +719,7 @@ this.gv_daa010.OptionsColumn.AllowEdit = false; this.gv_daa010.Tag = "query_a.daa010"; this.gv_daa010.Visible = true; - this.gv_daa010.VisibleIndex = 20; + this.gv_daa010.VisibleIndex = 19; this.gv_daa010.Width = 50; // // gv_daa005 @@ -764,7 +733,7 @@ this.gv_daa005.OptionsColumn.AllowEdit = false; this.gv_daa005.Tag = "query_a.daa005"; this.gv_daa005.Visible = true; - this.gv_daa005.VisibleIndex = 21; + this.gv_daa005.VisibleIndex = 20; this.gv_daa005.Width = 50; // // gv_cust @@ -777,7 +746,7 @@ this.gv_cust.OptionsColumn.AllowEdit = false; this.gv_cust.Tag = "query_a.cust"; this.gv_cust.Visible = true; - this.gv_cust.VisibleIndex = 22; + this.gv_cust.VisibleIndex = 21; this.gv_cust.Width = 100; // // gridColumn1 @@ -787,7 +756,7 @@ this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 23; + this.gridColumn1.VisibleIndex = 22; this.gridColumn1.Width = 94; // // gv_daa015 @@ -800,18 +769,8 @@ this.gv_daa015.OptionsColumn.AllowEdit = false; this.gv_daa015.Tag = "query_a.daa015"; this.gv_daa015.Visible = true; - this.gv_daa015.VisibleIndex = 24; + this.gv_daa015.VisibleIndex = 23; this.gv_daa015.Width = 94; - // - // gridColumn2 - // - this.gridColumn2.Caption = "瀹為檯绾垮埆"; - this.gridColumn2.FieldName = "sjlineName"; - this.gridColumn2.MinWidth = 50; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 25; - this.gridColumn2.Width = 94; // // gv_daa009 // @@ -823,7 +782,7 @@ this.gv_daa009.OptionsColumn.AllowEdit = false; this.gv_daa009.Tag = "query_a.daa009"; this.gv_daa009.Visible = true; - this.gv_daa009.VisibleIndex = 19; + this.gv_daa009.VisibleIndex = 18; this.gv_daa009.Width = 94; // // gv_prepareTime @@ -836,7 +795,7 @@ this.gv_prepareTime.OptionsColumn.AllowEdit = false; this.gv_prepareTime.Tag = "query_a.prepare_time"; this.gv_prepareTime.Visible = true; - this.gv_prepareTime.VisibleIndex = 26; + this.gv_prepareTime.VisibleIndex = 24; this.gv_prepareTime.Width = 180; // // gv_daa028 @@ -849,7 +808,7 @@ this.gv_daa028.OptionsColumn.AllowEdit = false; this.gv_daa028.Tag = "query_a.daa028"; this.gv_daa028.Visible = true; - this.gv_daa028.VisibleIndex = 27; + this.gv_daa028.VisibleIndex = 25; this.gv_daa028.Width = 180; // // gv_daa016 @@ -862,7 +821,7 @@ this.gv_daa016.OptionsColumn.AllowEdit = false; this.gv_daa016.Tag = "query_a.daa016"; this.gv_daa016.Visible = true; - this.gv_daa016.VisibleIndex = 28; + this.gv_daa016.VisibleIndex = 26; this.gv_daa016.Width = 180; // // gv_daa017 @@ -875,7 +834,7 @@ this.gv_daa017.OptionsColumn.AllowEdit = false; this.gv_daa017.Tag = "query_a.daa017"; this.gv_daa017.Visible = true; - this.gv_daa017.VisibleIndex = 29; + this.gv_daa017.VisibleIndex = 27; this.gv_daa017.Width = 180; // // gv_mesStartProd @@ -888,7 +847,7 @@ this.gv_mesStartProd.OptionsColumn.AllowEdit = false; this.gv_mesStartProd.Tag = "query_a.mes_start_prod"; this.gv_mesStartProd.Visible = true; - this.gv_mesStartProd.VisibleIndex = 30; + this.gv_mesStartProd.VisibleIndex = 28; this.gv_mesStartProd.Width = 180; // // gv_mesEndProd @@ -901,7 +860,7 @@ this.gv_mesEndProd.OptionsColumn.AllowEdit = false; this.gv_mesEndProd.Tag = "query_a.mes_end_prod"; this.gv_mesEndProd.Visible = true; - this.gv_mesEndProd.VisibleIndex = 31; + this.gv_mesEndProd.VisibleIndex = 29; this.gv_mesEndProd.Width = 180; // // gridColumn21 @@ -911,7 +870,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 32; + this.gridColumn21.VisibleIndex = 30; this.gridColumn21.Width = 94; // // gridColumn22 @@ -921,7 +880,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 33; + this.gridColumn22.VisibleIndex = 31; this.gridColumn22.Width = 94; // // gridColumn23 @@ -939,7 +898,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 34; + this.gridColumn24.VisibleIndex = 32; this.gridColumn24.Width = 94; // // gridColumn25 @@ -949,7 +908,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 35; + this.gridColumn25.VisibleIndex = 33; this.gridColumn25.Width = 94; // // gridColumn26 @@ -959,7 +918,7 @@ this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 36; + this.gridColumn26.VisibleIndex = 34; this.gridColumn26.Width = 94; // // pageBar1 @@ -997,6 +956,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(1267, 708); this.splitMx1.SplitterPosition = 183; this.splitMx1.TabIndex = 0; @@ -1305,38 +1265,38 @@ this.layoutControlItem18}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition1.Width = 100D; - columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition2.Width = 100D; - columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition3.Width = 100D; - columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition4.Width = 100D; + columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition16.Width = 100D; + columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition17.Width = 100D; + columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition18.Width = 100D; + columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition19.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition1, - columnDefinition2, - columnDefinition3, - columnDefinition4}); - rowDefinition1.Height = 100D; - rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition2.Height = 100D; - rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition3.Height = 100D; - rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition4.Height = 100D; - rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition5.Height = 100D; - rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition16, + columnDefinition17, + columnDefinition18, + columnDefinition19}); + 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; + 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5, - rowDefinition6}); + rowDefinition10, + rowDefinition11, + rowDefinition12, + rowDefinition13, + rowDefinition14, + rowDefinition15}); this.Root.Size = new System.Drawing.Size(1246, 188); this.Root.TextVisible = false; // @@ -1728,7 +1688,7 @@ // this.gvMx1dab007.AppearanceCell.Options.UseFont = true; this.gvMx1dab007.Caption = "宸查鐢ㄩ噺"; - this.gvMx1dab007.FieldName = "dab007"; + this.gvMx1dab007.FieldName = "ylQty"; this.gvMx1dab007.MinWidth = 50; this.gvMx1dab007.Name = "gvMx1dab007"; this.gvMx1dab007.Tag = "query_a.dab007"; @@ -1739,6 +1699,7 @@ // gridColumn14 // this.gridColumn14.Caption = "鍓╀綑鍙"; + this.gridColumn14.FieldName = "klQty"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; @@ -2178,10 +2139,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -2204,10 +2165,11 @@ this.layoutMx99.Controls.Add(this.txt_printRemark); this.layoutMx99.Controls.Add(this.txt_kQty); this.layoutMx99.Controls.Add(this.txt_yQty); + this.layoutMx99.Controls.Add(this.txt_zQty); this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx99.Location = new System.Drawing.Point(0, 0); this.layoutMx99.Name = "layoutMx99"; - this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(429, 530, 812, 500); + this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 530, 812, 500); this.layoutMx99.Root = this.layoutControlGroup1; this.layoutMx99.Size = new System.Drawing.Size(1265, 82); this.layoutMx99.TabIndex = 0; @@ -2215,53 +2177,55 @@ // // radOut // - this.radOut.Location = new System.Drawing.Point(813, 10); + this.radOut.Location = new System.Drawing.Point(853, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; + this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鑷姩涓斿嵃浣欓噺"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鑷姩涓嶅嵃浣欓噺"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙栨秷鑷姩")}); - this.radOut.Size = new System.Drawing.Size(352, 28); + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")}); + this.radOut.Size = new System.Drawing.Size(248, 31); this.radOut.StyleController = this.layoutMx99; this.radOut.TabIndex = 473; // // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(812, 41); + this.ucBtnPrint1.Location = new System.Drawing.Point(851, 41); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(265, 31); + this.ucBtnPrint1.Size = new System.Drawing.Size(278, 31); this.ucBtnPrint1.TabIndex = 464; // // txt_iCount_1 // - this.txt_iCount_1.Location = new System.Drawing.Point(633, 43); + this.txt_iCount_1.Location = new System.Drawing.Point(659, 43); this.txt_iCount_1.Name = "txt_iCount_1"; this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; - this.txt_iCount_1.Size = new System.Drawing.Size(176, 24); + this.txt_iCount_1.Properties.ReadOnly = true; + this.txt_iCount_1.Size = new System.Drawing.Size(189, 24); this.txt_iCount_1.StyleController = this.layoutMx99; this.txt_iCount_1.TabIndex = 332; this.txt_iCount_1.Tag = "readOnly-1"; // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(366, 43); + this.txt_psnQty_1.Location = new System.Drawing.Point(659, 12); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(176, 24); + this.txt_psnQty_1.Size = new System.Drawing.Size(189, 24); this.txt_psnQty_1.StyleController = this.layoutMx99; this.txt_psnQty_1.TabIndex = 330; this.txt_psnQty_1.Tag = "readOnly-1"; // // txt_printRemark // - this.txt_printRemark.Location = new System.Drawing.Point(633, 12); + this.txt_printRemark.Location = new System.Drawing.Point(379, 43); this.txt_printRemark.Name = "txt_printRemark"; this.txt_printRemark.Properties.Appearance.Options.UseFont = true; - this.txt_printRemark.Size = new System.Drawing.Size(176, 24); + this.txt_printRemark.Size = new System.Drawing.Size(189, 24); this.txt_printRemark.StyleController = this.layoutMx99; this.txt_printRemark.TabIndex = 334; this.txt_printRemark.Tag = "readOnly-1"; @@ -2269,139 +2233,112 @@ // txt_kQty // this.txt_kQty.EditValue = ""; - this.txt_kQty.Location = new System.Drawing.Point(366, 12); + this.txt_kQty.Location = new System.Drawing.Point(379, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.Options.UseFont = true; this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(176, 24); + this.txt_kQty.Size = new System.Drawing.Size(189, 24); this.txt_kQty.StyleController = this.layoutMx99; this.txt_kQty.TabIndex = 472; this.txt_kQty.Tag = "readonly"; // // txt_yQty // - this.txt_yQty.Location = new System.Drawing.Point(99, 12); + this.txt_yQty.Location = new System.Drawing.Point(99, 43); this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; - this.txt_yQty.Size = new System.Drawing.Size(176, 24); + this.txt_yQty.Size = new System.Drawing.Size(189, 24); this.txt_yQty.StyleController = this.layoutMx99; this.txt_yQty.TabIndex = 470; this.txt_yQty.Tag = "readonly"; + // + // txt_zQty + // + this.txt_zQty.Location = new System.Drawing.Point(99, 12); + this.txt_zQty.Name = "txt_zQty"; + this.txt_zQty.Properties.ReadOnly = true; + this.txt_zQty.Size = new System.Drawing.Size(189, 24); + this.txt_zQty.StyleController = this.layoutMx99; + this.txt_zQty.TabIndex = 474; // // layoutControlGroup1 // this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup1.GroupBordersVisible = false; this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem22, this.layoutControlItem23, - this.layoutControlItem21, - this.layoutControlItem24, this.layoutControlItem25, this.layoutControlItem35, - this.layoutControlItem26}); + this.layoutControlItem26, + this.layoutControlItem22, + this.layoutControlItem36, + this.layoutControlItem21, + this.layoutControlItem24}); this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup1.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; - columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize; - columnDefinition9.Width = 177D; + columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition20.Width = 100D; + columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition21.Width = 100D; + columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition22.Width = 100D; + columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition23.Width = 100D; + columnDefinition24.SizeType = System.Windows.Forms.SizeType.AutoSize; + columnDefinition24.Width = 125D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8, - columnDefinition9}); - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition20, + columnDefinition21, + columnDefinition22, + columnDefinition23, + columnDefinition24}); + rowDefinition16.Height = 100D; + rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition17.Height = 100D; + rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7, - rowDefinition8}); + rowDefinition16, + rowDefinition17}); this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82); this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem22 - // - this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true; - this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.layoutControlItem22.Control = this.txt_yQty; - this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(267, 31); - this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem23 // this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem23.Control = this.txt_kQty; - this.layoutControlItem23.Location = new System.Drawing.Point(267, 0); + this.layoutControlItem23.Location = new System.Drawing.Point(280, 0); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(267, 31); + this.layoutControlItem23.Size = new System.Drawing.Size(280, 31); this.layoutControlItem23.Text = "鍙墦鍗版暟閲�"; this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem21 - // - this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true; - this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.layoutControlItem21.Control = this.txt_printRemark; - this.layoutControlItem21.Location = new System.Drawing.Point(534, 0); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem21.Size = new System.Drawing.Size(267, 31); - this.layoutControlItem21.Text = "鎵撳嵃澶囨敞"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem24 - // - this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true; - this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.layoutControlItem24.Control = this.txt_psnQty_1; - this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�"; - this.layoutControlItem24.Location = new System.Drawing.Point(267, 31); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem24.Size = new System.Drawing.Size(267, 31); - this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem25 // this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem25.Control = this.txt_iCount_1; - this.layoutControlItem25.Location = new System.Drawing.Point(534, 31); + this.layoutControlItem25.Location = new System.Drawing.Point(560, 31); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem25.Size = new System.Drawing.Size(267, 31); + this.layoutControlItem25.Size = new System.Drawing.Size(280, 31); this.layoutControlItem25.Text = "鎵撳嵃寮犳暟"; this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.radOut; - this.layoutControlItem35.Location = new System.Drawing.Point(801, 0); - this.layoutControlItem35.MaxSize = new System.Drawing.Size(354, 28); - this.layoutControlItem35.MinSize = new System.Drawing.Size(354, 20); + this.layoutControlItem35.Location = new System.Drawing.Point(840, 0); + this.layoutControlItem35.MaxSize = new System.Drawing.Size(251, 0); + this.layoutControlItem35.MinSize = new System.Drawing.Size(221, 20); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0); - this.layoutControlItem35.Size = new System.Drawing.Size(444, 31); + this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); + this.layoutControlItem35.Size = new System.Drawing.Size(405, 31); this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem35.Text = "鑷姩璁$畻"; this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0); @@ -2412,15 +2349,62 @@ this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem26.Control = this.ucBtnPrint1; - this.layoutControlItem26.Location = new System.Drawing.Point(801, 31); + this.layoutControlItem26.Location = new System.Drawing.Point(840, 31); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem26.Size = new System.Drawing.Size(267, 31); + this.layoutControlItem26.Size = new System.Drawing.Size(280, 31); this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃"; this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem26.TextVisible = false; + // + // layoutControlItem22 + // + this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true; + this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.layoutControlItem22.Control = this.txt_yQty; + this.layoutControlItem22.Location = new System.Drawing.Point(0, 31); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem22.Size = new System.Drawing.Size(280, 31); + this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem36 + // + this.layoutControlItem36.Control = this.txt_zQty; + this.layoutControlItem36.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem36.Name = "layoutControlItem36"; + this.layoutControlItem36.Size = new System.Drawing.Size(280, 31); + this.layoutControlItem36.Text = "宸ュ崟鎬婚噺"; + this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem21 + // + this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true; + this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.layoutControlItem21.Control = this.txt_printRemark; + this.layoutControlItem21.Location = new System.Drawing.Point(280, 31); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem21.Size = new System.Drawing.Size(280, 31); + this.layoutControlItem21.Text = "鎵撳嵃澶囨敞"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true; + this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.layoutControlItem24.Control = this.txt_psnQty_1; + this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�"; + this.layoutControlItem24.Location = new System.Drawing.Point(560, 0); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem24.Size = new System.Drawing.Size(280, 31); + this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); // // xtraTabPage3 // @@ -2568,10 +2552,11 @@ this.layoutMx98.Controls.Add(this.txt_kQty98); this.layoutMx98.Controls.Add(this.txt_printRemark98); this.layoutMx98.Controls.Add(this.txt_iCount_98); + this.layoutMx98.Controls.Add(this.txt_zQty98); this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx98.Location = new System.Drawing.Point(0, 0); this.layoutMx98.Name = "layoutMx98"; - this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(199, 178, 812, 500); + this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500); this.layoutMx98.Root = this.layoutControlGroup2; this.layoutMx98.Size = new System.Drawing.Size(1265, 54); this.layoutMx98.TabIndex = 0; @@ -2580,132 +2565,155 @@ // ucBtnPrint98 // this.ucBtnPrint98.guidKey = null; - this.ucBtnPrint98.Location = new System.Drawing.Point(1007, 10); + this.ucBtnPrint98.Location = new System.Drawing.Point(1046, 10); this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint98.Name = "ucBtnPrint98"; this.ucBtnPrint98.rptParameter = null; - this.ucBtnPrint98.Size = new System.Drawing.Size(247, 34); + this.ucBtnPrint98.Size = new System.Drawing.Size(208, 34); this.ucBtnPrint98.TabIndex = 8; // // txt_yQty98 // - this.txt_yQty98.Location = new System.Drawing.Point(114, 12); + this.txt_yQty98.Location = new System.Drawing.Point(321, 12); this.txt_yQty98.Name = "txt_yQty98"; this.txt_yQty98.Properties.ReadOnly = true; - this.txt_yQty98.Size = new System.Drawing.Size(143, 24); + this.txt_yQty98.Size = new System.Drawing.Size(101, 24); this.txt_yQty98.StyleController = this.layoutMx98; this.txt_yQty98.TabIndex = 4; // // txt_kQty98 // - this.txt_kQty98.Location = new System.Drawing.Point(363, 12); + this.txt_kQty98.Location = new System.Drawing.Point(528, 12); this.txt_kQty98.Name = "txt_kQty98"; this.txt_kQty98.Properties.ReadOnly = true; - this.txt_kQty98.Size = new System.Drawing.Size(143, 24); + this.txt_kQty98.Size = new System.Drawing.Size(101, 24); this.txt_kQty98.StyleController = this.layoutMx98; this.txt_kQty98.TabIndex = 5; // // txt_printRemark98 // - this.txt_printRemark98.Location = new System.Drawing.Point(612, 12); + this.txt_printRemark98.Location = new System.Drawing.Point(735, 12); this.txt_printRemark98.Name = "txt_printRemark98"; - this.txt_printRemark98.Size = new System.Drawing.Size(143, 24); + this.txt_printRemark98.Size = new System.Drawing.Size(101, 24); this.txt_printRemark98.StyleController = this.layoutMx98; this.txt_printRemark98.TabIndex = 6; // // txt_iCount_98 // - this.txt_iCount_98.Location = new System.Drawing.Point(861, 12); + this.txt_iCount_98.Location = new System.Drawing.Point(942, 12); this.txt_iCount_98.Name = "txt_iCount_98"; - this.txt_iCount_98.Size = new System.Drawing.Size(143, 24); + this.txt_iCount_98.Size = new System.Drawing.Size(101, 24); this.txt_iCount_98.StyleController = this.layoutMx98; this.txt_iCount_98.TabIndex = 7; + // + // txt_zQty98 + // + this.txt_zQty98.Location = new System.Drawing.Point(114, 12); + this.txt_zQty98.Name = "txt_zQty98"; + this.txt_zQty98.Properties.ReadOnly = true; + this.txt_zQty98.Size = new System.Drawing.Size(101, 24); + this.txt_zQty98.StyleController = this.layoutMx98; + this.txt_zQty98.TabIndex = 9; // // layoutControlGroup2 // this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup2.GroupBordersVisible = false; this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem30, - this.layoutControlItem31, - this.layoutControlItem32, + this.layoutControlItem34, this.layoutControlItem33, - this.layoutControlItem34}); + this.layoutControlItem32, + this.layoutControlItem31, + this.layoutControlItem30, + this.layoutControlItem37}); this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup2.Name = "Root"; - 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; - columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition13.Width = 100D; - columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition14.Width = 100D; + columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition25.Width = 100D; + columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition26.Width = 100D; + columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition27.Width = 100D; + columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition28.Width = 100D; + columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition29.Width = 100D; + columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition30.Width = 100D; this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition10, - columnDefinition11, - columnDefinition12, - columnDefinition13, - columnDefinition14}); - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition25, + columnDefinition26, + columnDefinition27, + columnDefinition28, + columnDefinition29, + columnDefinition30}); + rowDefinition18.Height = 100D; + rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition9}); + rowDefinition18}); this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54); this.layoutControlGroup2.TextVisible = false; - // - // layoutControlItem30 - // - this.layoutControlItem30.Control = this.txt_yQty98; - this.layoutControlItem30.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.Size = new System.Drawing.Size(249, 34); - this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�"; - this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem31 - // - this.layoutControlItem31.Control = this.txt_kQty98; - this.layoutControlItem31.Location = new System.Drawing.Point(249, 0); - this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem31.Size = new System.Drawing.Size(249, 34); - this.layoutControlItem31.Text = "鍙墦鍗版暟閲�"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem32 - // - this.layoutControlItem32.Control = this.txt_printRemark98; - this.layoutControlItem32.Location = new System.Drawing.Point(498, 0); - this.layoutControlItem32.Name = "layoutControlItem32"; - this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem32.Size = new System.Drawing.Size(249, 34); - this.layoutControlItem32.Text = "鎵撳嵃澶囨敞"; - this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem33 - // - this.layoutControlItem33.Control = this.txt_iCount_98; - this.layoutControlItem33.Location = new System.Drawing.Point(747, 0); - this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem33.Size = new System.Drawing.Size(249, 34); - this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟"; - this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem34 // this.layoutControlItem34.Control = this.ucBtnPrint98; - this.layoutControlItem34.Location = new System.Drawing.Point(996, 0); + this.layoutControlItem34.Location = new System.Drawing.Point(1035, 0); this.layoutControlItem34.Name = "layoutControlItem34"; - this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4; + this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5; this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem34.Size = new System.Drawing.Size(249, 34); + this.layoutControlItem34.Size = new System.Drawing.Size(210, 34); this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem34.TextVisible = false; + // + // layoutControlItem33 + // + this.layoutControlItem33.Control = this.txt_iCount_98; + this.layoutControlItem33.Location = new System.Drawing.Point(828, 0); + this.layoutControlItem33.Name = "layoutControlItem33"; + this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4; + this.layoutControlItem33.Size = new System.Drawing.Size(207, 34); + this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟"; + this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem32 + // + this.layoutControlItem32.Control = this.txt_printRemark98; + this.layoutControlItem32.Location = new System.Drawing.Point(621, 0); + this.layoutControlItem32.Name = "layoutControlItem32"; + this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem32.Size = new System.Drawing.Size(207, 34); + this.layoutControlItem32.Text = "鎵撳嵃澶囨敞"; + this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.txt_kQty98; + this.layoutControlItem31.Location = new System.Drawing.Point(414, 0); + this.layoutControlItem31.Name = "layoutControlItem31"; + this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem31.Size = new System.Drawing.Size(207, 34); + this.layoutControlItem31.Text = "鍙墦鍗版暟閲�"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem30 + // + this.layoutControlItem30.Control = this.txt_yQty98; + this.layoutControlItem30.Location = new System.Drawing.Point(207, 0); + this.layoutControlItem30.Name = "layoutControlItem30"; + this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem30.Size = new System.Drawing.Size(207, 34); + this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�"; + this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem37 + // + this.layoutControlItem37.Control = this.txt_zQty98; + this.layoutControlItem37.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem37.Name = "layoutControlItem37"; + this.layoutControlItem37.Size = new System.Drawing.Size(207, 34); + this.layoutControlItem37.Text = "宸ュ崟鎬婚噺"; + this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18); // // xtraTabPage4 // @@ -2772,8 +2780,8 @@ // gridColumn41 // this.gridColumn41.AppearanceCell.Options.UseFont = true; - this.gridColumn41.Caption = "杩芥函鐮�"; - this.gridColumn41.FieldName = "barCode"; + this.gridColumn41.Caption = "鍚庣洊鐮�"; + this.gridColumn41.FieldName = "itemBarcode"; this.gridColumn41.MinWidth = 50; this.gridColumn41.Name = "gridColumn41"; this.gridColumn41.Tag = "query_a.ITEM_BARCODE"; @@ -2819,8 +2827,8 @@ // // gridColumn47 // - this.gridColumn47.Caption = "绾垮埆ID"; - this.gridColumn47.FieldName = "lineId"; + this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�"; + this.gridColumn47.FieldName = "aboutTbBarcode"; this.gridColumn47.MinWidth = 25; this.gridColumn47.Name = "gridColumn47"; this.gridColumn47.Visible = true; @@ -2829,8 +2837,8 @@ // // gridColumn48 // - this.gridColumn48.Caption = "绾垮埆鍚嶇О"; - this.gridColumn48.FieldName = "xtName"; + this.gridColumn48.Caption = "宸茬粦杩芥函鐮�"; + this.gridColumn48.FieldName = "aboutTracBarcode"; this.gridColumn48.MinWidth = 25; this.gridColumn48.Name = "gridColumn48"; this.gridColumn48.Visible = true; @@ -2849,7 +2857,7 @@ // ucBtnPrint100 // this.ucBtnPrint100.guidKey = null; - this.ucBtnPrint100.Location = new System.Drawing.Point(20, 9); + this.ucBtnPrint100.Location = new System.Drawing.Point(20, 10); this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint100.Name = "ucBtnPrint100"; this.ucBtnPrint100.rptParameter = null; @@ -2948,14 +2956,16 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit(); @@ -2966,12 +2976,14 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit(); this.xtraTabPage4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit(); @@ -2989,10 +3001,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gv_daa027; 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 gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gv_daa018; @@ -3010,7 +3019,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_cust; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gv_daa015; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gv_daa009; private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime; private DevExpress.XtraGrid.Columns.GridColumn gv_daa028; @@ -3127,7 +3135,6 @@ private DevExpress.XtraEditors.TextEdit txt_kQty; private DevExpress.XtraEditors.TextEdit txt_yQty; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private UserControl.UcBtnPrint ucBtnPrint1; private DevExpress.XtraEditors.TextEdit txt_iCount_1; @@ -3152,11 +3159,6 @@ private DevExpress.XtraEditors.TextEdit txt_kQty98; private DevExpress.XtraEditors.TextEdit txt_printRemark98; private DevExpress.XtraEditors.TextEdit txt_iCount_98; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; private DevExpress.XtraGrid.Columns.GridColumn gridColumn34; private DevExpress.XtraGrid.Columns.GridColumn gridColumn35; private DevExpress.Utils.ToolTipController tips; @@ -3166,8 +3168,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraEditors.RadioGroup radOut; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; @@ -3184,5 +3184,17 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; private UserControl.UcBtnPrint ucBtnPrint100; + private DevExpress.XtraEditors.TextEdit txt_zQty; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36; + private DevExpress.XtraEditors.TextEdit txt_zQty98; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; } } \ No newline at end of file -- Gitblit v1.9.3