From 054f057e14b14044fe6547d56c2ec97b5c7e9003 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 06 三月 2025 15:09:57 +0800 Subject: [PATCH] 销售退货 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 370 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 224 insertions(+), 146 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 2d76e05..76cc50d 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 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(); + 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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -76,6 +76,7 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit(); this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit(); @@ -115,6 +116,7 @@ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -185,6 +187,10 @@ 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(); @@ -241,6 +247,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -343,9 +350,9 @@ this.gv_id, this.gridColumn1, this.gridColumn19, + this.gridColumn27, this.gv_billType, this.gv_billNo, - this.gv_customerOrderNo, this.gv_salesOrg, this.gv_salesDept, this.gv_salesPerson, @@ -357,7 +364,11 @@ this.gv_modifiedDate, this.gv_approvedBy, this.gv_approvedDate, - this.gridColumn18}); + this.gridColumn18, + this.gv_customerOrderNo, + this.gridColumn24, + this.gridColumn25, + this.gridColumn26}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -396,7 +407,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 3; + this.gridColumn19.VisibleIndex = 2; this.gridColumn19.Width = 94; // // gv_billType @@ -431,7 +442,7 @@ // 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.Caption = "婧愰攢鍞鍗�"; this.gv_customerOrderNo.FieldName = "xsNo"; this.gv_customerOrderNo.MinWidth = 50; this.gv_customerOrderNo.Name = "gv_customerOrderNo"; @@ -480,7 +491,7 @@ this.gv_salesPerson.OptionsColumn.AllowEdit = false; this.gv_salesPerson.Tag = "query_a.SALES_PERSON"; this.gv_salesPerson.Visible = true; - this.gv_salesPerson.VisibleIndex = 10; + this.gv_salesPerson.VisibleIndex = 8; this.gv_salesPerson.Width = 94; // // gv_returnReason @@ -494,7 +505,7 @@ this.gv_returnReason.OptionsColumn.AllowEdit = false; this.gv_returnReason.Tag = "query_a.RETURN_REASON"; this.gv_returnReason.Visible = true; - this.gv_returnReason.VisibleIndex = 8; + this.gv_returnReason.VisibleIndex = 9; this.gv_returnReason.Width = 94; // // gv_inventoryOrg @@ -508,7 +519,7 @@ this.gv_inventoryOrg.OptionsColumn.AllowEdit = false; this.gv_inventoryOrg.Tag = "query_a.INVENTORY_ORG"; this.gv_inventoryOrg.Visible = true; - this.gv_inventoryOrg.VisibleIndex = 9; + this.gv_inventoryOrg.VisibleIndex = 10; this.gv_inventoryOrg.Width = 94; // // gv_createdBy @@ -641,11 +652,12 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 160; + this.splitMx1.SplitterPosition = 185; this.splitMx1.TabIndex = 0; // // layoutMx1 // + this.layoutMx1.Controls.Add(this.txt_fstockid); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_wjStatus); this.layoutMx1.Controls.Add(this.txt_chkStatus); @@ -670,34 +682,43 @@ 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, 160); + this.layoutMx1.Size = new System.Drawing.Size(1126, 185); 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.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.TabIndex = 454; + // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(825, 140); + this.lbGuid.Location = new System.Drawing.Point(840, 144); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(268, 28); + this.lbGuid.Size = new System.Drawing.Size(274, 29); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; // // txt_wjStatus // - this.txt_wjStatus.Location = new System.Drawing.Point(283, 140); + this.txt_wjStatus.Location = new System.Drawing.Point(288, 144); this.txt_wjStatus.Name = "txt_wjStatus"; this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑"; - this.txt_wjStatus.Size = new System.Drawing.Size(267, 24); + this.txt_wjStatus.Size = new System.Drawing.Size(272, 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(554, 140); + this.txt_chkStatus.Location = new System.Drawing.Point(564, 144); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_chkStatus.Size = new System.Drawing.Size(267, 24); + this.txt_chkStatus.Size = new System.Drawing.Size(272, 24); this.txt_chkStatus.StyleController = this.layoutMx1; this.txt_chkStatus.TabIndex = 452; this.txt_chkStatus.Tag = "readonly"; @@ -705,32 +726,32 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(361, 108); + this.txt_billType.Location = new System.Drawing.Point(366, 111); 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(194, 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, 76); + this.txt_salesOrderId.Location = new System.Drawing.Point(90, 78); this.txt_salesOrderId.Name = "txt_salesOrderId"; - this.txt_salesOrderId.Size = new System.Drawing.Size(189, 28); + this.txt_salesOrderId.Size = new System.Drawing.Size(194, 28); this.txt_salesOrderId.TabIndex = 0; // // txt_approvedDate // - this.txt_approvedDate.Location = new System.Drawing.Point(903, 108); + this.txt_approvedDate.Location = new System.Drawing.Point(918, 111); 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"; @@ -741,138 +762,138 @@ 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(189, 28); + this.txt_id.Size = new System.Drawing.Size(194, 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(903, 76); + this.txt_approvedBy.Location = new System.Drawing.Point(918, 78); 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, 12); + this.txt_xsOrgName.Location = new System.Drawing.Point(366, 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(194, 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, 12); + this.txt_inventoryOrg.Location = new System.Drawing.Point(642, 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(194, 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, 44); + this.txt_modifiedDate.Location = new System.Drawing.Point(918, 45); 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, 44); + this.txt_billNo.Location = new System.Drawing.Point(90, 45); 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(194, 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, 44); + this.txt_salerName.Location = new System.Drawing.Point(366, 45); 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(194, 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, 12); + this.txt_modifiedBy.Location = new System.Drawing.Point(918, 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, 76); + this.txt_saleDeptName.Location = new System.Drawing.Point(366, 78); 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(194, 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, 44); + this.txt_custName.Location = new System.Drawing.Point(642, 45); 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(194, 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, 108); + this.txt_createdDate.Location = new System.Drawing.Point(642, 111); 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(194, 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, 108); + this.txt_returnReason.Location = new System.Drawing.Point(90, 111); 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(194, 28); this.txt_returnReason.StyleController = this.layoutMx1; this.txt_returnReason.TabIndex = 235; // // txt_createdBy // - this.txt_createdBy.Location = new System.Drawing.Point(632, 76); + this.txt_createdBy.Location = new System.Drawing.Point(642, 78); 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(194, 28); this.txt_createdBy.StyleController = this.layoutMx1; this.txt_createdBy.TabIndex = 312; this.txt_createdBy.Tag = "readonly"; @@ -900,39 +921,40 @@ this.layoutControlItem16, this.layoutControlItem17, this.layoutControlItem18, - this.layoutControlItem19}); + this.layoutControlItem19, + 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; + 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; 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; + 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1105, 180); + rowDefinition26, + rowDefinition27, + rowDefinition28, + rowDefinition29, + rowDefinition30}); + this.Root.Size = new System.Drawing.Size(1126, 185); this.Root.TextVisible = false; // // layoutControlItem1 @@ -940,177 +962,177 @@ 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.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(271, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(276, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(552, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(0, 33); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(271, 32); + 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, 64); + 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(271, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(276, 33); 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.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(276, 66); 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.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(552, 33); 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.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, 96); + 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(271, 32); + this.layoutControlItem9.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(276, 99); 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.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(552, 66); 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.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(552, 99); 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.Size = new System.Drawing.Size(276, 33); 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.Location = new System.Drawing.Point(828, 0); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem13.Size = new System.Drawing.Size(278, 33); 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.Location = new System.Drawing.Point(828, 33); 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.Size = new System.Drawing.Size(278, 33); 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.Location = new System.Drawing.Point(828, 66); 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.Size = new System.Drawing.Size(278, 33); 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.Location = new System.Drawing.Point(828, 99); 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.Size = new System.Drawing.Size(278, 33); this.layoutControlItem16.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem16.TextSize = new System.Drawing.Size(66, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_chkStatus; - this.layoutControlItem17.Location = new System.Drawing.Point(542, 128); + this.layoutControlItem17.Location = new System.Drawing.Point(552, 132); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem17.Size = new System.Drawing.Size(276, 33); this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem17.TextVisible = false; @@ -1118,11 +1140,11 @@ // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_wjStatus; - this.layoutControlItem18.Location = new System.Drawing.Point(271, 128); + this.layoutControlItem18.Location = new System.Drawing.Point(276, 132); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem18.Size = new System.Drawing.Size(276, 33); this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem18.TextVisible = false; @@ -1130,14 +1152,24 @@ // layoutControlItem19 // this.layoutControlItem19.Control = this.lbGuid; - this.layoutControlItem19.Location = new System.Drawing.Point(813, 128); + 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(272, 32); + 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; + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_fstockid; + this.layoutControlItem20.Location = new System.Drawing.Point(0, 132); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem20.Size = new System.Drawing.Size(276, 33); + this.layoutControlItem20.Text = "閫夋嫨浠撳簱"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(66, 18); // // tabMx // @@ -1145,7 +1177,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, 398); + this.tabMx.Size = new System.Drawing.Size(1126, 373); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1156,7 +1188,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, 366); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 341); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -1170,7 +1202,7 @@ this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 264); + this.gcMx1.Size = new System.Drawing.Size(1124, 239); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1499,10 +1531,9 @@ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemComboBox1.Items.AddRange(new object[] { - "杈呭姪璧勬枡(THLX01_SYS)", - "閫�璐�(THLX02_SYS)", - "閫�璐цˉ璐�(THLX03_SYS)", - "浠呴��娆句笉閫�璐�()"}); + "閫�璐�(THLX01_SYS)", + "閫�璐цˉ璐�(THLX02_SYS)", + "浠呴��娆句笉閫�璐�(THLX03_SYS)"}); this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; this.repositoryItemComboBox1.NullText = "璇烽�夋嫨"; this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; @@ -1561,10 +1592,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions11.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", 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); @@ -1761,7 +1792,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1124, 366); + this.tabMxPage2.Size = new System.Drawing.Size(1124, 341); this.tabMxPage2.Text = "鎵爜鏄庣粏"; // // gcMx2 @@ -1772,7 +1803,7 @@ this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit2}); - this.gcMx2.Size = new System.Drawing.Size(1124, 366); + this.gcMx2.Size = new System.Drawing.Size(1124, 341); this.gcMx2.TabIndex = 3; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1912,10 +1943,10 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions12.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, 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, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // @@ -1929,6 +1960,46 @@ 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 // @@ -1996,6 +2067,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2164,5 +2236,11 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; 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; } } \ No newline at end of file -- Gitblit v1.9.3