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 | 639 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 314 insertions(+), 325 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 76cc50d..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 columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = 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(); @@ -57,14 +57,13 @@ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_billType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_salesDept = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_salesPerson = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_inventoryOrg = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createdDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_modifiedBy = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -72,6 +71,10 @@ this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_approvedDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -96,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(); @@ -115,7 +116,9 @@ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem19 = 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(); @@ -187,10 +190,6 @@ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); - this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -227,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(); @@ -246,7 +243,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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(); @@ -280,6 +279,7 @@ // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -357,7 +357,6 @@ this.gv_salesDept, this.gv_salesPerson, this.gv_returnReason, - this.gv_inventoryOrg, this.gv_createdBy, this.gv_createdDate, this.gv_modifiedBy, @@ -386,8 +385,6 @@ this.gv_id.Name = "gv_id"; this.gv_id.OptionsColumn.AllowEdit = false; this.gv_id.Tag = "query_a.ID"; - this.gv_id.Visible = true; - this.gv_id.VisibleIndex = 0; this.gv_id.Width = 94; // // gridColumn1 @@ -397,7 +394,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.VisibleIndex = 0; this.gridColumn1.Width = 94; // // gridColumn19 @@ -407,8 +404,18 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 2; + this.gridColumn19.VisibleIndex = 1; this.gridColumn19.Width = 94; + // + // gridColumn27 + // + this.gridColumn27.Caption = "婧愬崟鏍囪瘑"; + this.gridColumn27.FieldName = "isLink"; + this.gridColumn27.MinWidth = 25; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Visible = true; + this.gridColumn27.VisibleIndex = 3; + this.gridColumn27.Width = 94; // // gv_billType // @@ -437,20 +444,6 @@ this.gv_billNo.Visible = true; this.gv_billNo.VisibleIndex = 4; this.gv_billNo.Width = 94; - // - // gv_customerOrderNo - // - this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true; - this.gv_customerOrderNo.Caption = "婧愰攢鍞鍗�"; - this.gv_customerOrderNo.FieldName = "xsNo"; - this.gv_customerOrderNo.MinWidth = 50; - this.gv_customerOrderNo.Name = "gv_customerOrderNo"; - this.gv_customerOrderNo.OptionsColumn.AllowEdit = false; - this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO"; - this.gv_customerOrderNo.Visible = true; - this.gv_customerOrderNo.VisibleIndex = 7; - this.gv_customerOrderNo.Width = 94; // // gv_salesOrg // @@ -508,20 +501,6 @@ this.gv_returnReason.VisibleIndex = 9; this.gv_returnReason.Width = 94; // - // gv_inventoryOrg - // - this.gv_inventoryOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_inventoryOrg.AppearanceCell.Options.UseFont = true; - this.gv_inventoryOrg.Caption = "搴撳瓨缁勭粐 "; - this.gv_inventoryOrg.FieldName = "inventoryOrg"; - this.gv_inventoryOrg.MinWidth = 50; - this.gv_inventoryOrg.Name = "gv_inventoryOrg"; - this.gv_inventoryOrg.OptionsColumn.AllowEdit = false; - this.gv_inventoryOrg.Tag = "query_a.INVENTORY_ORG"; - this.gv_inventoryOrg.Visible = true; - this.gv_inventoryOrg.VisibleIndex = 10; - this.gv_inventoryOrg.Width = 94; - // // gv_createdBy // this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -533,7 +512,7 @@ this.gv_createdBy.OptionsColumn.AllowEdit = false; this.gv_createdBy.Tag = "query_a.CREATED_BY"; this.gv_createdBy.Visible = true; - this.gv_createdBy.VisibleIndex = 11; + this.gv_createdBy.VisibleIndex = 10; this.gv_createdBy.Width = 94; // // gv_createdDate @@ -547,7 +526,7 @@ this.gv_createdDate.OptionsColumn.AllowEdit = false; this.gv_createdDate.Tag = "query_a.CREATED_DATE"; this.gv_createdDate.Visible = true; - this.gv_createdDate.VisibleIndex = 12; + this.gv_createdDate.VisibleIndex = 11; this.gv_createdDate.Width = 94; // // gv_modifiedBy @@ -561,7 +540,7 @@ this.gv_modifiedBy.OptionsColumn.AllowEdit = false; this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY"; this.gv_modifiedBy.Visible = true; - this.gv_modifiedBy.VisibleIndex = 13; + this.gv_modifiedBy.VisibleIndex = 12; this.gv_modifiedBy.Width = 94; // // gv_modifiedDate @@ -575,7 +554,7 @@ this.gv_modifiedDate.OptionsColumn.AllowEdit = false; this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE"; this.gv_modifiedDate.Visible = true; - this.gv_modifiedDate.VisibleIndex = 14; + this.gv_modifiedDate.VisibleIndex = 13; this.gv_modifiedDate.Width = 94; // // gv_approvedBy @@ -589,7 +568,7 @@ this.gv_approvedBy.OptionsColumn.AllowEdit = false; this.gv_approvedBy.Tag = "query_a.APPROVED_BY"; this.gv_approvedBy.Visible = true; - this.gv_approvedBy.VisibleIndex = 15; + this.gv_approvedBy.VisibleIndex = 14; this.gv_approvedBy.Width = 94; // // gv_approvedDate @@ -603,7 +582,7 @@ this.gv_approvedDate.OptionsColumn.AllowEdit = false; this.gv_approvedDate.Tag = "query_a.APPROVED_DATE"; this.gv_approvedDate.Visible = true; - this.gv_approvedDate.VisibleIndex = 16; + this.gv_approvedDate.VisibleIndex = 15; this.gv_approvedDate.Width = 94; // // gridColumn18 @@ -613,8 +592,50 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 17; + this.gridColumn18.VisibleIndex = 16; this.gridColumn18.Width = 94; + // + // gv_customerOrderNo + // + this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true; + this.gv_customerOrderNo.Caption = "婧愰攢鍞鍗�"; + this.gv_customerOrderNo.FieldName = "xsNo"; + this.gv_customerOrderNo.MinWidth = 50; + this.gv_customerOrderNo.Name = "gv_customerOrderNo"; + this.gv_customerOrderNo.OptionsColumn.AllowEdit = false; + this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO"; + this.gv_customerOrderNo.Visible = true; + this.gv_customerOrderNo.VisibleIndex = 7; + this.gv_customerOrderNo.Width = 94; + // + // gridColumn24 + // + this.gridColumn24.Caption = "浠撳簱ID"; + this.gridColumn24.FieldName = "ckId"; + this.gridColumn24.MinWidth = 25; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.Width = 94; + // + // gridColumn25 + // + this.gridColumn25.Caption = "浠撳簱鍚嶇О"; + this.gridColumn25.FieldName = "ckName"; + this.gridColumn25.MinWidth = 25; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.Visible = true; + this.gridColumn25.VisibleIndex = 17; + this.gridColumn25.Width = 94; + // + // gridColumn26 + // + this.gridColumn26.Caption = "浠撳簱缂栧彿"; + this.gridColumn26.FieldName = "ckNo"; + this.gridColumn26.MinWidth = 25; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Visible = true; + this.gridColumn26.VisibleIndex = 18; + this.gridColumn26.Width = 94; // // pageBar1 // @@ -652,7 +673,7 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 185; + this.splitMx1.SplitterPosition = 171; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -678,47 +699,50 @@ this.layoutMx1.Controls.Add(this.txt_returnReason); 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.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); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 185); + this.layoutMx1.Size = new System.Drawing.Size(1126, 171); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fstockid // this.txt_fstockid.IsReadly = false; - this.txt_fstockid.Location = new System.Drawing.Point(90, 144); + 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(194, 28); + this.txt_fstockid.Size = new System.Drawing.Size(195, 28); this.txt_fstockid.TabIndex = 454; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(840, 144); + this.lbGuid.Location = new System.Drawing.Point(825, 131); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(274, 29); + this.lbGuid.Size = new System.Drawing.Size(268, 28); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; // // txt_wjStatus // - this.txt_wjStatus.Location = new System.Drawing.Point(288, 144); + 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(272, 24); + this.txt_wjStatus.Size = new System.Drawing.Size(267, 24); this.txt_wjStatus.StyleController = this.layoutMx1; this.txt_wjStatus.TabIndex = 453; this.txt_wjStatus.Tag = "readonly"; // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(564, 144); + 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(272, 24); + this.txt_chkStatus.Size = new System.Drawing.Size(268, 24); this.txt_chkStatus.StyleController = this.layoutMx1; this.txt_chkStatus.TabIndex = 452; this.txt_chkStatus.Tag = "readonly"; @@ -726,28 +750,28 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(366, 111); + 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(194, 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, 78); + this.txt_salesOrderId.Location = new System.Drawing.Point(84, 44); this.txt_salesOrderId.Name = "txt_salesOrderId"; - this.txt_salesOrderId.Size = new System.Drawing.Size(194, 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(918, 111); + 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; @@ -758,18 +782,18 @@ // // txt_id // - this.txt_id.Location = new System.Drawing.Point(90, 12); + this.txt_id.Location = new System.Drawing.Point(90, 3); this.txt_id.Name = "txt_id"; this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_id.Properties.Appearance.Options.UseFont = true; - this.txt_id.Size = new System.Drawing.Size(194, 28); + this.txt_id.Size = new System.Drawing.Size(189, 28); this.txt_id.StyleController = this.layoutMx1; this.txt_id.TabIndex = 210; this.txt_id.Tag = "readonly"; // // txt_approvedBy // - this.txt_approvedBy.Location = new System.Drawing.Point(918, 78); + 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; @@ -780,29 +804,29 @@ // // txt_xsOrgName // - this.txt_xsOrgName.Location = new System.Drawing.Point(366, 12); + 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(194, 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(642, 12); + 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(194, 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(918, 45); + 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; @@ -813,29 +837,29 @@ // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(90, 45); + 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(194, 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(366, 45); + 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(194, 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(918, 12); + 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; @@ -846,72 +870,89 @@ // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(366, 78); + 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(194, 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(642, 45); + 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(194, 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(642, 111); + 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(194, 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, 111); + 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(194, 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(642, 78); + 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(194, 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"; + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.lbGuid; + this.layoutControlItem19.Location = new System.Drawing.Point(813, 128); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem19.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem19.Text = "lbGuid"; + 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.layoutControlItem1, this.layoutControlItem2, this.layoutControlItem3, - this.layoutControlItem4, - this.layoutControlItem5, this.layoutControlItem6, this.layoutControlItem7, this.layoutControlItem8, - this.layoutControlItem9, this.layoutControlItem10, this.layoutControlItem11, this.layoutControlItem12, @@ -921,218 +962,181 @@ this.layoutControlItem16, this.layoutControlItem17, this.layoutControlItem18, - this.layoutControlItem19, + this.layoutControlItem4, + this.layoutControlItem5, + this.layoutControlItem9, this.layoutControlItem20}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - 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; + 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[] { - columnDefinition21, - columnDefinition22, - columnDefinition23, - columnDefinition24}); - rowDefinition26.Height = 100D; - rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition27.Height = 100D; - rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition28.Height = 100D; - rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition29.Height = 100D; - rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition30.Height = 100D; - rowDefinition30.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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition26, - rowDefinition27, - rowDefinition28, - rowDefinition29, - rowDefinition30}); - this.Root.Size = new System.Drawing.Size(1126, 185); + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5}); + 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(276, 33); - 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(276, 0); + 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(276, 33); + this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); this.layoutControlItem2.Text = "閿�鍞粍缁�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_inventoryOrg; - this.layoutControlItem3.Location = new System.Drawing.Point(552, 0); + 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(276, 33); + 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, 33); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 33); - 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, 66); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 33); - this.layoutControlItem5.Text = "閿�鍞鍗�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_salerName; - this.layoutControlItem6.Location = new System.Drawing.Point(276, 33); + 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(276, 33); + this.layoutControlItem6.Size = new System.Drawing.Size(271, 32); this.layoutControlItem6.Text = "閿�鍞憳"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_saleDeptName; - this.layoutControlItem7.Location = new System.Drawing.Point(276, 66); + 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(276, 33); + this.layoutControlItem7.Size = new System.Drawing.Size(271, 32); this.layoutControlItem7.Text = "閿�鍞儴闂�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_custName; - this.layoutControlItem8.Location = new System.Drawing.Point(552, 33); + 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(276, 33); - 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, 99); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(276, 33); - this.layoutControlItem9.Text = "閫�璐у師鍥�"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18); + 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(276, 99); + 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(276, 33); + this.layoutControlItem10.Size = new System.Drawing.Size(271, 32); this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_createdBy; - this.layoutControlItem11.Location = new System.Drawing.Point(552, 66); + 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(276, 33); + this.layoutControlItem11.Size = new System.Drawing.Size(271, 32); this.layoutControlItem11.Text = "鍒涘缓浜�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createdDate; - this.layoutControlItem12.Location = new System.Drawing.Point(552, 99); + 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(276, 33); + this.layoutControlItem12.Size = new System.Drawing.Size(271, 32); this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_modifiedBy; - this.layoutControlItem13.Location = new System.Drawing.Point(828, 0); + 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(278, 33); + this.layoutControlItem13.Size = new System.Drawing.Size(272, 32); this.layoutControlItem13.Text = "淇敼浜�"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_modifiedDate; - this.layoutControlItem14.Location = new System.Drawing.Point(828, 33); + 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(278, 33); + this.layoutControlItem14.Size = new System.Drawing.Size(272, 32); this.layoutControlItem14.Text = "淇敼鏃堕棿"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_approvedBy; - this.layoutControlItem15.Location = new System.Drawing.Point(828, 66); + 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(278, 33); + this.layoutControlItem15.Size = new System.Drawing.Size(272, 32); this.layoutControlItem15.Text = "瀹℃牳浜�"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_approvedDate; - this.layoutControlItem16.Location = new System.Drawing.Point(828, 99); + 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(278, 33); - this.layoutControlItem16.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(66, 18); + 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(552, 132); + this.layoutControlItem17.Location = new System.Drawing.Point(813, 128); this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(276, 33); + 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; @@ -1140,36 +1144,53 @@ // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_wjStatus; - this.layoutControlItem18.Location = new System.Drawing.Point(276, 132); + this.layoutControlItem18.Location = new System.Drawing.Point(542, 128); this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(276, 33); + 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; // - // layoutControlItem19 + // layoutControlItem4 // - this.layoutControlItem19.Control = this.lbGuid; - this.layoutControlItem19.Location = new System.Drawing.Point(828, 132); - this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem19.Size = new System.Drawing.Size(278, 33); - this.layoutControlItem19.Text = "lbGuid"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem19.TextVisible = false; + 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, 132); + this.layoutControlItem20.Location = new System.Drawing.Point(0, 96); this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem20.Size = new System.Drawing.Size(276, 33); + 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 // @@ -1177,7 +1198,7 @@ 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, 373); + this.tabMx.Size = new System.Drawing.Size(1126, 387); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1188,7 +1209,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Controls.Add(this.panelMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 341); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 355); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -1202,13 +1223,15 @@ this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 239); + this.gcMx1.Size = new System.Drawing.Size(1124, 253); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); // // gvMx1 // + this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn2, this.gvMx1id, @@ -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; - editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions11.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, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", 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); @@ -1629,10 +1656,11 @@ // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59); + this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65); + this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41); + this.ucBtnPrint1.Size = new System.Drawing.Size(207, 31); this.ucBtnPrint1.TabIndex = 230; // // lbMxGuid @@ -1792,7 +1820,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1124, 341); + this.tabMxPage2.Size = new System.Drawing.Size(1124, 355); this.tabMxPage2.Text = "鎵爜鏄庣粏"; // // gcMx2 @@ -1803,13 +1831,15 @@ this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit2}); - this.gcMx2.Size = new System.Drawing.Size(1124, 341); + this.gcMx2.Size = new System.Drawing.Size(1124, 355); this.gcMx2.TabIndex = 3; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); // // gvMx2 // + this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2.Appearance.Row.Options.UseFont = true; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn3, this.gvMx1itemBarcode, @@ -1943,10 +1973,10 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions12.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, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", 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; // @@ -1960,46 +1990,6 @@ this.picCheckBox.TabIndex = 451; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; - // - // gridColumn24 - // - this.gridColumn24.Caption = "浠撳簱ID"; - this.gridColumn24.FieldName = "ckId"; - this.gridColumn24.MinWidth = 25; - this.gridColumn24.Name = "gridColumn24"; - this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 18; - this.gridColumn24.Width = 94; - // - // gridColumn25 - // - this.gridColumn25.Caption = "浠撳簱鍚嶇О"; - this.gridColumn25.FieldName = "ckName"; - this.gridColumn25.MinWidth = 25; - this.gridColumn25.Name = "gridColumn25"; - this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 19; - this.gridColumn25.Width = 94; - // - // gridColumn26 - // - this.gridColumn26.Caption = "浠撳簱缂栧彿"; - this.gridColumn26.FieldName = "ckNo"; - this.gridColumn26.MinWidth = 25; - this.gridColumn26.Name = "gridColumn26"; - this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 20; - this.gridColumn26.Width = 94; - // - // gridColumn27 - // - this.gridColumn27.Caption = "鏄惁鏈夋簮"; - this.gridColumn27.FieldName = "isLink"; - this.gridColumn27.MinWidth = 25; - this.gridColumn27.Name = "gridColumn27"; - this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 3; - this.gridColumn27.Width = 94; // // Frm_SalesReturnNotice // @@ -2047,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(); @@ -2066,7 +2054,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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); @@ -2117,7 +2107,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_salesDept; private DevExpress.XtraGrid.Columns.GridColumn gv_salesPerson; private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason; - private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryOrg; private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy; private DevExpress.XtraGrid.Columns.GridColumn gv_createdDate; private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedBy; @@ -2151,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; @@ -2164,8 +2150,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -2237,10 +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 -- Gitblit v1.9.3