From 3d28776f65176b8c6016e8a77911c3b934321d8a Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 29 三月 2025 08:10:29 +0800 Subject: [PATCH] 委外 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 432 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 255 insertions(+), 177 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 4ab0110..6fce649 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 columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -79,6 +79,7 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup(); this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit(); @@ -117,9 +118,10 @@ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -176,6 +178,7 @@ this.txtWlid = new DevExpress.XtraEditors.TextEdit(); this.labelControl7 = new DevExpress.XtraEditors.LabelControl(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.picCheckBox = new System.Windows.Forms.PictureBox(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -187,9 +190,12 @@ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); - this.picCheckBox = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -209,6 +215,7 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit(); @@ -244,9 +251,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -269,10 +277,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); this.tabMxPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -410,7 +418,7 @@ // gridColumn27 // this.gridColumn27.Caption = "婧愬崟鏍囪瘑"; - this.gridColumn27.FieldName = "isLink"; + this.gridColumn27.FieldName = "fIsLink"; this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; @@ -673,11 +681,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 = 171; + this.splitMx1.SplitterPosition = 188; this.splitMx1.TabIndex = 0; // // layoutMx1 // + this.layoutMx1.Controls.Add(this.txt_fIsLink); this.layoutMx1.Controls.Add(this.txt_fstockid); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_wjStatus); @@ -706,14 +715,28 @@ 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, 171); + this.layoutMx1.Size = new System.Drawing.Size(1126, 188); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; + // + // txt_fIsLink + // + this.txt_fIsLink.EditValue = "1"; + this.txt_fIsLink.Location = new System.Drawing.Point(84, 48); + this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0); + this.txt_fIsLink.Name = "txt_fIsLink"; + this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"), + new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)}); + this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0); + this.txt_fIsLink.Size = new System.Drawing.Size(195, 32); + this.txt_fIsLink.StyleController = this.layoutMx1; + this.txt_fIsLink.TabIndex = 534; // // txt_fstockid // this.txt_fstockid.IsReadly = false; - this.txt_fstockid.Location = new System.Drawing.Point(84, 108); + this.txt_fstockid.Location = new System.Drawing.Point(84, 120); this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0); this.txt_fstockid.Name = "txt_fstockid"; this.txt_fstockid.Size = new System.Drawing.Size(195, 28); @@ -729,7 +752,7 @@ // // txt_wjStatus // - this.txt_wjStatus.Location = new System.Drawing.Point(554, 140); + this.txt_wjStatus.Location = new System.Drawing.Point(554, 156); this.txt_wjStatus.Name = "txt_wjStatus"; this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑"; this.txt_wjStatus.Size = new System.Drawing.Size(267, 24); @@ -739,7 +762,7 @@ // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(825, 140); + this.txt_chkStatus.Location = new System.Drawing.Point(825, 156); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_chkStatus.Size = new System.Drawing.Size(268, 24); @@ -750,7 +773,7 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(355, 108); + this.txt_billType.Location = new System.Drawing.Point(355, 120); 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)}); @@ -764,14 +787,14 @@ // txt_salesOrderId // this.txt_salesOrderId.IsReadly = false; - this.txt_salesOrderId.Location = new System.Drawing.Point(84, 44); + this.txt_salesOrderId.Location = new System.Drawing.Point(84, 84); this.txt_salesOrderId.Name = "txt_salesOrderId"; 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(897, 108); + this.txt_approvedDate.Location = new System.Drawing.Point(897, 120); 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; @@ -793,7 +816,7 @@ // // txt_approvedBy // - this.txt_approvedBy.Location = new System.Drawing.Point(897, 76); + this.txt_approvedBy.Location = new System.Drawing.Point(897, 84); 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; @@ -826,7 +849,7 @@ // // txt_modifiedDate // - this.txt_modifiedDate.Location = new System.Drawing.Point(897, 44); + this.txt_modifiedDate.Location = new System.Drawing.Point(897, 48); 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; @@ -848,7 +871,7 @@ // // txt_salerName // - this.txt_salerName.Location = new System.Drawing.Point(355, 44); + this.txt_salerName.Location = new System.Drawing.Point(355, 48); 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; @@ -870,7 +893,7 @@ // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(355, 76); + this.txt_saleDeptName.Location = new System.Drawing.Point(355, 84); 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; @@ -881,7 +904,7 @@ // // txt_custName // - this.txt_custName.Location = new System.Drawing.Point(626, 44); + this.txt_custName.Location = new System.Drawing.Point(626, 48); 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; @@ -892,7 +915,7 @@ // // txt_createdDate // - this.txt_createdDate.Location = new System.Drawing.Point(626, 108); + this.txt_createdDate.Location = new System.Drawing.Point(626, 120); 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; @@ -903,17 +926,17 @@ // // txt_returnReason // - this.txt_returnReason.Location = new System.Drawing.Point(84, 76); + this.txt_returnReason.Location = new System.Drawing.Point(84, 156); 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(195, 28); + this.txt_returnReason.Size = new System.Drawing.Size(466, 28); this.txt_returnReason.StyleController = this.layoutMx1; this.txt_returnReason.TabIndex = 235; // // txt_createdBy // - this.txt_createdBy.Location = new System.Drawing.Point(626, 76); + this.txt_createdBy.Location = new System.Drawing.Point(626, 84); 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; @@ -963,41 +986,42 @@ this.layoutControlItem17, this.layoutControlItem18, this.layoutControlItem4, - this.layoutControlItem5, this.layoutControlItem9, - this.layoutControlItem20}); + this.layoutControlItem20, + this.layoutControlItem5, + this.layoutControlItem21}); 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; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - 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; + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition10.Height = 100D; + rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1105, 180); + rowDefinition6, + rowDefinition7, + rowDefinition8, + rowDefinition9, + rowDefinition10}); + this.Root.Size = new System.Drawing.Size(1105, 200); this.Root.TextVisible = false; // // layoutControlItem2 @@ -1006,7 +1030,7 @@ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(271, 36); this.layoutControlItem2.Text = "閿�鍞粍缁�"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // @@ -1016,73 +1040,73 @@ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(271, 36); this.layoutControlItem3.Text = "搴撳瓨缁勭粐"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_salerName; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 32); + this.layoutControlItem6.Location = new System.Drawing.Point(271, 36); 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(271, 36); this.layoutControlItem6.Text = "閿�鍞憳"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_saleDeptName; - this.layoutControlItem7.Location = new System.Drawing.Point(271, 64); + this.layoutControlItem7.Location = new System.Drawing.Point(271, 72); 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(271, 36); this.layoutControlItem7.Text = "閿�鍞儴闂�"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_custName; - this.layoutControlItem8.Location = new System.Drawing.Point(542, 32); + this.layoutControlItem8.Location = new System.Drawing.Point(542, 36); 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(271, 36); this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_billType; - this.layoutControlItem10.Location = new System.Drawing.Point(271, 96); + this.layoutControlItem10.Location = new System.Drawing.Point(271, 108); 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(271, 36); this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_createdBy; - this.layoutControlItem11.Location = new System.Drawing.Point(542, 64); + this.layoutControlItem11.Location = new System.Drawing.Point(542, 72); 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(271, 36); this.layoutControlItem11.Text = "鍒涘缓浜�"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createdDate; - this.layoutControlItem12.Location = new System.Drawing.Point(542, 96); + this.layoutControlItem12.Location = new System.Drawing.Point(542, 108); 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(271, 36); this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // @@ -1092,51 +1116,51 @@ this.layoutControlItem13.Location = new System.Drawing.Point(813, 0); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem13.Size = new System.Drawing.Size(272, 36); this.layoutControlItem13.Text = "淇敼浜�"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_modifiedDate; - this.layoutControlItem14.Location = new System.Drawing.Point(813, 32); + this.layoutControlItem14.Location = new System.Drawing.Point(813, 36); 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(272, 36); this.layoutControlItem14.Text = "淇敼鏃堕棿"; this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_approvedBy; - this.layoutControlItem15.Location = new System.Drawing.Point(813, 64); + this.layoutControlItem15.Location = new System.Drawing.Point(813, 72); 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(272, 36); this.layoutControlItem15.Text = "瀹℃牳浜�"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_approvedDate; - this.layoutControlItem16.Location = new System.Drawing.Point(813, 96); + this.layoutControlItem16.Location = new System.Drawing.Point(813, 108); 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(272, 36); this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_chkStatus; - this.layoutControlItem17.Location = new System.Drawing.Point(813, 128); + this.layoutControlItem17.Location = new System.Drawing.Point(813, 144); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem17.Size = new System.Drawing.Size(272, 36); this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem17.TextVisible = false; @@ -1144,11 +1168,11 @@ // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_wjStatus; - this.layoutControlItem18.Location = new System.Drawing.Point(542, 128); + this.layoutControlItem18.Location = new System.Drawing.Point(542, 144); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem18.Size = new System.Drawing.Size(271, 36); this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem18.TextVisible = false; @@ -1158,39 +1182,50 @@ 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.Size = new System.Drawing.Size(271, 36); 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.Location = new System.Drawing.Point(0, 144); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem9.Size = new System.Drawing.Size(542, 36); 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, 96); + this.layoutControlItem20.Location = new System.Drawing.Point(0, 108); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem20.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem20.Size = new System.Drawing.Size(271, 36); this.layoutControlItem20.Text = "閫夋嫨浠撳簱"; this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_salesOrderId; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem5.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem5.Text = "閿�鍞鍗�"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_fIsLink; + this.layoutControlItem21.Location = new System.Drawing.Point(0, 36); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem21.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem21.Text = "鏈夋棤婧愬崟"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -1198,7 +1233,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, 387); + this.tabMx.Size = new System.Drawing.Size(1126, 370); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1209,7 +1244,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, 355); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 338); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -1223,7 +1258,7 @@ this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 253); + this.gcMx1.Size = new System.Drawing.Size(1124, 236); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1270,7 +1305,7 @@ this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Tag = "edit"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 3; + this.gridColumn2.VisibleIndex = 0; this.gridColumn2.Width = 94; // // repositoryItemSearchLookUpEdit1 @@ -1361,16 +1396,12 @@ this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid"; this.gridColumn11.FieldName = "ckmxGuid"; this.gridColumn11.Name = "gridColumn11"; - this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 7; // // gridColumn23 // this.gridColumn23.Caption = "鐗╂枡ID"; this.gridColumn23.FieldName = "itemId"; this.gridColumn23.Name = "gridColumn23"; - this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 8; // // gvMx1id // @@ -1381,8 +1412,6 @@ 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 @@ -1394,8 +1423,6 @@ this.gvMx1materialId.MinWidth = 50; this.gvMx1materialId.Name = "gvMx1materialId"; this.gvMx1materialId.Tag = "query_a.MATERIAL_ID"; - this.gvMx1materialId.Visible = true; - this.gvMx1materialId.VisibleIndex = 1; this.gvMx1materialId.Width = 94; // // gvMx1materialName @@ -1408,7 +1435,7 @@ this.gvMx1materialName.Name = "gvMx1materialName"; this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME"; this.gvMx1materialName.Visible = true; - this.gvMx1materialName.VisibleIndex = 4; + this.gvMx1materialName.VisibleIndex = 1; this.gvMx1materialName.Width = 94; // // gvMx1materialSpecification @@ -1421,7 +1448,7 @@ this.gvMx1materialSpecification.Name = "gvMx1materialSpecification"; this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION"; this.gvMx1materialSpecification.Visible = true; - this.gvMx1materialSpecification.VisibleIndex = 5; + this.gvMx1materialSpecification.VisibleIndex = 2; this.gvMx1materialSpecification.Width = 94; // // gridColumn20 @@ -1431,7 +1458,7 @@ this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 6; + this.gridColumn20.VisibleIndex = 3; this.gridColumn20.Width = 94; // // gvMx1salesUnitId @@ -1444,7 +1471,7 @@ this.gvMx1salesUnitId.Name = "gvMx1salesUnitId"; this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID"; this.gvMx1salesUnitId.Visible = true; - this.gvMx1salesUnitId.VisibleIndex = 7; + this.gvMx1salesUnitId.VisibleIndex = 4; this.gvMx1salesUnitId.Width = 94; // // gvMx1salesQuantity @@ -1457,7 +1484,7 @@ this.gvMx1salesQuantity.Name = "gvMx1salesQuantity"; this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY"; this.gvMx1salesQuantity.Visible = true; - this.gvMx1salesQuantity.VisibleIndex = 8; + this.gvMx1salesQuantity.VisibleIndex = 5; this.gvMx1salesQuantity.Width = 94; // // gvMx1note @@ -1474,7 +1501,7 @@ this.gvMx1note.Name = "gvMx1note"; this.gvMx1note.Tag = "edit"; this.gvMx1note.Visible = true; - this.gvMx1note.VisibleIndex = 9; + this.gvMx1note.VisibleIndex = 6; this.gvMx1note.Width = 94; // // gridColumn13 @@ -1489,7 +1516,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "yz_quantity_0_edit"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 10; + this.gridColumn13.VisibleIndex = 7; this.gridColumn13.Width = 94; // // gvMx1returnDate @@ -1507,7 +1534,7 @@ this.gvMx1returnDate.Name = "gvMx1returnDate"; this.gvMx1returnDate.Tag = "edit"; this.gvMx1returnDate.Visible = true; - this.gvMx1returnDate.VisibleIndex = 12; + this.gvMx1returnDate.VisibleIndex = 9; this.gvMx1returnDate.Width = 94; // // repositoryItemDateEdit1 @@ -1529,7 +1556,7 @@ this.gvMx1isFree.Name = "gvMx1isFree"; this.gvMx1isFree.Tag = "query_a.IS_FREE"; this.gvMx1isFree.Visible = true; - this.gvMx1isFree.VisibleIndex = 11; + this.gvMx1isFree.VisibleIndex = 8; this.gvMx1isFree.Width = 94; // // gvMx1returnType @@ -1547,7 +1574,7 @@ this.gvMx1returnType.Name = "gvMx1returnType"; this.gvMx1returnType.Tag = "edit"; this.gvMx1returnType.Visible = true; - this.gvMx1returnType.VisibleIndex = 14; + this.gvMx1returnType.VisibleIndex = 11; this.gvMx1returnType.Width = 94; // // repositoryItemComboBox1 @@ -1573,7 +1600,7 @@ this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit"; this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; this.gvMx1inventoryUnit.Visible = true; - this.gvMx1inventoryUnit.VisibleIndex = 13; + this.gvMx1inventoryUnit.VisibleIndex = 10; this.gvMx1inventoryUnit.Width = 94; // // gridColumn12 @@ -1582,8 +1609,6 @@ 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 @@ -1593,7 +1618,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 15; + this.gridColumn21.VisibleIndex = 12; this.gridColumn21.Width = 94; // // gridColumn22 @@ -1603,7 +1628,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 16; + this.gridColumn22.VisibleIndex = 13; this.gridColumn22.Width = 94; // // gvMxDel @@ -1613,16 +1638,16 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 17; + this.gvMxDel.VisibleIndex = 14; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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); @@ -1820,8 +1845,19 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1124, 355); - this.tabMxPage2.Text = "鎵爜鏄庣粏"; + this.tabMxPage2.Size = new System.Drawing.Size(1124, 338); + this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�"; + // + // picCheckBox + // + this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; + this.picCheckBox.Location = new System.Drawing.Point(962, 40); + this.picCheckBox.Name = "picCheckBox"; + this.picCheckBox.Size = new System.Drawing.Size(100, 50); + this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picCheckBox.TabIndex = 451; + this.picCheckBox.TabStop = false; + this.picCheckBox.Visible = false; // // gcMx2 // @@ -1831,7 +1867,7 @@ this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit2}); - this.gcMx2.Size = new System.Drawing.Size(1124, 355); + this.gcMx2.Size = new System.Drawing.Size(1124, 338); this.gcMx2.TabIndex = 3; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1850,6 +1886,10 @@ this.gridColumn17, this.gvMx1createBy, this.gvMx1lotDate, + this.gridColumn28, + this.gridColumn29, + this.gridColumn30, + this.gridColumn31, this.gvBtnAlawys}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; @@ -1960,6 +2000,46 @@ this.gvMx1lotDate.VisibleIndex = 7; this.gvMx1lotDate.Width = 94; // + // gridColumn28 + // + this.gridColumn28.Caption = "鏄惁鍏ュ簱"; + this.gridColumn28.FieldName = "isRk"; + this.gridColumn28.MinWidth = 25; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 8; + this.gridColumn28.Width = 94; + // + // gridColumn29 + // + this.gridColumn29.Caption = "鍏ュ簱浜�"; + this.gridColumn29.FieldName = "rkUser"; + this.gridColumn29.MinWidth = 25; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 9; + this.gridColumn29.Width = 94; + // + // gridColumn30 + // + this.gridColumn30.Caption = "鍏ュ簱鏃ユ湡"; + this.gridColumn30.FieldName = "rkDate"; + this.gridColumn30.MinWidth = 25; + this.gridColumn30.Name = "gridColumn30"; + this.gridColumn30.Visible = true; + this.gridColumn30.VisibleIndex = 10; + this.gridColumn30.Width = 94; + // + // gridColumn31 + // + this.gridColumn31.Caption = "鍏ュ簱浣�"; + this.gridColumn31.FieldName = "rkPositon"; + this.gridColumn31.MinWidth = 25; + this.gridColumn31.Name = "gridColumn31"; + this.gridColumn31.Visible = true; + this.gridColumn31.VisibleIndex = 11; + this.gridColumn31.Width = 94; + // // gvBtnAlawys // this.gvBtnAlawys.Caption = "绉诲嚭"; @@ -1967,29 +2047,19 @@ this.gvBtnAlawys.MinWidth = 25; this.gvBtnAlawys.Name = "gvBtnAlawys"; this.gvBtnAlawys.Visible = true; - this.gvBtnAlawys.VisibleIndex = 8; + this.gvBtnAlawys.VisibleIndex = 12; this.gvBtnAlawys.Width = 94; // // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; - // - // picCheckBox - // - this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; - this.picCheckBox.Location = new System.Drawing.Point(962, 40); - this.picCheckBox.Name = "picCheckBox"; - this.picCheckBox.Size = new System.Drawing.Size(100, 50); - this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.picCheckBox.TabIndex = 451; - this.picCheckBox.TabStop = false; - this.picCheckBox.Visible = false; + this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); // // Frm_SalesReturnNotice // @@ -2020,6 +2090,7 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit(); @@ -2055,9 +2126,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2081,10 +2153,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); this.tabMxPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); } @@ -2203,19 +2275,6 @@ private DevExpress.XtraEditors.TextEdit txtWlid; private DevExpress.XtraEditors.LabelControl labelControl7; private DevExpress.XtraTab.XtraTabPage tabMxPage2; - private DevExpress.XtraGrid.GridControl gcMx2; - private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate; - private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; @@ -2227,9 +2286,28 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraEditors.RadioGroup txt_fIsLink; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraGrid.GridControl gcMx2; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; + private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; } } \ No newline at end of file -- Gitblit v1.9.3