From 87dcde0bc10092a35a4c775316a72a312646d3df Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 11 四月 2025 17:39:52 +0800 Subject: [PATCH] 打印后盖码 --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 942 ++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 587 insertions(+), 355 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs index 99722b4..ac7360f 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs @@ -29,34 +29,35 @@ /// </summary> private void InitializeComponent() { - 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(); + 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.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.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.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition(); - 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 rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -107,7 +108,6 @@ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.lbGuid = new System.Windows.Forms.Label(); - this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline(); this.txt_daa009 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa013 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa001 = new DevExpress.XtraEditors.TextEdit(); @@ -117,7 +117,7 @@ this.txt_daa028 = new DevExpress.XtraEditors.TextEdit(); this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit(); this.txt_daa014 = new DevExpress.XtraEditors.TextEdit(); - this.txt_daa022Txt = new DevExpress.XtraEditors.TextEdit(); + this.txt_daa022Remark = new DevExpress.XtraEditors.TextEdit(); this.txt_daa010 = new DevExpress.XtraEditors.TextEdit(); this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit(); this.txt_daa011 = new DevExpress.XtraEditors.TextEdit(); @@ -129,6 +129,7 @@ this.txt_daa003 = new DevExpress.XtraEditors.TextEdit(); this.txt_dwName = new DevExpress.XtraEditors.TextEdit(); this.txt_daa004 = new DevExpress.XtraEditors.TextEdit(); + this.txt_daa015 = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -149,10 +150,10 @@ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -208,6 +209,7 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.panMx99 = new System.Windows.Forms.Panel(); this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl(); + this.radOut = new DevExpress.XtraEditors.RadioGroup(); this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); @@ -220,6 +222,7 @@ 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.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx3 = new DevExpress.XtraGrid.GridControl(); @@ -245,6 +248,20 @@ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx4 = new DevExpress.XtraGrid.GridControl(); + this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn(); + 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(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -273,7 +290,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit(); @@ -285,6 +302,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); @@ -305,10 +323,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -321,6 +339,7 @@ this.panMx99.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit(); this.layoutMx99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit(); @@ -332,6 +351,7 @@ ((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(); this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit(); @@ -349,6 +369,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + this.xtraTabPage4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit(); + this.panMx100.SuspendLayout(); this.SuspendLayout(); // // toolBarMenu1 @@ -362,7 +386,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1269, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -373,7 +397,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1128, 740); + this.xtraTabControl1.Size = new System.Drawing.Size(1269, 740); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -383,7 +407,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1126, 708); + this.xtraTabPage1.Size = new System.Drawing.Size(1267, 708); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -402,7 +426,7 @@ // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; - this.split1.Size = new System.Drawing.Size(1126, 708); + this.split1.Size = new System.Drawing.Size(1267, 708); this.split1.SplitterPosition = 696; this.split1.TabIndex = 0; // @@ -412,7 +436,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1126, 657); + this.gcMain1.Size = new System.Drawing.Size(1267, 657); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -518,8 +542,6 @@ this.gridColumn8.MinWidth = 50; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Tag = "query_a.jabs"; - this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 3; this.gridColumn8.Width = 50; // // gridColumn9 @@ -531,7 +553,7 @@ this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Tag = "query_a.jabs"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 4; + this.gridColumn9.VisibleIndex = 3; this.gridColumn9.Width = 50; // // gridColumn10 @@ -543,7 +565,7 @@ this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Tag = "query_a.jabs"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 5; + this.gridColumn10.VisibleIndex = 4; this.gridColumn10.Width = 50; // // gridColumn11 @@ -555,7 +577,7 @@ this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Tag = "query_a.jabs"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 6; + this.gridColumn11.VisibleIndex = 5; this.gridColumn11.Width = 50; // // gridColumn12 @@ -567,7 +589,7 @@ this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Tag = "query_a.jabs"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 7; + this.gridColumn12.VisibleIndex = 6; this.gridColumn12.Width = 50; // // gridColumn6 @@ -579,17 +601,17 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "query_a.jabs"; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 8; + this.gridColumn6.VisibleIndex = 7; this.gridColumn6.Width = 50; // // gridColumn27 // this.gridColumn27.Caption = "澶囨枡绾у埆"; - this.gridColumn27.FieldName = "daa022Txt"; + this.gridColumn27.FieldName = "daa022Remark"; this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 9; + this.gridColumn27.VisibleIndex = 8; this.gridColumn27.Width = 94; // // gv_daa018 @@ -602,7 +624,7 @@ this.gv_daa018.OptionsColumn.AllowEdit = false; this.gv_daa018.Tag = "query_a.daa018"; this.gv_daa018.Visible = true; - this.gv_daa018.VisibleIndex = 10; + this.gv_daa018.VisibleIndex = 9; this.gv_daa018.Width = 90; // // gridColoun100 @@ -613,7 +635,7 @@ this.gridColoun100.Name = "gridColoun100"; this.gridColoun100.Tag = "org.fnamber"; this.gridColoun100.Visible = true; - this.gridColoun100.VisibleIndex = 11; + this.gridColoun100.VisibleIndex = 10; this.gridColoun100.Width = 250; // // gv_daa001 @@ -626,7 +648,7 @@ this.gv_daa001.OptionsColumn.AllowEdit = false; this.gv_daa001.Tag = "query_a.daa001"; this.gv_daa001.Visible = true; - this.gv_daa001.VisibleIndex = 12; + this.gv_daa001.VisibleIndex = 11; this.gv_daa001.Width = 120; // // gv_daa021 @@ -639,7 +661,7 @@ this.gv_daa021.OptionsColumn.AllowEdit = false; this.gv_daa021.Tag = "query_a.daa021"; this.gv_daa021.Visible = true; - this.gv_daa021.VisibleIndex = 13; + this.gv_daa021.VisibleIndex = 12; this.gv_daa021.Width = 100; // // gridColumn3 @@ -649,7 +671,7 @@ this.gridColumn3.MinWidth = 50; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 14; + this.gridColumn3.VisibleIndex = 13; this.gridColumn3.Width = 94; // // gv_daa003 @@ -662,7 +684,7 @@ this.gv_daa003.OptionsColumn.AllowEdit = false; this.gv_daa003.Tag = "query_a.daa003"; this.gv_daa003.Visible = true; - this.gv_daa003.VisibleIndex = 15; + this.gv_daa003.VisibleIndex = 14; this.gv_daa003.Width = 150; // // gv_daa004 @@ -675,7 +697,7 @@ this.gv_daa004.OptionsColumn.AllowEdit = false; this.gv_daa004.Tag = "query_a.daa004"; this.gv_daa004.Visible = true; - this.gv_daa004.VisibleIndex = 16; + this.gv_daa004.VisibleIndex = 15; this.gv_daa004.Width = 150; // // gv_daa008 @@ -689,7 +711,7 @@ this.gv_daa008.OptionsColumn.AllowEdit = false; this.gv_daa008.Tag = "query_a.daa008"; this.gv_daa008.Visible = true; - this.gv_daa008.VisibleIndex = 17; + this.gv_daa008.VisibleIndex = 16; this.gv_daa008.Width = 50; // // gv_daa011 @@ -703,7 +725,7 @@ this.gv_daa011.OptionsColumn.AllowEdit = false; this.gv_daa011.Tag = "query_a.daa011"; this.gv_daa011.Visible = true; - this.gv_daa011.VisibleIndex = 18; + this.gv_daa011.VisibleIndex = 17; this.gv_daa011.Width = 50; // // gridColumn4 @@ -714,7 +736,7 @@ this.gridColumn4.MinWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 19; + this.gridColumn4.VisibleIndex = 18; this.gridColumn4.Width = 50; // // gv_daa010 @@ -728,7 +750,7 @@ this.gv_daa010.OptionsColumn.AllowEdit = false; this.gv_daa010.Tag = "query_a.daa010"; this.gv_daa010.Visible = true; - this.gv_daa010.VisibleIndex = 21; + this.gv_daa010.VisibleIndex = 20; this.gv_daa010.Width = 50; // // gv_daa005 @@ -742,7 +764,7 @@ this.gv_daa005.OptionsColumn.AllowEdit = false; this.gv_daa005.Tag = "query_a.daa005"; this.gv_daa005.Visible = true; - this.gv_daa005.VisibleIndex = 22; + this.gv_daa005.VisibleIndex = 21; this.gv_daa005.Width = 50; // // gv_cust @@ -755,7 +777,7 @@ this.gv_cust.OptionsColumn.AllowEdit = false; this.gv_cust.Tag = "query_a.cust"; this.gv_cust.Visible = true; - this.gv_cust.VisibleIndex = 23; + this.gv_cust.VisibleIndex = 22; this.gv_cust.Width = 100; // // gridColumn1 @@ -765,7 +787,7 @@ this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 24; + this.gridColumn1.VisibleIndex = 23; this.gridColumn1.Width = 94; // // gv_daa015 @@ -778,7 +800,7 @@ this.gv_daa015.OptionsColumn.AllowEdit = false; this.gv_daa015.Tag = "query_a.daa015"; this.gv_daa015.Visible = true; - this.gv_daa015.VisibleIndex = 25; + this.gv_daa015.VisibleIndex = 24; this.gv_daa015.Width = 94; // // gridColumn2 @@ -788,7 +810,7 @@ this.gridColumn2.MinWidth = 50; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 26; + this.gridColumn2.VisibleIndex = 25; this.gridColumn2.Width = 94; // // gv_daa009 @@ -801,7 +823,7 @@ this.gv_daa009.OptionsColumn.AllowEdit = false; this.gv_daa009.Tag = "query_a.daa009"; this.gv_daa009.Visible = true; - this.gv_daa009.VisibleIndex = 20; + this.gv_daa009.VisibleIndex = 19; this.gv_daa009.Width = 94; // // gv_prepareTime @@ -814,7 +836,7 @@ this.gv_prepareTime.OptionsColumn.AllowEdit = false; this.gv_prepareTime.Tag = "query_a.prepare_time"; this.gv_prepareTime.Visible = true; - this.gv_prepareTime.VisibleIndex = 27; + this.gv_prepareTime.VisibleIndex = 26; this.gv_prepareTime.Width = 180; // // gv_daa028 @@ -827,7 +849,7 @@ this.gv_daa028.OptionsColumn.AllowEdit = false; this.gv_daa028.Tag = "query_a.daa028"; this.gv_daa028.Visible = true; - this.gv_daa028.VisibleIndex = 28; + this.gv_daa028.VisibleIndex = 27; this.gv_daa028.Width = 180; // // gv_daa016 @@ -840,7 +862,7 @@ this.gv_daa016.OptionsColumn.AllowEdit = false; this.gv_daa016.Tag = "query_a.daa016"; this.gv_daa016.Visible = true; - this.gv_daa016.VisibleIndex = 29; + this.gv_daa016.VisibleIndex = 28; this.gv_daa016.Width = 180; // // gv_daa017 @@ -853,7 +875,7 @@ this.gv_daa017.OptionsColumn.AllowEdit = false; this.gv_daa017.Tag = "query_a.daa017"; this.gv_daa017.Visible = true; - this.gv_daa017.VisibleIndex = 30; + this.gv_daa017.VisibleIndex = 29; this.gv_daa017.Width = 180; // // gv_mesStartProd @@ -866,7 +888,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 = 31; + this.gv_mesStartProd.VisibleIndex = 30; this.gv_mesStartProd.Width = 180; // // gv_mesEndProd @@ -879,7 +901,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 = 32; + this.gv_mesEndProd.VisibleIndex = 31; this.gv_mesEndProd.Width = 180; // // gridColumn21 @@ -889,7 +911,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 33; + this.gridColumn21.VisibleIndex = 32; this.gridColumn21.Width = 94; // // gridColumn22 @@ -899,7 +921,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 34; + this.gridColumn22.VisibleIndex = 33; this.gridColumn22.Width = 94; // // gridColumn23 @@ -917,7 +939,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 35; + this.gridColumn24.VisibleIndex = 34; this.gridColumn24.Width = 94; // // gridColumn25 @@ -927,7 +949,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 36; + this.gridColumn25.VisibleIndex = 35; this.gridColumn25.Width = 94; // // gridColumn26 @@ -937,7 +959,7 @@ this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 37; + this.gridColumn26.VisibleIndex = 36; this.gridColumn26.Width = 94; // // pageBar1 @@ -948,7 +970,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1126, 39); + this.pageBar1.Size = new System.Drawing.Size(1267, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -956,7 +978,7 @@ // this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1126, 708); + this.xtraTabPage2.Size = new System.Drawing.Size(1267, 708); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -975,14 +997,13 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; - this.splitMx1.Size = new System.Drawing.Size(1126, 708); + this.splitMx1.Size = new System.Drawing.Size(1267, 708); this.splitMx1.SplitterPosition = 183; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.lbGuid); - this.layoutMx1.Controls.Add(this.txt_sjXt); this.layoutMx1.Controls.Add(this.txt_daa009); this.layoutMx1.Controls.Add(this.txt_daa013); this.layoutMx1.Controls.Add(this.txt_daa001); @@ -992,7 +1013,7 @@ this.layoutMx1.Controls.Add(this.txt_daa028); this.layoutMx1.Controls.Add(this.txt_mesStartProd); this.layoutMx1.Controls.Add(this.txt_daa014); - this.layoutMx1.Controls.Add(this.txt_daa022Txt); + this.layoutMx1.Controls.Add(this.txt_daa022Remark); this.layoutMx1.Controls.Add(this.txt_daa010); this.layoutMx1.Controls.Add(this.txt_mesEndProd); this.layoutMx1.Controls.Add(this.txt_daa011); @@ -1004,6 +1025,7 @@ this.layoutMx1.Controls.Add(this.txt_daa003); this.layoutMx1.Controls.Add(this.txt_dwName); this.layoutMx1.Controls.Add(this.txt_daa004); + this.layoutMx1.Controls.Add(this.txt_daa015); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem29}); @@ -1011,7 +1033,7 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 183); + this.layoutMx1.Size = new System.Drawing.Size(1267, 183); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -1024,30 +1046,22 @@ this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // - // txt_sjXt - // - this.txt_sjXt.IsReadly = false; - this.txt_sjXt.Location = new System.Drawing.Point(385, 152); - this.txt_sjXt.Name = "txt_sjXt"; - this.txt_sjXt.Size = new System.Drawing.Size(165, 24); - this.txt_sjXt.TabIndex = 334; - // // txt_daa009 // - this.txt_daa009.Location = new System.Drawing.Point(656, 124); + this.txt_daa009.Location = new System.Drawing.Point(420, 152); this.txt_daa009.Name = "txt_daa009"; this.txt_daa009.Properties.Appearance.Options.UseFont = true; - this.txt_daa009.Size = new System.Drawing.Size(165, 24); + this.txt_daa009.Size = new System.Drawing.Size(506, 24); this.txt_daa009.StyleController = this.layoutMx1; this.txt_daa009.TabIndex = 240; this.txt_daa009.Tag = ""; // // txt_daa013 // - this.txt_daa013.Location = new System.Drawing.Point(656, 96); + this.txt_daa013.Location = new System.Drawing.Point(726, 124); this.txt_daa013.Name = "txt_daa013"; this.txt_daa013.Properties.Appearance.Options.UseFont = true; - this.txt_daa013.Size = new System.Drawing.Size(165, 24); + this.txt_daa013.Size = new System.Drawing.Size(200, 24); this.txt_daa013.StyleController = this.layoutMx1; this.txt_daa013.TabIndex = 472; this.txt_daa013.Tag = "readonly"; @@ -1057,27 +1071,27 @@ this.txt_daa001.Location = new System.Drawing.Point(114, 12); this.txt_daa001.Name = "txt_daa001"; this.txt_daa001.Properties.Appearance.Options.UseFont = true; - this.txt_daa001.Size = new System.Drawing.Size(165, 24); + this.txt_daa001.Size = new System.Drawing.Size(200, 24); this.txt_daa001.StyleController = this.layoutMx1; this.txt_daa001.TabIndex = 216; this.txt_daa001.Tag = "readonly"; // // textEdit1 // - this.textEdit1.Location = new System.Drawing.Point(385, 40); + this.textEdit1.Location = new System.Drawing.Point(420, 40); this.textEdit1.Name = "textEdit1"; this.textEdit1.Properties.Appearance.Options.UseFont = true; - this.textEdit1.Size = new System.Drawing.Size(165, 24); + this.textEdit1.Size = new System.Drawing.Size(200, 24); this.textEdit1.StyleController = this.layoutMx1; this.textEdit1.TabIndex = 467; this.textEdit1.Tag = "readonly"; // // txt_daa008 // - this.txt_daa008.Location = new System.Drawing.Point(656, 12); + this.txt_daa008.Location = new System.Drawing.Point(726, 12); this.txt_daa008.Name = "txt_daa008"; this.txt_daa008.Properties.Appearance.Options.UseFont = true; - this.txt_daa008.Size = new System.Drawing.Size(165, 24); + this.txt_daa008.Size = new System.Drawing.Size(200, 24); this.txt_daa008.StyleController = this.layoutMx1; this.txt_daa008.TabIndex = 235; this.txt_daa008.Tag = "readonly"; @@ -1087,27 +1101,27 @@ this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68); this.txt_saleOrderNo.Name = "txt_saleOrderNo"; this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true; - this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 24); + this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24); this.txt_saleOrderNo.StyleController = this.layoutMx1; this.txt_saleOrderNo.TabIndex = 465; this.txt_saleOrderNo.Tag = "readonly"; // // txt_daa028 // - this.txt_daa028.Location = new System.Drawing.Point(385, 68); + this.txt_daa028.Location = new System.Drawing.Point(420, 68); this.txt_daa028.Name = "txt_daa028"; this.txt_daa028.Properties.Appearance.Options.UseFont = true; - this.txt_daa028.Size = new System.Drawing.Size(165, 24); + this.txt_daa028.Size = new System.Drawing.Size(200, 24); this.txt_daa028.StyleController = this.layoutMx1; this.txt_daa028.TabIndex = 341; this.txt_daa028.Tag = "readonly"; // // txt_mesStartProd // - this.txt_mesStartProd.Location = new System.Drawing.Point(927, 40); + this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40); this.txt_mesStartProd.Name = "txt_mesStartProd"; this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true; - this.txt_mesStartProd.Size = new System.Drawing.Size(166, 24); + this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24); this.txt_mesStartProd.StyleController = this.layoutMx1; this.txt_mesStartProd.TabIndex = 336; this.txt_mesStartProd.Tag = "readonly"; @@ -1117,67 +1131,67 @@ this.txt_daa014.Location = new System.Drawing.Point(114, 40); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Properties.Appearance.Options.UseFont = true; - this.txt_daa014.Size = new System.Drawing.Size(165, 24); + this.txt_daa014.Size = new System.Drawing.Size(200, 24); this.txt_daa014.StyleController = this.layoutMx1; this.txt_daa014.TabIndex = 327; this.txt_daa014.Tag = "readonly"; // - // txt_daa022Txt + // txt_daa022Remark // - this.txt_daa022Txt.Location = new System.Drawing.Point(385, 12); - this.txt_daa022Txt.Name = "txt_daa022Txt"; - this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true; - this.txt_daa022Txt.Size = new System.Drawing.Size(165, 24); - this.txt_daa022Txt.StyleController = this.layoutMx1; - this.txt_daa022Txt.TabIndex = 462; - this.txt_daa022Txt.Tag = "readonly"; + this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12); + this.txt_daa022Remark.Name = "txt_daa022Remark"; + this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true; + this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24); + this.txt_daa022Remark.StyleController = this.layoutMx1; + this.txt_daa022Remark.TabIndex = 462; + this.txt_daa022Remark.Tag = "readonly"; // // txt_daa010 // - this.txt_daa010.Location = new System.Drawing.Point(656, 40); + this.txt_daa010.Location = new System.Drawing.Point(726, 40); this.txt_daa010.Name = "txt_daa010"; this.txt_daa010.Properties.Appearance.Options.UseFont = true; - this.txt_daa010.Size = new System.Drawing.Size(165, 24); + this.txt_daa010.Size = new System.Drawing.Size(200, 24); this.txt_daa010.StyleController = this.layoutMx1; this.txt_daa010.TabIndex = 243; this.txt_daa010.Tag = "readonly"; // // txt_mesEndProd // - this.txt_mesEndProd.Location = new System.Drawing.Point(927, 68); + this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68); this.txt_mesEndProd.Name = "txt_mesEndProd"; this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true; - this.txt_mesEndProd.Size = new System.Drawing.Size(166, 24); + this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24); this.txt_mesEndProd.StyleController = this.layoutMx1; this.txt_mesEndProd.TabIndex = 338; this.txt_mesEndProd.Tag = "readonly"; // // txt_daa011 // - this.txt_daa011.Location = new System.Drawing.Point(656, 68); + this.txt_daa011.Location = new System.Drawing.Point(726, 68); this.txt_daa011.Name = "txt_daa011"; this.txt_daa011.Properties.Appearance.Options.UseFont = true; - this.txt_daa011.Size = new System.Drawing.Size(165, 24); + this.txt_daa011.Size = new System.Drawing.Size(200, 24); this.txt_daa011.StyleController = this.layoutMx1; this.txt_daa011.TabIndex = 247; this.txt_daa011.Tag = "readonly"; // // txt_dptName // - this.txt_dptName.Location = new System.Drawing.Point(385, 124); + this.txt_dptName.Location = new System.Drawing.Point(726, 96); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(165, 24); + this.txt_dptName.Size = new System.Drawing.Size(200, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 258; this.txt_dptName.Tag = "readonly"; // // txt_daa016 // - this.txt_daa016.Location = new System.Drawing.Point(927, 96); + this.txt_daa016.Location = new System.Drawing.Point(1032, 96); this.txt_daa016.Name = "txt_daa016"; this.txt_daa016.Properties.Appearance.Options.UseFont = true; - this.txt_daa016.Size = new System.Drawing.Size(166, 24); + this.txt_daa016.Size = new System.Drawing.Size(202, 24); this.txt_daa016.StyleController = this.layoutMx1; this.txt_daa016.TabIndex = 273; this.txt_daa016.Tag = "readonly"; @@ -1187,27 +1201,27 @@ this.txt_daa029.Location = new System.Drawing.Point(114, 96); this.txt_daa029.Name = "txt_daa029"; this.txt_daa029.Properties.Appearance.Options.UseFont = true; - this.txt_daa029.Size = new System.Drawing.Size(165, 24); + this.txt_daa029.Size = new System.Drawing.Size(200, 24); this.txt_daa029.StyleController = this.layoutMx1; this.txt_daa029.TabIndex = 217; this.txt_daa029.Tag = "readonly"; // // txt_lineName // - this.txt_lineName.Location = new System.Drawing.Point(385, 96); + this.txt_lineName.Location = new System.Drawing.Point(420, 96); this.txt_lineName.Name = "txt_lineName"; this.txt_lineName.Properties.Appearance.Options.UseFont = true; - this.txt_lineName.Size = new System.Drawing.Size(165, 24); + this.txt_lineName.Size = new System.Drawing.Size(200, 24); this.txt_lineName.StyleController = this.layoutMx1; this.txt_lineName.TabIndex = 267; this.txt_lineName.Tag = "readonly"; // // txt_daa017 // - this.txt_daa017.Location = new System.Drawing.Point(927, 124); + this.txt_daa017.Location = new System.Drawing.Point(1032, 124); this.txt_daa017.Name = "txt_daa017"; this.txt_daa017.Properties.Appearance.Options.UseFont = true; - this.txt_daa017.Size = new System.Drawing.Size(166, 24); + this.txt_daa017.Size = new System.Drawing.Size(202, 24); this.txt_daa017.StyleController = this.layoutMx1; this.txt_daa017.TabIndex = 280; this.txt_daa017.Tag = "readonly"; @@ -1217,17 +1231,17 @@ this.txt_daa003.Location = new System.Drawing.Point(114, 152); this.txt_daa003.Name = "txt_daa003"; this.txt_daa003.Properties.Appearance.Options.UseFont = true; - this.txt_daa003.Size = new System.Drawing.Size(165, 24); + this.txt_daa003.Size = new System.Drawing.Size(200, 24); this.txt_daa003.StyleController = this.layoutMx1; this.txt_daa003.TabIndex = 219; this.txt_daa003.Tag = "readonly"; // // txt_dwName // - this.txt_dwName.Location = new System.Drawing.Point(927, 12); + this.txt_dwName.Location = new System.Drawing.Point(1032, 12); this.txt_dwName.Name = "txt_dwName"; this.txt_dwName.Properties.Appearance.Options.UseFont = true; - this.txt_dwName.Size = new System.Drawing.Size(166, 24); + this.txt_dwName.Size = new System.Drawing.Size(202, 24); this.txt_dwName.StyleController = this.layoutMx1; this.txt_dwName.TabIndex = 226; this.txt_dwName.Tag = "readonly"; @@ -1237,10 +1251,18 @@ this.txt_daa004.Location = new System.Drawing.Point(114, 124); this.txt_daa004.Name = "txt_daa004"; this.txt_daa004.Properties.Appearance.Options.UseFont = true; - this.txt_daa004.Size = new System.Drawing.Size(165, 24); + this.txt_daa004.Size = new System.Drawing.Size(200, 24); this.txt_daa004.StyleController = this.layoutMx1; this.txt_daa004.TabIndex = 222; this.txt_daa004.Tag = "readonly"; + // + // txt_daa015 + // + this.txt_daa015.Location = new System.Drawing.Point(420, 124); + this.txt_daa015.Name = "txt_daa015"; + this.txt_daa015.Size = new System.Drawing.Size(200, 24); + this.txt_daa015.StyleController = this.layoutMx1; + this.txt_daa015.TabIndex = 473; // // layoutControlItem29 // @@ -1277,45 +1299,45 @@ this.layoutControlItem8, this.layoutControlItem12, this.layoutControlItem16, - this.layoutControlItem18, - this.layoutControlItem20, this.layoutControlItem28, - this.layoutControlItem27}); + this.layoutControlItem27, + this.layoutControlItem20, + this.layoutControlItem18}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - 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; + 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[] { - columnDefinition16, - columnDefinition17, - columnDefinition18, - columnDefinition19}); - 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; - rowDefinition13.Height = 100D; - rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition14.Height = 100D; - rowDefinition14.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[] { - rowDefinition9, - rowDefinition10, - rowDefinition11, - rowDefinition12, - rowDefinition13, - rowDefinition14}); - this.Root.Size = new System.Drawing.Size(1105, 188); + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5, + rowDefinition6}); + this.Root.Size = new System.Drawing.Size(1246, 188); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1323,17 +1345,17 @@ this.layoutControlItem1.Control = this.txt_daa001; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(306, 28); this.layoutControlItem1.Text = "宸ュ崟鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_daa008; - this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(612, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem3.Size = new System.Drawing.Size(306, 28); this.layoutControlItem3.Text = "宸ュ崟鏁伴噺"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // @@ -1343,18 +1365,18 @@ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(306, 28); this.layoutControlItem5.Text = "鎶曟枡鍗曞彿"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_daa010; - this.layoutControlItem7.Location = new System.Drawing.Point(542, 28); + this.layoutControlItem7.Location = new System.Drawing.Point(612, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem7.Size = new System.Drawing.Size(306, 28); this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // @@ -1364,29 +1386,29 @@ this.layoutControlItem9.Location = new System.Drawing.Point(0, 56); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem9.Size = new System.Drawing.Size(306, 28); this.layoutControlItem9.Text = "闇�姹傚崟鍙�"; this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_daa028; - this.layoutControlItem10.Location = new System.Drawing.Point(271, 56); + this.layoutControlItem10.Location = new System.Drawing.Point(306, 56); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem10.Size = new System.Drawing.Size(306, 28); this.layoutControlItem10.Text = "澶囨枡鏃堕棿"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_daa011; - this.layoutControlItem11.Location = new System.Drawing.Point(542, 56); + this.layoutControlItem11.Location = new System.Drawing.Point(612, 56); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem11.Size = new System.Drawing.Size(306, 28); this.layoutControlItem11.Text = "宸茬敓浜ч噺"; this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // @@ -1396,18 +1418,18 @@ this.layoutControlItem13.Location = new System.Drawing.Point(0, 84); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem13.Size = new System.Drawing.Size(306, 28); this.layoutControlItem13.Text = "浜у搧缂栫爜"; this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_lineName; - this.layoutControlItem14.Location = new System.Drawing.Point(271, 84); + this.layoutControlItem14.Location = new System.Drawing.Point(306, 84); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(306, 28); this.layoutControlItem14.Text = "鐢熶骇绾垮埆"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // @@ -1417,7 +1439,7 @@ this.layoutControlItem17.Location = new System.Drawing.Point(0, 112); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem17.Size = new System.Drawing.Size(306, 28); this.layoutControlItem17.Text = "浜у搧瑙勬牸"; this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); // @@ -1427,128 +1449,130 @@ this.layoutControlItem19.Location = new System.Drawing.Point(0, 140); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem19.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem19.Size = new System.Drawing.Size(306, 28); this.layoutControlItem19.Text = "浜у搧鍚嶇О"; this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem6 // - this.layoutControlItem6.Control = this.txt_daa022Txt; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem6.Control = this.txt_daa022Remark; + this.layoutControlItem6.Location = new System.Drawing.Point(306, 0); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem6.Size = new System.Drawing.Size(306, 28); this.layoutControlItem6.Text = "閫氱煡澶囨枡"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.textEdit1; - this.layoutControlItem2.Location = new System.Drawing.Point(271, 28); + this.layoutControlItem2.Location = new System.Drawing.Point(306, 28); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(306, 28); this.layoutControlItem2.Text = "澶囨枡鐘舵��"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_dwName; - this.layoutControlItem15.Location = new System.Drawing.Point(813, 0); + this.layoutControlItem15.Location = new System.Drawing.Point(918, 0); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem15.Size = new System.Drawing.Size(308, 28); this.layoutControlItem15.Text = "鍗曚綅"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_mesStartProd; - this.layoutControlItem4.Location = new System.Drawing.Point(813, 28); + this.layoutControlItem4.Location = new System.Drawing.Point(918, 28); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem4.Size = new System.Drawing.Size(308, 28); this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_mesEndProd; - this.layoutControlItem8.Location = new System.Drawing.Point(813, 56); + this.layoutControlItem8.Location = new System.Drawing.Point(918, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem8.Size = new System.Drawing.Size(308, 28); this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿"; this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_daa016; - this.layoutControlItem12.Location = new System.Drawing.Point(813, 84); + this.layoutControlItem12.Location = new System.Drawing.Point(918, 84); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem12.Size = new System.Drawing.Size(308, 28); this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�"; this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_daa017; - this.layoutControlItem16.Location = new System.Drawing.Point(813, 112); + this.layoutControlItem16.Location = new System.Drawing.Point(918, 112); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem16.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem16.Size = new System.Drawing.Size(308, 28); this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿"; this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_daa013; - this.layoutControlItem18.Location = new System.Drawing.Point(542, 84); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem18.Text = "鐢熶骇杞﹂棿"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem20 - // - this.layoutControlItem20.Control = this.txt_dptName; - this.layoutControlItem20.Location = new System.Drawing.Point(271, 112); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem20.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem20.Text = "杞﹂棿鍚嶇О"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_daa009; - this.layoutControlItem28.Location = new System.Drawing.Point(542, 112); + this.layoutControlItem28.Location = new System.Drawing.Point(306, 140); this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem28.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem28.Size = new System.Drawing.Size(612, 28); this.layoutControlItem28.Text = "宸ュ崟澶囨敞"; this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem27 // - this.layoutControlItem27.Control = this.txt_sjXt; - this.layoutControlItem27.Location = new System.Drawing.Point(271, 140); + this.layoutControlItem27.Control = this.txt_daa015; + this.layoutControlItem27.Location = new System.Drawing.Point(306, 112); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem27.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem27.Text = "瀹為檯绾夸綋"; + this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem27.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID"; this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_dptName; + this.layoutControlItem20.Location = new System.Drawing.Point(612, 84); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem20.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem20.Text = "杞﹂棿鍚嶇О"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_daa013; + this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID"; + this.layoutControlItem18.Location = new System.Drawing.Point(612, 112); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem18.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem18.Text = "杞﹂棿ID"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -1556,18 +1580,19 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1126, 513); + this.tabMx.Size = new System.Drawing.Size(1267, 513); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, this.tabMxPage2, - this.xtraTabPage3}); + this.xtraTabPage3, + this.xtraTabPage4}); // // tabMxPage1 // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 481); + this.tabMxPage1.Size = new System.Drawing.Size(1265, 481); this.tabMxPage1.Text = "澶囨枡鍗曡韩"; // // gcMx1 @@ -1576,7 +1601,7 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1124, 481); + this.gcMx1.Size = new System.Drawing.Size(1265, 481); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1920,18 +1945,18 @@ this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Controls.Add(this.panMx99); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1124, 481); - this.tabMxPage2.Text = "鎶ュ伐鏉$爜鏄庣粏"; + this.tabMxPage2.Size = new System.Drawing.Size(1265, 481); + this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�"; // // gcMx2 // this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMx2.Location = new System.Drawing.Point(0, 54); + this.gcMx2.Location = new System.Drawing.Point(0, 82); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); - this.gcMx2.Size = new System.Drawing.Size(1124, 427); + this.gcMx2.Size = new System.Drawing.Size(1265, 399); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -2001,7 +2026,7 @@ // gvMx2itemBarcode // this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true; - this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 "; + this.gvMx2itemBarcode.Caption = "鎵樻澘鏉$爜"; this.gvMx2itemBarcode.FieldName = "itemBarcode"; this.gvMx2itemBarcode.MinWidth = 50; this.gvMx2itemBarcode.Name = "gvMx2itemBarcode"; @@ -2013,7 +2038,7 @@ // gvMx2quantity // this.gvMx2quantity.AppearanceCell.Options.UseFont = true; - this.gvMx2quantity.Caption = "鏁伴噺 "; + this.gvMx2quantity.Caption = "鍐呭寘瑁呮暟閲� "; this.gvMx2quantity.FieldName = "quantity"; this.gvMx2quantity.MinWidth = 50; this.gvMx2quantity.Name = "gvMx2quantity"; @@ -2153,10 +2178,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + 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)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -2167,11 +2192,12 @@ this.panMx99.Dock = System.Windows.Forms.DockStyle.Top; this.panMx99.Location = new System.Drawing.Point(0, 0); this.panMx99.Name = "panMx99"; - this.panMx99.Size = new System.Drawing.Size(1124, 54); + this.panMx99.Size = new System.Drawing.Size(1265, 82); this.panMx99.TabIndex = 1; // // layoutMx99 // + this.layoutMx99.Controls.Add(this.radOut); this.layoutMx99.Controls.Add(this.ucBtnPrint1); this.layoutMx99.Controls.Add(this.txt_iCount_1); this.layoutMx99.Controls.Add(this.txt_psnQty_1); @@ -2181,48 +2207,61 @@ 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(288, 465, 812, 500); + this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(429, 530, 812, 500); this.layoutMx99.Root = this.layoutControlGroup1; - this.layoutMx99.Size = new System.Drawing.Size(1124, 54); + this.layoutMx99.Size = new System.Drawing.Size(1265, 82); this.layoutMx99.TabIndex = 0; this.layoutMx99.Text = "layoutControl1"; + // + // radOut + // + this.radOut.Location = new System.Drawing.Point(813, 10); + this.radOut.Margin = new System.Windows.Forms.Padding(0); + this.radOut.Name = "radOut"; + 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); + this.radOut.StyleController = this.layoutMx99; + this.radOut.TabIndex = 473; // // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(931, 10); + this.ucBtnPrint1.Location = new System.Drawing.Point(812, 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(182, 34); + this.ucBtnPrint1.Size = new System.Drawing.Size(265, 31); this.ucBtnPrint1.TabIndex = 464; // // txt_iCount_1 // - this.txt_iCount_1.Location = new System.Drawing.Point(850, 12); + this.txt_iCount_1.Location = new System.Drawing.Point(633, 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(78, 24); + this.txt_iCount_1.Size = new System.Drawing.Size(176, 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(666, 12); + this.txt_psnQty_1.Location = new System.Drawing.Point(366, 43); 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(78, 24); + this.txt_psnQty_1.Size = new System.Drawing.Size(176, 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(482, 12); + this.txt_printRemark.Location = new System.Drawing.Point(633, 12); this.txt_printRemark.Name = "txt_printRemark"; this.txt_printRemark.Properties.Appearance.Options.UseFont = true; - this.txt_printRemark.Size = new System.Drawing.Size(78, 24); + this.txt_printRemark.Size = new System.Drawing.Size(176, 24); this.txt_printRemark.StyleController = this.layoutMx99; this.txt_printRemark.TabIndex = 334; this.txt_printRemark.Tag = "readOnly-1"; @@ -2230,22 +2269,22 @@ // txt_kQty // this.txt_kQty.EditValue = ""; - this.txt_kQty.Location = new System.Drawing.Point(298, 12); + this.txt_kQty.Location = new System.Drawing.Point(366, 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(78, 24); + this.txt_kQty.Size = new System.Drawing.Size(176, 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(114, 12); + this.txt_yQty.Location = new System.Drawing.Point(99, 12); 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(78, 24); + this.txt_yQty.Size = new System.Drawing.Size(176, 24); this.txt_yQty.StyleController = this.layoutMx99; this.txt_yQty.TabIndex = 470; this.txt_yQty.Tag = "readonly"; @@ -2260,33 +2299,34 @@ this.layoutControlItem21, this.layoutControlItem24, this.layoutControlItem25, + this.layoutControlItem35, this.layoutControlItem26}); this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup1.Name = "Root"; - 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.Percent; - columnDefinition24.Width = 100D; - columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition25.Width = 100D; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; + columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize; + columnDefinition9.Width = 177D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition20, - columnDefinition21, - columnDefinition22, - columnDefinition23, - columnDefinition24, - columnDefinition25}); - rowDefinition15.Height = 100D; - rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; + 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; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition15}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54); + rowDefinition7, + rowDefinition8}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem22 @@ -2296,68 +2336,88 @@ 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(184, 34); + this.layoutControlItem22.Size = new System.Drawing.Size(267, 31); this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + 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(184, 0); + this.layoutControlItem23.Location = new System.Drawing.Point(267, 0); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(184, 34); + this.layoutControlItem23.Size = new System.Drawing.Size(267, 31); this.layoutControlItem23.Text = "鍙墦鍗版暟閲�"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); + 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(368, 0); + 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(184, 34); + this.layoutControlItem21.Size = new System.Drawing.Size(267, 31); this.layoutControlItem21.Text = "鎵撳嵃澶囨敞"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); + 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.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�"; + this.layoutControlItem24.Location = new System.Drawing.Point(267, 31); this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem24.Size = new System.Drawing.Size(184, 34); - this.layoutControlItem24.Text = "姣忓紶鏉$爜鏁伴噺"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + 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(736, 0); + this.layoutControlItem25.Location = new System.Drawing.Point(534, 31); this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4; - this.layoutControlItem25.Size = new System.Drawing.Size(184, 34); - this.layoutControlItem25.Text = "鎵撳嵃鏉$爜寮犳暟"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem25.Size = new System.Drawing.Size(267, 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.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.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem35.Text = "鑷姩璁$畻"; + this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem35.TextVisible = false; // // layoutControlItem26 // 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(920, 0); + this.layoutControlItem26.Location = new System.Drawing.Point(801, 31); this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 5; + 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(184, 34); + this.layoutControlItem26.Size = new System.Drawing.Size(267, 31); this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃"; this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem26.TextVisible = false; @@ -2367,8 +2427,8 @@ this.xtraTabPage3.Controls.Add(this.gcMx3); this.xtraTabPage3.Controls.Add(this.panMx98); this.xtraTabPage3.Name = "xtraTabPage3"; - this.xtraTabPage3.Size = new System.Drawing.Size(1124, 481); - this.xtraTabPage3.Text = "宸ュ崟杩芥函鐮�"; + this.xtraTabPage3.Size = new System.Drawing.Size(1265, 481); + this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�"; // // gcMx3 // @@ -2376,7 +2436,7 @@ this.gcMx3.Location = new System.Drawing.Point(0, 54); this.gcMx3.MainView = this.gvMx3; this.gcMx3.Name = "gcMx3"; - this.gcMx3.Size = new System.Drawing.Size(1124, 427); + this.gcMx3.Size = new System.Drawing.Size(1265, 427); this.gcMx3.TabIndex = 1; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); @@ -2498,7 +2558,7 @@ this.panMx98.Dock = System.Windows.Forms.DockStyle.Top; this.panMx98.Location = new System.Drawing.Point(0, 0); this.panMx98.Name = "panMx98"; - this.panMx98.Size = new System.Drawing.Size(1124, 54); + this.panMx98.Size = new System.Drawing.Size(1265, 54); this.panMx98.TabIndex = 0; // // layoutMx98 @@ -2513,18 +2573,18 @@ this.layoutMx98.Name = "layoutMx98"; this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(199, 178, 812, 500); this.layoutMx98.Root = this.layoutControlGroup2; - this.layoutMx98.Size = new System.Drawing.Size(1124, 54); + this.layoutMx98.Size = new System.Drawing.Size(1265, 54); this.layoutMx98.TabIndex = 0; this.layoutMx98.Text = "layoutControl1"; // // ucBtnPrint98 // this.ucBtnPrint98.guidKey = null; - this.ucBtnPrint98.Location = new System.Drawing.Point(894, 10); + this.ucBtnPrint98.Location = new System.Drawing.Point(1007, 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(219, 34); + this.ucBtnPrint98.Size = new System.Drawing.Size(247, 34); this.ucBtnPrint98.TabIndex = 8; // // txt_yQty98 @@ -2532,32 +2592,32 @@ this.txt_yQty98.Location = new System.Drawing.Point(114, 12); this.txt_yQty98.Name = "txt_yQty98"; this.txt_yQty98.Properties.ReadOnly = true; - this.txt_yQty98.Size = new System.Drawing.Size(114, 24); + this.txt_yQty98.Size = new System.Drawing.Size(143, 24); this.txt_yQty98.StyleController = this.layoutMx98; this.txt_yQty98.TabIndex = 4; // // txt_kQty98 // - this.txt_kQty98.Location = new System.Drawing.Point(334, 12); + this.txt_kQty98.Location = new System.Drawing.Point(363, 12); this.txt_kQty98.Name = "txt_kQty98"; this.txt_kQty98.Properties.ReadOnly = true; - this.txt_kQty98.Size = new System.Drawing.Size(115, 24); + this.txt_kQty98.Size = new System.Drawing.Size(143, 24); this.txt_kQty98.StyleController = this.layoutMx98; this.txt_kQty98.TabIndex = 5; // // txt_printRemark98 // - this.txt_printRemark98.Location = new System.Drawing.Point(555, 12); + this.txt_printRemark98.Location = new System.Drawing.Point(612, 12); this.txt_printRemark98.Name = "txt_printRemark98"; - this.txt_printRemark98.Size = new System.Drawing.Size(115, 24); + this.txt_printRemark98.Size = new System.Drawing.Size(143, 24); this.txt_printRemark98.StyleController = this.layoutMx98; this.txt_printRemark98.TabIndex = 6; // // txt_iCount_98 // - this.txt_iCount_98.Location = new System.Drawing.Point(776, 12); + this.txt_iCount_98.Location = new System.Drawing.Point(861, 12); this.txt_iCount_98.Name = "txt_iCount_98"; - this.txt_iCount_98.Size = new System.Drawing.Size(115, 24); + this.txt_iCount_98.Size = new System.Drawing.Size(143, 24); this.txt_iCount_98.StyleController = this.layoutMx98; this.txt_iCount_98.TabIndex = 7; // @@ -2573,27 +2633,27 @@ this.layoutControlItem34}); this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup2.Name = "Root"; - 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; + 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; this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition26, - columnDefinition27, - columnDefinition28, - columnDefinition29, - columnDefinition30}); - rowDefinition16.Height = 100D; - rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition10, + columnDefinition11, + columnDefinition12, + columnDefinition13, + columnDefinition14}); + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition16}); - this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 54); + rowDefinition9}); + this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem30 @@ -2601,57 +2661,206 @@ 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(220, 34); + 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(220, 0); + 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(221, 34); + 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(441, 0); + 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(221, 34); + 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(662, 0); + 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(221, 34); + 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(883, 0); + this.layoutControlItem34.Location = new System.Drawing.Point(996, 0); this.layoutControlItem34.Name = "layoutControlItem34"; this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem34.Size = new System.Drawing.Size(221, 34); + this.layoutControlItem34.Size = new System.Drawing.Size(249, 34); this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem34.TextVisible = false; + // + // xtraTabPage4 + // + this.xtraTabPage4.Controls.Add(this.gcMx4); + this.xtraTabPage4.Controls.Add(this.panMx100); + this.xtraTabPage4.Name = "xtraTabPage4"; + this.xtraTabPage4.Size = new System.Drawing.Size(1265, 481); + this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�"; + // + // gcMx4 + // + this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx4.Location = new System.Drawing.Point(0, 54); + this.gcMx4.MainView = this.gvMx4; + this.gcMx4.Name = "gcMx4"; + this.gcMx4.Size = new System.Drawing.Size(1265, 427); + this.gcMx4.TabIndex = 2; + this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx4}); + // + // gvMx4 + // + this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gvMx4.Appearance.Row.Options.UseFont = true; + this.gvMx4.ColumnPanelRowHeight = 50; + this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn39, + this.gridColumn40, + this.gridColumn41, + this.gridColumn44, + this.gridColumn45, + this.gridColumn46, + this.gridColumn47, + this.gridColumn48}); + this.gvMx4.GridControl = this.gcMx4; + this.gvMx4.Name = "gvMx4"; + this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx4.OptionsFind.ShowSearchNavButtons = false; + this.gvMx4.OptionsView.ShowGroupPanel = false; + // + // gridColumn39 + // + this.gridColumn39.AppearanceCell.Options.UseFont = true; + this.gridColumn39.Caption = "guid "; + this.gridColumn39.FieldName = "guid"; + this.gridColumn39.MinWidth = 50; + this.gridColumn39.Name = "gridColumn39"; + this.gridColumn39.Tag = "query_a.guid"; + this.gridColumn39.Width = 94; + // + // gridColumn40 + // + this.gridColumn40.AppearanceCell.Options.UseFont = true; + this.gridColumn40.Caption = "宸ュ崟鍙�"; + this.gridColumn40.FieldName = "daa001"; + this.gridColumn40.MinWidth = 50; + this.gridColumn40.Name = "gridColumn40"; + this.gridColumn40.Tag = "query_a.UNIT"; + this.gridColumn40.Visible = true; + this.gridColumn40.VisibleIndex = 0; + this.gridColumn40.Width = 94; + // + // gridColumn41 + // + this.gridColumn41.AppearanceCell.Options.UseFont = true; + this.gridColumn41.Caption = "杩芥函鐮�"; + this.gridColumn41.FieldName = "barCode"; + this.gridColumn41.MinWidth = 50; + this.gridColumn41.Name = "gridColumn41"; + this.gridColumn41.Tag = "query_a.ITEM_BARCODE"; + this.gridColumn41.Visible = true; + this.gridColumn41.VisibleIndex = 1; + this.gridColumn41.Width = 94; + // + // gridColumn44 + // + this.gridColumn44.AppearanceCell.Options.UseFont = true; + this.gridColumn44.Caption = "鏁伴噺 "; + this.gridColumn44.FieldName = "quantity"; + this.gridColumn44.MinWidth = 50; + this.gridColumn44.Name = "gridColumn44"; + this.gridColumn44.Tag = "query_a.QUANTITY"; + this.gridColumn44.Visible = true; + this.gridColumn44.VisibleIndex = 2; + this.gridColumn44.Width = 94; + // + // gridColumn45 + // + this.gridColumn45.AppearanceCell.Options.UseFont = true; + this.gridColumn45.Caption = "鍒涘缓浜� "; + this.gridColumn45.FieldName = "createBy"; + this.gridColumn45.MinWidth = 50; + this.gridColumn45.Name = "gridColumn45"; + this.gridColumn45.Tag = "query_a.CREATE_BY"; + this.gridColumn45.Visible = true; + this.gridColumn45.VisibleIndex = 3; + this.gridColumn45.Width = 94; + // + // gridColumn46 + // + this.gridColumn46.AppearanceCell.Options.UseFont = true; + this.gridColumn46.Caption = "鍒涘缓鏃堕棿 "; + this.gridColumn46.FieldName = "createDate"; + this.gridColumn46.MinWidth = 50; + this.gridColumn46.Name = "gridColumn46"; + this.gridColumn46.Tag = "query_a.CREATE_DATE"; + this.gridColumn46.Visible = true; + this.gridColumn46.VisibleIndex = 4; + this.gridColumn46.Width = 94; + // + // gridColumn47 + // + this.gridColumn47.Caption = "绾垮埆ID"; + this.gridColumn47.FieldName = "lineId"; + this.gridColumn47.MinWidth = 25; + this.gridColumn47.Name = "gridColumn47"; + this.gridColumn47.Visible = true; + this.gridColumn47.VisibleIndex = 5; + this.gridColumn47.Width = 94; + // + // gridColumn48 + // + this.gridColumn48.Caption = "绾垮埆鍚嶇О"; + this.gridColumn48.FieldName = "xtName"; + this.gridColumn48.MinWidth = 25; + this.gridColumn48.Name = "gridColumn48"; + this.gridColumn48.Visible = true; + this.gridColumn48.VisibleIndex = 6; + this.gridColumn48.Width = 94; + // + // panMx100 + // + this.panMx100.Controls.Add(this.ucBtnPrint100); + this.panMx100.Dock = System.Windows.Forms.DockStyle.Top; + this.panMx100.Location = new System.Drawing.Point(0, 0); + this.panMx100.Name = "panMx100"; + this.panMx100.Size = new System.Drawing.Size(1265, 54); + this.panMx100.TabIndex = 0; + // + // ucBtnPrint100 + // + this.ucBtnPrint100.guidKey = null; + this.ucBtnPrint100.Location = new System.Drawing.Point(20, 9); + this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0); + this.ucBtnPrint100.Name = "ucBtnPrint100"; + this.ucBtnPrint100.rptParameter = null; + this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32); + this.ucBtnPrint100.TabIndex = 0; // // Frm_Womdaa // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1128, 820); + this.ClientSize = new System.Drawing.Size(1269, 820); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Womdaa"; @@ -2684,7 +2893,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit(); @@ -2696,6 +2905,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); @@ -2716,10 +2926,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2732,6 +2942,7 @@ this.panMx99.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit(); this.layoutMx99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit(); @@ -2743,6 +2954,7 @@ ((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(); this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit(); @@ -2760,6 +2972,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + this.xtraTabPage4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit(); + this.panMx100.ResumeLayout(false); this.ResumeLayout(false); } @@ -2814,11 +3030,10 @@ private DevExpress.XtraEditors.TextEdit txt_daa013; private DevExpress.XtraEditors.TextEdit textEdit1; private DevExpress.XtraEditors.TextEdit txt_saleOrderNo; - private DevExpress.XtraEditors.TextEdit txt_daa022Txt; + private DevExpress.XtraEditors.TextEdit txt_daa022Remark; private DevExpress.XtraEditors.TextEdit txt_daa028; private DevExpress.XtraEditors.TextEdit txt_mesEndProd; private DevExpress.XtraEditors.TextEdit txt_mesStartProd; - private UserControl.UcLookWorkline txt_sjXt; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.TextEdit txt_daa014; private DevExpress.XtraEditors.TextEdit txt_daa017; @@ -2914,21 +3129,13 @@ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private UserControl.UcBtnPrint ucBtnPrint1; private DevExpress.XtraEditors.TextEdit txt_iCount_1; private DevExpress.XtraEditors.TextEdit txt_psnQty_1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraGrid.GridControl gcMx3; private DevExpress.XtraGrid.Views.Grid.GridView gvMx3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn33; @@ -2952,5 +3159,30 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; private DevExpress.XtraGrid.Columns.GridColumn gridColumn34; private DevExpress.XtraGrid.Columns.GridColumn gridColumn35; + private DevExpress.Utils.ToolTipController tips; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; + private DevExpress.XtraEditors.TextEdit txt_daa015; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; + 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; + private DevExpress.XtraTab.XtraTabPage xtraTabPage4; + private System.Windows.Forms.Panel panMx100; + private DevExpress.XtraGrid.GridControl gcMx4; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn39; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn40; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn41; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn44; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn45; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn46; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; + private UserControl.UcBtnPrint ucBtnPrint100; } } \ No newline at end of file -- Gitblit v1.9.3