From b79ba3fc504548d88f327519c733235544c63551 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 28 三月 2025 17:34:36 +0800 Subject: [PATCH] 销售退货 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 715 +++++++++++++++++---------------- DevApp/Gs.DevApp/UserControl/UcPageBar.cs | 6 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 533 ++---------------------- 3 files changed, 420 insertions(+), 834 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 49a5767..4ab0110 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs @@ -29,25 +29,25 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); + 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.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.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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -99,16 +99,14 @@ this.txt_createdDate = new DevExpress.XtraEditors.TextEdit(); this.txt_returnReason = new DevExpress.XtraEditors.TextEdit(); this.txt_createdBy = new DevExpress.XtraEditors.TextEdit(); - this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -116,7 +114,11 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -188,8 +190,6 @@ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -226,16 +226,14 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); @@ -243,7 +241,11 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); @@ -271,8 +273,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -409,7 +409,7 @@ // // gridColumn27 // - this.gridColumn27.Caption = "鏄惁鏈夋簮"; + this.gridColumn27.Caption = "婧愬崟鏍囪瘑"; this.gridColumn27.FieldName = "isLink"; this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; @@ -700,7 +700,8 @@ this.layoutMx1.Controls.Add(this.txt_createdBy); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem19}); + this.layoutControlItem19, + this.layoutControlItem1}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(834, 92, 812, 500); @@ -712,10 +713,10 @@ // txt_fstockid // this.txt_fstockid.IsReadly = false; - this.txt_fstockid.Location = new System.Drawing.Point(90, 131); + this.txt_fstockid.Location = new System.Drawing.Point(84, 108); this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0); this.txt_fstockid.Name = "txt_fstockid"; - this.txt_fstockid.Size = new System.Drawing.Size(189, 28); + this.txt_fstockid.Size = new System.Drawing.Size(195, 28); this.txt_fstockid.TabIndex = 454; // // lbGuid @@ -728,7 +729,7 @@ // // txt_wjStatus // - this.txt_wjStatus.Location = new System.Drawing.Point(554, 131); + this.txt_wjStatus.Location = new System.Drawing.Point(554, 140); this.txt_wjStatus.Name = "txt_wjStatus"; this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑"; this.txt_wjStatus.Size = new System.Drawing.Size(267, 24); @@ -738,7 +739,7 @@ // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(825, 131); + this.txt_chkStatus.Location = new System.Drawing.Point(825, 140); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_chkStatus.Size = new System.Drawing.Size(268, 24); @@ -749,32 +750,32 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(361, 99); + this.txt_billType.Location = new System.Drawing.Point(355, 108); this.txt_billType.Name = "txt_billType"; this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_billType.Properties.Items.AddRange(new object[] { "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"}); this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_billType.Size = new System.Drawing.Size(189, 24); + this.txt_billType.Size = new System.Drawing.Size(195, 24); this.txt_billType.StyleController = this.layoutMx1; this.txt_billType.TabIndex = 451; // // txt_salesOrderId // this.txt_salesOrderId.IsReadly = false; - this.txt_salesOrderId.Location = new System.Drawing.Point(90, 67); + this.txt_salesOrderId.Location = new System.Drawing.Point(84, 44); this.txt_salesOrderId.Name = "txt_salesOrderId"; - this.txt_salesOrderId.Size = new System.Drawing.Size(189, 28); + this.txt_salesOrderId.Size = new System.Drawing.Size(195, 28); this.txt_salesOrderId.TabIndex = 0; // // txt_approvedDate // - this.txt_approvedDate.Location = new System.Drawing.Point(903, 99); + this.txt_approvedDate.Location = new System.Drawing.Point(897, 108); this.txt_approvedDate.Name = "txt_approvedDate"; this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_approvedDate.Properties.Appearance.Options.UseFont = true; - this.txt_approvedDate.Size = new System.Drawing.Size(190, 28); + this.txt_approvedDate.Size = new System.Drawing.Size(196, 28); this.txt_approvedDate.StyleController = this.layoutMx1; this.txt_approvedDate.TabIndex = 378; this.txt_approvedDate.Tag = "readonly"; @@ -792,360 +793,134 @@ // // txt_approvedBy // - this.txt_approvedBy.Location = new System.Drawing.Point(903, 67); + this.txt_approvedBy.Location = new System.Drawing.Point(897, 76); this.txt_approvedBy.Name = "txt_approvedBy"; this.txt_approvedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_approvedBy.Properties.Appearance.Options.UseFont = true; - this.txt_approvedBy.Size = new System.Drawing.Size(190, 28); + this.txt_approvedBy.Size = new System.Drawing.Size(196, 28); this.txt_approvedBy.StyleController = this.layoutMx1; this.txt_approvedBy.TabIndex = 370; this.txt_approvedBy.Tag = "readonly"; // // txt_xsOrgName // - this.txt_xsOrgName.Location = new System.Drawing.Point(361, 3); + this.txt_xsOrgName.Location = new System.Drawing.Point(355, 12); this.txt_xsOrgName.Name = "txt_xsOrgName"; this.txt_xsOrgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true; - this.txt_xsOrgName.Size = new System.Drawing.Size(189, 28); + this.txt_xsOrgName.Size = new System.Drawing.Size(195, 28); this.txt_xsOrgName.StyleController = this.layoutMx1; this.txt_xsOrgName.TabIndex = 219; this.txt_xsOrgName.Tag = "readonly"; // // txt_inventoryOrg // - this.txt_inventoryOrg.Location = new System.Drawing.Point(632, 3); + this.txt_inventoryOrg.Location = new System.Drawing.Point(626, 12); this.txt_inventoryOrg.Name = "txt_inventoryOrg"; this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true; - this.txt_inventoryOrg.Size = new System.Drawing.Size(189, 28); + this.txt_inventoryOrg.Size = new System.Drawing.Size(195, 28); this.txt_inventoryOrg.StyleController = this.layoutMx1; this.txt_inventoryOrg.TabIndex = 243; this.txt_inventoryOrg.Tag = "readonly"; // // txt_modifiedDate // - this.txt_modifiedDate.Location = new System.Drawing.Point(903, 35); + this.txt_modifiedDate.Location = new System.Drawing.Point(897, 44); this.txt_modifiedDate.Name = "txt_modifiedDate"; this.txt_modifiedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true; - this.txt_modifiedDate.Size = new System.Drawing.Size(190, 28); + this.txt_modifiedDate.Size = new System.Drawing.Size(196, 28); this.txt_modifiedDate.StyleController = this.layoutMx1; this.txt_modifiedDate.TabIndex = 336; this.txt_modifiedDate.Tag = "readonly"; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(90, 35); + this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(189, 28); + this.txt_billNo.Size = new System.Drawing.Size(195, 28); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readonly"; // // txt_salerName // - this.txt_salerName.Location = new System.Drawing.Point(361, 35); + this.txt_salerName.Location = new System.Drawing.Point(355, 44); this.txt_salerName.Name = "txt_salerName"; this.txt_salerName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_salerName.Properties.Appearance.Options.UseFont = true; - this.txt_salerName.Size = new System.Drawing.Size(189, 28); + this.txt_salerName.Size = new System.Drawing.Size(195, 28); this.txt_salerName.StyleController = this.layoutMx1; this.txt_salerName.TabIndex = 267; this.txt_salerName.Tag = "readonly"; // // txt_modifiedBy // - this.txt_modifiedBy.Location = new System.Drawing.Point(903, 3); + this.txt_modifiedBy.Location = new System.Drawing.Point(897, 12); this.txt_modifiedBy.Name = "txt_modifiedBy"; this.txt_modifiedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true; - this.txt_modifiedBy.Size = new System.Drawing.Size(190, 28); + this.txt_modifiedBy.Size = new System.Drawing.Size(196, 28); this.txt_modifiedBy.StyleController = this.layoutMx1; this.txt_modifiedBy.TabIndex = 327; this.txt_modifiedBy.Tag = "readonly"; // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(361, 67); + this.txt_saleDeptName.Location = new System.Drawing.Point(355, 76); this.txt_saleDeptName.Name = "txt_saleDeptName"; this.txt_saleDeptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true; - this.txt_saleDeptName.Size = new System.Drawing.Size(189, 28); + this.txt_saleDeptName.Size = new System.Drawing.Size(195, 28); this.txt_saleDeptName.StyleController = this.layoutMx1; this.txt_saleDeptName.TabIndex = 222; this.txt_saleDeptName.Tag = "readonly"; // // txt_custName // - this.txt_custName.Location = new System.Drawing.Point(632, 35); + this.txt_custName.Location = new System.Drawing.Point(626, 44); this.txt_custName.Name = "txt_custName"; this.txt_custName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_custName.Properties.Appearance.Options.UseFont = true; - this.txt_custName.Size = new System.Drawing.Size(189, 28); + this.txt_custName.Size = new System.Drawing.Size(195, 28); this.txt_custName.StyleController = this.layoutMx1; this.txt_custName.TabIndex = 252; this.txt_custName.Tag = "readonly"; // // txt_createdDate // - this.txt_createdDate.Location = new System.Drawing.Point(632, 99); + this.txt_createdDate.Location = new System.Drawing.Point(626, 108); this.txt_createdDate.Name = "txt_createdDate"; this.txt_createdDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createdDate.Properties.Appearance.Options.UseFont = true; - this.txt_createdDate.Size = new System.Drawing.Size(189, 28); + this.txt_createdDate.Size = new System.Drawing.Size(195, 28); this.txt_createdDate.StyleController = this.layoutMx1; this.txt_createdDate.TabIndex = 319; this.txt_createdDate.Tag = "readonly"; // // txt_returnReason // - this.txt_returnReason.Location = new System.Drawing.Point(90, 99); + this.txt_returnReason.Location = new System.Drawing.Point(84, 76); this.txt_returnReason.Name = "txt_returnReason"; this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_returnReason.Properties.Appearance.Options.UseFont = true; - this.txt_returnReason.Size = new System.Drawing.Size(189, 28); + this.txt_returnReason.Size = new System.Drawing.Size(195, 28); this.txt_returnReason.StyleController = this.layoutMx1; this.txt_returnReason.TabIndex = 235; // // txt_createdBy // - this.txt_createdBy.Location = new System.Drawing.Point(632, 67); + this.txt_createdBy.Location = new System.Drawing.Point(626, 76); this.txt_createdBy.Name = "txt_createdBy"; this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createdBy.Properties.Appearance.Options.UseFont = true; - this.txt_createdBy.Size = new System.Drawing.Size(189, 28); + this.txt_createdBy.Size = new System.Drawing.Size(195, 28); this.txt_createdBy.StyleController = this.layoutMx1; this.txt_createdBy.TabIndex = 312; this.txt_createdBy.Tag = "readonly"; - // - // Root - // - this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.Root.GroupBordersVisible = false; - this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1, - this.layoutControlItem2, - this.layoutControlItem3, - this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem8, - this.layoutControlItem9, - this.layoutControlItem10, - this.layoutControlItem11, - this.layoutControlItem12, - this.layoutControlItem13, - this.layoutControlItem14, - this.layoutControlItem15, - this.layoutControlItem16, - this.layoutControlItem20, - this.layoutControlItem17, - this.layoutControlItem18}); - this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.Root.Name = "Root"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; - this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition10.Height = 100D; - rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition6, - rowDefinition7, - rowDefinition8, - rowDefinition9, - rowDefinition10}); - this.Root.Size = new System.Drawing.Size(1105, 180); - this.Root.TextVisible = false; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.txt_id; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem1.Text = "涓婚敭GUID"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_xsOrgName; - this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem2.Text = "閿�鍞粍缁�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_inventoryOrg; - this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem3.Text = "搴撳瓨缁勭粐"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_billNo; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 32); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem4.Text = "鐢宠鍗曞彿"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.txt_salesOrderId; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem5.Text = "閿�鍞鍗�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_salerName; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 32); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem6.Text = "閿�鍞憳"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_saleDeptName; - this.layoutControlItem7.Location = new System.Drawing.Point(271, 64); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem7.Text = "閿�鍞儴闂�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_custName; - this.layoutControlItem8.Location = new System.Drawing.Point(542, 32); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_returnReason; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 96); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem9.Text = "閫�璐у師鍥�"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_billType; - this.layoutControlItem10.Location = new System.Drawing.Point(271, 96); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_createdBy; - this.layoutControlItem11.Location = new System.Drawing.Point(542, 64); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem11.Text = "鍒涘缓浜�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_createdDate; - this.layoutControlItem12.Location = new System.Drawing.Point(542, 96); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_modifiedBy; - this.layoutControlItem13.Location = new System.Drawing.Point(813, 0); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(272, 32); - this.layoutControlItem13.Text = "淇敼浜�"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_modifiedDate; - this.layoutControlItem14.Location = new System.Drawing.Point(813, 32); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(272, 32); - this.layoutControlItem14.Text = "淇敼鏃堕棿"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_approvedBy; - this.layoutControlItem15.Location = new System.Drawing.Point(813, 64); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem15.Size = new System.Drawing.Size(272, 32); - this.layoutControlItem15.Text = "瀹℃牳浜�"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_approvedDate; - this.layoutControlItem16.Location = new System.Drawing.Point(813, 96); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(272, 32); - this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(66, 18); // // layoutControlItem19 // @@ -1159,15 +934,263 @@ this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem19.TextVisible = false; // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txt_id; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem1.Text = "涓婚敭GUID"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18); + // + // Root + // + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem2, + this.layoutControlItem3, + this.layoutControlItem6, + this.layoutControlItem7, + this.layoutControlItem8, + this.layoutControlItem10, + this.layoutControlItem11, + this.layoutControlItem12, + this.layoutControlItem13, + this.layoutControlItem14, + this.layoutControlItem15, + this.layoutControlItem16, + this.layoutControlItem17, + this.layoutControlItem18, + this.layoutControlItem4, + this.layoutControlItem5, + this.layoutControlItem9, + this.layoutControlItem20}); + this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.Root.Name = "Root"; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; + this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition4.Height = 100D; + rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5}); + this.Root.Size = new System.Drawing.Size(1105, 180); + this.Root.TextVisible = false; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_xsOrgName; + this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem2.Text = "閿�鍞粍缁�"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_inventoryOrg; + this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem3.Text = "搴撳瓨缁勭粐"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_salerName; + this.layoutControlItem6.Location = new System.Drawing.Point(271, 32); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem6.Text = "閿�鍞憳"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_saleDeptName; + this.layoutControlItem7.Location = new System.Drawing.Point(271, 64); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem7.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem7.Text = "閿�鍞儴闂�"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_custName; + this.layoutControlItem8.Location = new System.Drawing.Point(542, 32); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem8.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_billType; + this.layoutControlItem10.Location = new System.Drawing.Point(271, 96); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem10.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_createdBy; + this.layoutControlItem11.Location = new System.Drawing.Point(542, 64); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem11.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem11.Text = "鍒涘缓浜�"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_createdDate; + this.layoutControlItem12.Location = new System.Drawing.Point(542, 96); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_modifiedBy; + this.layoutControlItem13.Location = new System.Drawing.Point(813, 0); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem13.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem13.Text = "淇敼浜�"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_modifiedDate; + this.layoutControlItem14.Location = new System.Drawing.Point(813, 32); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem14.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem14.Text = "淇敼鏃堕棿"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_approvedBy; + this.layoutControlItem15.Location = new System.Drawing.Point(813, 64); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem15.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem15.Text = "瀹℃牳浜�"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_approvedDate; + this.layoutControlItem16.Location = new System.Drawing.Point(813, 96); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem16.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_chkStatus; + this.layoutControlItem17.Location = new System.Drawing.Point(813, 128); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem17.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem17.TextVisible = false; + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_wjStatus; + this.layoutControlItem18.Location = new System.Drawing.Point(542, 128); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem18.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem18.TextVisible = false; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_billNo; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem4.Text = "鐢宠鍗曞彿"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_salesOrderId; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem5.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem5.Text = "閿�鍞鍗�"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_returnReason; + this.layoutControlItem9.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem9.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem9.Text = "閫�璐у師鍥�"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_fstockid; - this.layoutControlItem20.Location = new System.Drawing.Point(0, 128); + this.layoutControlItem20.Location = new System.Drawing.Point(0, 96); this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem20.Size = new System.Drawing.Size(271, 32); this.layoutControlItem20.Text = "閫夋嫨浠撳簱"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -1247,7 +1270,7 @@ this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Tag = "edit"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.VisibleIndex = 3; this.gridColumn2.Width = 94; // // repositoryItemSearchLookUpEdit1 @@ -1353,11 +1376,13 @@ // this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1id.AppearanceCell.Options.UseFont = true; - this.gvMx1id.Caption = "GUID"; + this.gvMx1id.Caption = "涓婚敭GUID"; this.gvMx1id.FieldName = "guid"; this.gvMx1id.MinWidth = 50; this.gvMx1id.Name = "gvMx1id"; this.gvMx1id.Tag = "query_a.ID"; + this.gvMx1id.Visible = true; + this.gvMx1id.VisibleIndex = 0; this.gvMx1id.Width = 94; // // gvMx1materialId @@ -1383,7 +1408,7 @@ this.gvMx1materialName.Name = "gvMx1materialName"; this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME"; this.gvMx1materialName.Visible = true; - this.gvMx1materialName.VisibleIndex = 2; + this.gvMx1materialName.VisibleIndex = 4; this.gvMx1materialName.Width = 94; // // gvMx1materialSpecification @@ -1396,7 +1421,7 @@ this.gvMx1materialSpecification.Name = "gvMx1materialSpecification"; this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION"; this.gvMx1materialSpecification.Visible = true; - this.gvMx1materialSpecification.VisibleIndex = 3; + this.gvMx1materialSpecification.VisibleIndex = 5; this.gvMx1materialSpecification.Width = 94; // // gridColumn20 @@ -1406,7 +1431,7 @@ this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 4; + this.gridColumn20.VisibleIndex = 6; this.gridColumn20.Width = 94; // // gvMx1salesUnitId @@ -1419,7 +1444,7 @@ this.gvMx1salesUnitId.Name = "gvMx1salesUnitId"; this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID"; this.gvMx1salesUnitId.Visible = true; - this.gvMx1salesUnitId.VisibleIndex = 5; + this.gvMx1salesUnitId.VisibleIndex = 7; this.gvMx1salesUnitId.Width = 94; // // gvMx1salesQuantity @@ -1432,7 +1457,7 @@ this.gvMx1salesQuantity.Name = "gvMx1salesQuantity"; this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY"; this.gvMx1salesQuantity.Visible = true; - this.gvMx1salesQuantity.VisibleIndex = 6; + this.gvMx1salesQuantity.VisibleIndex = 8; this.gvMx1salesQuantity.Width = 94; // // gvMx1note @@ -1449,7 +1474,7 @@ this.gvMx1note.Name = "gvMx1note"; this.gvMx1note.Tag = "edit"; this.gvMx1note.Visible = true; - this.gvMx1note.VisibleIndex = 7; + this.gvMx1note.VisibleIndex = 9; this.gvMx1note.Width = 94; // // gridColumn13 @@ -1464,7 +1489,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "yz_quantity_0_edit"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 8; + this.gridColumn13.VisibleIndex = 10; this.gridColumn13.Width = 94; // // gvMx1returnDate @@ -1482,7 +1507,7 @@ this.gvMx1returnDate.Name = "gvMx1returnDate"; this.gvMx1returnDate.Tag = "edit"; this.gvMx1returnDate.Visible = true; - this.gvMx1returnDate.VisibleIndex = 9; + this.gvMx1returnDate.VisibleIndex = 12; this.gvMx1returnDate.Width = 94; // // repositoryItemDateEdit1 @@ -1504,7 +1529,7 @@ this.gvMx1isFree.Name = "gvMx1isFree"; this.gvMx1isFree.Tag = "query_a.IS_FREE"; this.gvMx1isFree.Visible = true; - this.gvMx1isFree.VisibleIndex = 10; + this.gvMx1isFree.VisibleIndex = 11; this.gvMx1isFree.Width = 94; // // gvMx1returnType @@ -1522,7 +1547,7 @@ this.gvMx1returnType.Name = "gvMx1returnType"; this.gvMx1returnType.Tag = "edit"; this.gvMx1returnType.Visible = true; - this.gvMx1returnType.VisibleIndex = 11; + this.gvMx1returnType.VisibleIndex = 14; this.gvMx1returnType.Width = 94; // // repositoryItemComboBox1 @@ -1548,15 +1573,17 @@ this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit"; this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; this.gvMx1inventoryUnit.Visible = true; - this.gvMx1inventoryUnit.VisibleIndex = 12; + this.gvMx1inventoryUnit.VisibleIndex = 13; this.gvMx1inventoryUnit.Width = 94; // // gridColumn12 // - this.gridColumn12.Caption = "閫�璐ф槑缁唃uid"; + this.gridColumn12.Caption = "閫佽揣鏄庣粏guid"; this.gridColumn12.FieldName = "deliveDetailGuid"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 2; this.gridColumn12.Width = 94; // // gridColumn21 @@ -1566,7 +1593,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 13; + this.gridColumn21.VisibleIndex = 15; this.gridColumn21.Width = 94; // // gridColumn22 @@ -1576,7 +1603,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 14; + this.gridColumn22.VisibleIndex = 16; this.gridColumn22.Width = 94; // // gvMxDel @@ -1586,16 +1613,16 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 15; + this.gvMxDel.VisibleIndex = 17; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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); @@ -1946,10 +1973,10 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // @@ -1963,30 +1990,6 @@ this.picCheckBox.TabIndex = 451; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_chkStatus; - this.layoutControlItem17.Location = new System.Drawing.Point(813, 128); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(272, 32); - this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem17.TextVisible = false; - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_wjStatus; - this.layoutControlItem18.Location = new System.Drawing.Point(542, 128); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem18.TextVisible = false; // // Frm_SalesReturnNotice // @@ -2034,16 +2037,14 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); @@ -2051,7 +2052,11 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); @@ -2080,8 +2085,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); this.ResumeLayout(false); } @@ -2137,12 +2140,9 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; @@ -2221,12 +2221,15 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private UserControl.UcLookCk txt_fstockid; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs index 1f107aa..0426cfb 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs @@ -28,21 +28,21 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.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 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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -117,36 +117,11 @@ this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); - this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); - this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa006 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa007 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa009 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa020 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa021 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa022 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa023 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa024 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa025 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa026 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1isReportcheck = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -760,38 +735,38 @@ this.layoutControlItem23}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition10.Height = 100D; - rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition11.Height = 100D; - rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition12.Height = 100D; - rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition4.Height = 100D; + rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7, - rowDefinition8, - rowDefinition9, - rowDefinition10, - rowDefinition11, - rowDefinition12}); + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5, + rowDefinition6}); this.Root.Size = new System.Drawing.Size(746, 214); this.Root.TextVisible = false; // @@ -1086,32 +1061,7 @@ this.gvMx1daa005, this.gvMx1daa003, this.gvMx1daa004, - this.gvMx1daa016, - this.gvMx1daa018, - this.gvMx1daa008, - this.gvMx1daa006, - this.gvMx1daa007, - this.gvMx1daa009, - this.gvMx1daa011, - this.gvMx1daa012, this.gvMx1reporttime, - this.gvMx1daa017, - this.gvMx1daa019, - this.gvMx1checkDate, - this.gvMx1checkUser, - this.gvMx1daa020, - this.gvMx1daa021, - this.gvMx1daa022, - this.gvMx1daa023, - this.gvMx1daa024, - this.gvMx1daa025, - this.gvMx1daa026, - this.gvMx1isReportcheck, - this.gvMx1daa014, - this.gvMx1machineNo, - this.gridColumn3, - this.gvMx1fstatus, - this.gridColumn6, this.gvMxDel}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -1144,7 +1094,7 @@ // this.gvMx1daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa002.AppearanceCell.Options.UseFont = true; - this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿"; + this.gvMx1daa002.Caption = "搴忓彿"; this.gvMx1daa002.FieldName = "daa001"; this.gvMx1daa002.MinWidth = 50; this.gvMx1daa002.Name = "gvMx1daa002"; @@ -1158,7 +1108,7 @@ // this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa010.AppearanceCell.Options.UseFont = true; - this.gvMx1daa010.Caption = "浠诲姟鍗曞彿"; + this.gvMx1daa010.Caption = "宸ュ簭缂栧彿"; this.gvMx1daa010.FieldName = "daa021"; this.gvMx1daa010.MinWidth = 50; this.gvMx1daa010.Name = "gvMx1daa010"; @@ -1172,7 +1122,7 @@ // this.gvMx1daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa005.AppearanceCell.Options.UseFont = true; - this.gvMx1daa005.Caption = "鐗╂枡缂栫爜"; + this.gvMx1daa005.Caption = "宸ュ簭鍚嶇О"; this.gvMx1daa005.FieldName = "itemNo"; this.gvMx1daa005.MinWidth = 50; this.gvMx1daa005.Name = "gvMx1daa005"; @@ -1186,7 +1136,7 @@ // this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa003.AppearanceCell.Options.UseFont = true; - this.gvMx1daa003.Caption = "浜у搧鍚嶇О"; + this.gvMx1daa003.Caption = "鐢熶骇杩涘害缁熻鐐�"; this.gvMx1daa003.FieldName = "daa003"; this.gvMx1daa003.MinWidth = 50; this.gvMx1daa003.Name = "gvMx1daa003"; @@ -1200,7 +1150,7 @@ // this.gvMx1daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa004.AppearanceCell.Options.UseFont = true; - this.gvMx1daa004.Caption = "浜у搧瑙勬牸"; + this.gvMx1daa004.Caption = "涓婂伐搴忕紪鍙�"; this.gvMx1daa004.FieldName = "daa004"; this.gvMx1daa004.MinWidth = 50; this.gvMx1daa004.Name = "gvMx1daa004"; @@ -1209,24 +1159,6 @@ this.gvMx1daa004.Visible = true; this.gvMx1daa004.VisibleIndex = 4; this.gvMx1daa004.Width = 50; - // - // gvMx1daa016 - // - this.gvMx1daa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa016.AppearanceCell.Options.UseFont = true; - this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true; - this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿"; - this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2; - this.gvMx1daa016.FieldName = "mesStartProd"; - this.gvMx1daa016.MinWidth = 50; - this.gvMx1daa016.Name = "gvMx1daa016"; - this.gvMx1daa016.Tag = "edit"; - this.gvMx1daa016.Visible = true; - this.gvMx1daa016.VisibleIndex = 5; - this.gvMx1daa016.Width = 78; // // repositoryItemDateEdit2 // @@ -1237,24 +1169,6 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2"; // - // gvMx1daa018 - // - this.gvMx1daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa018.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa018.AppearanceCell.Options.UseFont = true; - this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true; - this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa018.Caption = "棰勮瀹屽伐鏃堕棿"; - this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3; - this.gvMx1daa018.FieldName = "mesEndProd"; - this.gvMx1daa018.MinWidth = 50; - this.gvMx1daa018.Name = "gvMx1daa018"; - this.gvMx1daa018.Tag = "edit"; - this.gvMx1daa018.Visible = true; - this.gvMx1daa018.VisibleIndex = 6; - this.gvMx1daa018.Width = 50; - // // repositoryItemDateEdit3 // this.repositoryItemDateEdit3.AutoHeight = false; @@ -1263,102 +1177,6 @@ this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3"; - // - // gvMx1daa008 - // - this.gvMx1daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa008.AppearanceCell.Options.UseFont = true; - this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟"; - this.gvMx1daa008.FieldName = "caa012"; - this.gvMx1daa008.MaxWidth = 50; - this.gvMx1daa008.MinWidth = 50; - this.gvMx1daa008.Name = "gvMx1daa008"; - this.gvMx1daa008.OptionsColumn.ReadOnly = true; - this.gvMx1daa008.Tag = "query_a.daa008"; - this.gvMx1daa008.Visible = true; - this.gvMx1daa008.VisibleIndex = 7; - this.gvMx1daa008.Width = 50; - // - // gvMx1daa006 - // - this.gvMx1daa006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa006.AppearanceCell.Options.UseFont = true; - this.gvMx1daa006.Caption = "鍗曚綅"; - this.gvMx1daa006.FieldName = "fname"; - this.gvMx1daa006.MaxWidth = 50; - this.gvMx1daa006.MinWidth = 50; - this.gvMx1daa006.Name = "gvMx1daa006"; - this.gvMx1daa006.OptionsColumn.ReadOnly = true; - this.gvMx1daa006.Tag = "query_a.daa006"; - this.gvMx1daa006.Visible = true; - this.gvMx1daa006.VisibleIndex = 8; - this.gvMx1daa006.Width = 50; - // - // gvMx1daa007 - // - this.gvMx1daa007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa007.AppearanceCell.Options.UseFont = true; - this.gvMx1daa007.Caption = "宸叉帓"; - this.gvMx1daa007.FieldName = "yp"; - this.gvMx1daa007.MaxWidth = 50; - this.gvMx1daa007.MinWidth = 50; - this.gvMx1daa007.Name = "gvMx1daa007"; - this.gvMx1daa007.OptionsColumn.ReadOnly = true; - this.gvMx1daa007.Tag = "query_a.daa007"; - this.gvMx1daa007.Visible = true; - this.gvMx1daa007.VisibleIndex = 9; - this.gvMx1daa007.Width = 50; - // - // gvMx1daa009 - // - this.gvMx1daa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa009.AppearanceCell.Options.UseFont = true; - this.gvMx1daa009.Caption = "鏈帓"; - this.gvMx1daa009.FieldName = "wp"; - this.gvMx1daa009.MaxWidth = 50; - this.gvMx1daa009.MinWidth = 50; - this.gvMx1daa009.Name = "gvMx1daa009"; - this.gvMx1daa009.OptionsColumn.ReadOnly = true; - this.gvMx1daa009.Tag = "query_a.daa009"; - this.gvMx1daa009.Visible = true; - this.gvMx1daa009.VisibleIndex = 10; - this.gvMx1daa009.Width = 50; - // - // gvMx1daa011 - // - this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa011.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa011.AppearanceCell.Options.UseFont = true; - this.gvMx1daa011.AppearanceCell.Options.UseForeColor = true; - this.gvMx1daa011.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa011.Caption = "鏈鎺掓暟閲�"; - this.gvMx1daa011.FieldName = "daa008"; - this.gvMx1daa011.MaxWidth = 50; - this.gvMx1daa011.MinWidth = 60; - this.gvMx1daa011.Name = "gvMx1daa011"; - this.gvMx1daa011.Tag = "yz_quantity_0_edit"; - this.gvMx1daa011.Visible = true; - this.gvMx1daa011.VisibleIndex = 11; - this.gvMx1daa011.Width = 60; - // - // gvMx1daa012 - // - this.gvMx1daa012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa012.AppearanceCell.Options.UseFont = true; - this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true; - this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa012.Caption = "绾垮埆缂栫爜"; - this.gvMx1daa012.ColumnEdit = this.rptJYBZ; - this.gvMx1daa012.FieldName = "daa015LineName"; - this.gvMx1daa012.MinWidth = 150; - this.gvMx1daa012.Name = "gvMx1daa012"; - this.gvMx1daa012.Tag = "edit"; - this.gvMx1daa012.Visible = true; - this.gvMx1daa012.VisibleIndex = 12; - this.gvMx1daa012.Width = 153; // // rptJYBZ // @@ -1383,192 +1201,8 @@ this.gvMx1reporttime.Name = "gvMx1reporttime"; this.gvMx1reporttime.Tag = "edit"; this.gvMx1reporttime.Visible = true; - this.gvMx1reporttime.VisibleIndex = 13; + this.gvMx1reporttime.VisibleIndex = 5; this.gvMx1reporttime.Width = 102; - // - // gvMx1daa017 - // - this.gvMx1daa017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa017.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa017.AppearanceCell.Options.UseFont = true; - this.gvMx1daa017.AppearanceCell.Options.UseForeColor = true; - this.gvMx1daa017.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa017.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa017.Caption = "璁″垝浜烘暟"; - this.gvMx1daa017.FieldName = "planPersonnel"; - this.gvMx1daa017.MinWidth = 50; - this.gvMx1daa017.Name = "gvMx1daa017"; - this.gvMx1daa017.Tag = "yz_quantity_0"; - this.gvMx1daa017.Width = 50; - // - // gvMx1daa019 - // - this.gvMx1daa019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa019.AppearanceCell.Options.UseFont = true; - this.gvMx1daa019.Caption = "鎺掍骇鏃ユ湡"; - this.gvMx1daa019.FieldName = "daa024"; - this.gvMx1daa019.MinWidth = 50; - this.gvMx1daa019.Name = "gvMx1daa019"; - this.gvMx1daa019.OptionsColumn.ReadOnly = true; - this.gvMx1daa019.Tag = "query_a.daa019"; - this.gvMx1daa019.Width = 50; - // - // gvMx1checkDate - // - this.gvMx1checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1checkDate.AppearanceCell.Options.UseFont = true; - this.gvMx1checkDate.Caption = "绾夸綋绫诲埆"; - this.gvMx1checkDate.FieldName = "lineType"; - this.gvMx1checkDate.MinWidth = 50; - this.gvMx1checkDate.Name = "gvMx1checkDate"; - this.gvMx1checkDate.OptionsColumn.ReadOnly = true; - this.gvMx1checkDate.Tag = "query_a.check_date"; - this.gvMx1checkDate.Width = 50; - // - // gvMx1checkUser - // - this.gvMx1checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1checkUser.AppearanceCell.Options.UseFont = true; - this.gvMx1checkUser.Caption = "鏍囧噯浜烘暟"; - this.gvMx1checkUser.FieldName = "personnel"; - this.gvMx1checkUser.MinWidth = 50; - this.gvMx1checkUser.Name = "gvMx1checkUser"; - this.gvMx1checkUser.OptionsColumn.ReadOnly = true; - this.gvMx1checkUser.Tag = "query_a.check_user"; - this.gvMx1checkUser.Width = 50; - // - // gvMx1daa020 - // - this.gvMx1daa020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa020.AppearanceCell.Options.UseFont = true; - this.gvMx1daa020.Caption = "鏍囧噯宸ユ椂"; - this.gvMx1daa020.FieldName = "prodHour"; - this.gvMx1daa020.MinWidth = 50; - this.gvMx1daa020.Name = "gvMx1daa020"; - this.gvMx1daa020.OptionsColumn.ReadOnly = true; - this.gvMx1daa020.Tag = "query_a.daa020"; - this.gvMx1daa020.Width = 50; - // - // gvMx1daa021 - // - this.gvMx1daa021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa021.AppearanceCell.Options.UseFont = true; - this.gvMx1daa021.Caption = "鍗曚汉灏忔椂浜ц兘"; - this.gvMx1daa021.FieldName = "personHourCapactity"; - this.gvMx1daa021.MinWidth = 50; - this.gvMx1daa021.Name = "gvMx1daa021"; - this.gvMx1daa021.OptionsColumn.ReadOnly = true; - this.gvMx1daa021.Tag = "query_a.daa021"; - this.gvMx1daa021.Width = 50; - // - // gvMx1daa022 - // - this.gvMx1daa022.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa022.AppearanceCell.Options.UseFont = true; - this.gvMx1daa022.Caption = "鐞嗚鏍囦骇"; - this.gvMx1daa022.FieldName = "theCapactity"; - this.gvMx1daa022.MinWidth = 50; - this.gvMx1daa022.Name = "gvMx1daa022"; - this.gvMx1daa022.OptionsColumn.ReadOnly = true; - this.gvMx1daa022.Tag = "query_a.daa022"; - this.gvMx1daa022.Width = 50; - // - // gvMx1daa023 - // - this.gvMx1daa023.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa023.AppearanceCell.Options.UseFont = true; - this.gvMx1daa023.Caption = "璁″垝鏍囧噯浜ц兘"; - this.gvMx1daa023.FieldName = "planCapactity"; - this.gvMx1daa023.MinWidth = 50; - this.gvMx1daa023.Name = "gvMx1daa023"; - this.gvMx1daa023.OptionsColumn.ReadOnly = true; - this.gvMx1daa023.Tag = "query_a.daa023"; - this.gvMx1daa023.Width = 50; - // - // gvMx1daa024 - // - this.gvMx1daa024.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa024.AppearanceCell.Options.UseFont = true; - this.gvMx1daa024.Caption = "鍒嗛挓"; - this.gvMx1daa024.FieldName = "theMin"; - this.gvMx1daa024.MinWidth = 50; - this.gvMx1daa024.Name = "gvMx1daa024"; - this.gvMx1daa024.OptionsColumn.ReadOnly = true; - this.gvMx1daa024.Tag = "query_a.daa024"; - this.gvMx1daa024.Width = 50; - // - // gvMx1daa025 - // - this.gvMx1daa025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa025.AppearanceCell.Options.UseFont = true; - this.gvMx1daa025.Caption = "灏忔椂"; - this.gvMx1daa025.FieldName = "theHour"; - this.gvMx1daa025.MinWidth = 50; - this.gvMx1daa025.Name = "gvMx1daa025"; - this.gvMx1daa025.OptionsColumn.ReadOnly = true; - this.gvMx1daa025.Tag = "query_a.daa025"; - this.gvMx1daa025.Width = 50; - // - // gvMx1daa026 - // - this.gvMx1daa026.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa026.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa026.AppearanceCell.Options.UseFont = true; - this.gvMx1daa026.AppearanceCell.Options.UseForeColor = true; - this.gvMx1daa026.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1daa026.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa026.Caption = "鎹㈢嚎鏃堕棿"; - this.gvMx1daa026.FieldName = "changeLineTime"; - this.gvMx1daa026.MinWidth = 50; - this.gvMx1daa026.Name = "gvMx1daa026"; - this.gvMx1daa026.Tag = "yz_quantity_0"; - this.gvMx1daa026.Width = 50; - // - // gvMx1isReportcheck - // - this.gvMx1isReportcheck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1isReportcheck.AppearanceCell.ForeColor = System.Drawing.Color.Black; - this.gvMx1isReportcheck.AppearanceCell.Options.UseFont = true; - this.gvMx1isReportcheck.AppearanceCell.Options.UseForeColor = true; - this.gvMx1isReportcheck.AppearanceHeader.ForeColor = System.Drawing.Color.Black; - this.gvMx1isReportcheck.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1isReportcheck.Caption = "浼戞伅鏃堕棿"; - this.gvMx1isReportcheck.FieldName = "restTime"; - this.gvMx1isReportcheck.MinWidth = 50; - this.gvMx1isReportcheck.Name = "gvMx1isReportcheck"; - this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true; - this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck"; - this.gvMx1isReportcheck.Width = 50; - // - // gvMx1daa014 - // - this.gvMx1daa014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1daa014.AppearanceCell.Options.UseFont = true; - this.gvMx1daa014.Caption = "鎶曟枡鍗曞崟鍙�"; - this.gvMx1daa014.FieldName = "daa014"; - this.gvMx1daa014.MinWidth = 50; - this.gvMx1daa014.Name = "gvMx1daa014"; - this.gvMx1daa014.OptionsColumn.ReadOnly = true; - this.gvMx1daa014.Tag = "query_a.daa014"; - this.gvMx1daa014.Visible = true; - this.gvMx1daa014.VisibleIndex = 14; - this.gvMx1daa014.Width = 51; - // - // gvMx1machineNo - // - this.gvMx1machineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1machineNo.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1machineNo.AppearanceCell.Options.UseFont = true; - this.gvMx1machineNo.AppearanceCell.Options.UseForeColor = true; - this.gvMx1machineNo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1machineNo.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1machineNo.Caption = "棰勮澶囨枡鏃堕棿"; - this.gvMx1machineNo.ColumnEdit = this.repositoryItemDateEdit1; - this.gvMx1machineNo.FieldName = "prepareTime"; - this.gvMx1machineNo.MinWidth = 50; - this.gvMx1machineNo.Name = "gvMx1machineNo"; - this.gvMx1machineNo.Tag = "query_a.machine_no"; - this.gvMx1machineNo.Width = 200; // // repositoryItemDateEdit1 // @@ -1579,38 +1213,6 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; // - // gridColumn3 - // - this.gridColumn3.Caption = "绾夸綋ID"; - this.gridColumn3.FieldName = "daa015"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Width = 94; - // - // gvMx1fstatus - // - this.gvMx1fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1fstatus.AppearanceCell.Options.UseFont = true; - this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�"; - this.gvMx1fstatus.FieldName = "caa015"; - this.gvMx1fstatus.MinWidth = 50; - this.gvMx1fstatus.Name = "gvMx1fstatus"; - this.gvMx1fstatus.OptionsColumn.ReadOnly = true; - this.gvMx1fstatus.Tag = "query_a.fstatus"; - this.gvMx1fstatus.Visible = true; - this.gvMx1fstatus.VisibleIndex = 15; - this.gvMx1fstatus.Width = 76; - // - // gridColumn6 - // - this.gridColumn6.Caption = "娆″簭"; - this.gridColumn6.FieldName = "scheduleOrder"; - this.gridColumn6.MinWidth = 25; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 16; - this.gridColumn6.Width = 94; - // // gvMxDel // this.gvMxDel.Caption = "绉诲嚭"; @@ -1618,16 +1220,16 @@ this.gvMxDel.MinWidth = 80; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 17; + this.gvMxDel.VisibleIndex = 6; this.gvMxDel.Width = 84; // // 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; // @@ -1798,36 +1400,11 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa016; private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa018; private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa006; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa007; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa009; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ; private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa017; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa019; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkUser; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa020; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa021; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa022; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa023; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa024; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa025; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa026; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1isReportcheck; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1machineNo; private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstatus; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; } diff --git a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs index 5a1e582..7a52cc8 100644 --- a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs +++ b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs @@ -129,6 +129,12 @@ layoutControlItem12.Visibility = LayoutVisibility.Never; emptySpaceItem1.Visibility = LayoutVisibility.Never; layoutControlItem7.Visibility = LayoutVisibility.Never; + emptySpaceItem3.Visibility = LayoutVisibility.Never; + + layoutControlItem2.Visibility = LayoutVisibility.Never; + layoutControlItem3.Visibility = LayoutVisibility.Never; + layoutControlItem5.Visibility = LayoutVisibility.Never; + layoutControlItem4.Visibility = LayoutVisibility.Never; } } #region 瀹氫箟灞炴�� -- Gitblit v1.9.3