From b6c12e8cdcaf1891824ebec5d772a3e4ce00bbf0 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 01 三月 2025 14:13:06 +0800 Subject: [PATCH] 销售 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 274 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 175 insertions(+), 99 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 0097fd0..aa263be 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs @@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { - 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); this.gvMx1erpHeadId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1erpLineId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1orderBillNo = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -41,16 +41,17 @@ this.gvMx1sourceBillType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1ownerId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1ownerTypeId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1materialCategory = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1inventoryQuantity = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1salesClerk = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1lotNumber = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1planTrackingNumber = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1warehouse = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1salesQuantity = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1salesUnitId = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -72,7 +73,9 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.lb_billStatus = new DevExpress.XtraEditors.LabelControl(); @@ -167,7 +170,6 @@ this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_billType = new DevExpress.XtraEditors.LabelControl(); - this.txt_billType = new DevExpress.XtraEditors.TextEdit(); this.gv_billType = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_id = new DevExpress.XtraEditors.LabelControl(); this.txt_id = new DevExpress.XtraEditors.TextEdit(); @@ -182,10 +184,14 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.panel1 = new System.Windows.Forms.Panel(); + this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_customerOrderNo = new Gs.DevApp.UserControl.UcLookSales(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -218,7 +224,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); @@ -229,6 +234,7 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -323,19 +329,6 @@ this.gvMx1ownerTypeId.VisibleIndex = 19; this.gvMx1ownerTypeId.Width = 94; // - // gvMx1materialCategory - // - this.gvMx1materialCategory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1materialCategory.AppearanceCell.Options.UseFont = true; - this.gvMx1materialCategory.Caption = "鐗╂枡绫诲埆 "; - this.gvMx1materialCategory.FieldName = "materialCategory"; - this.gvMx1materialCategory.MinWidth = 50; - this.gvMx1materialCategory.Name = "gvMx1materialCategory"; - this.gvMx1materialCategory.Tag = "query_a.MATERIAL_CATEGORY"; - this.gvMx1materialCategory.Visible = true; - this.gvMx1materialCategory.VisibleIndex = 18; - this.gvMx1materialCategory.Width = 94; - // // gvMx1inventoryQuantity // this.gvMx1inventoryQuantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -346,7 +339,7 @@ this.gvMx1inventoryQuantity.Name = "gvMx1inventoryQuantity"; this.gvMx1inventoryQuantity.Tag = "query_a.INVENTORY_QUANTITY"; this.gvMx1inventoryQuantity.Visible = true; - this.gvMx1inventoryQuantity.VisibleIndex = 17; + this.gvMx1inventoryQuantity.VisibleIndex = 18; this.gvMx1inventoryQuantity.Width = 94; // // gvMx1inventoryUnit @@ -359,7 +352,7 @@ this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit"; this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; this.gvMx1inventoryUnit.Visible = true; - this.gvMx1inventoryUnit.VisibleIndex = 16; + this.gvMx1inventoryUnit.VisibleIndex = 17; this.gvMx1inventoryUnit.Width = 94; // // gvMx1salesClerk @@ -372,33 +365,55 @@ this.gvMx1salesClerk.Name = "gvMx1salesClerk"; this.gvMx1salesClerk.Tag = "query_a.SALES_CLERK"; this.gvMx1salesClerk.Visible = true; - this.gvMx1salesClerk.VisibleIndex = 15; + this.gvMx1salesClerk.VisibleIndex = 16; this.gvMx1salesClerk.Width = 94; // // gvMx1returnType // this.gvMx1returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1returnType.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gvMx1returnType.AppearanceCell.Options.UseFont = true; + this.gvMx1returnType.AppearanceCell.Options.UseForeColor = true; + this.gvMx1returnType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gvMx1returnType.AppearanceHeader.Options.UseForeColor = true; this.gvMx1returnType.Caption = "閫�璐х被鍨� "; + this.gvMx1returnType.ColumnEdit = this.repositoryItemComboBox1; this.gvMx1returnType.FieldName = "returnType"; this.gvMx1returnType.MinWidth = 50; this.gvMx1returnType.Name = "gvMx1returnType"; - this.gvMx1returnType.Tag = "query_a.RETURN_TYPE"; + this.gvMx1returnType.Tag = "edit"; this.gvMx1returnType.Visible = true; - this.gvMx1returnType.VisibleIndex = 14; + this.gvMx1returnType.VisibleIndex = 15; this.gvMx1returnType.Width = 94; + // + // repositoryItemComboBox1 + // + this.repositoryItemComboBox1.AutoHeight = false; + 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)", + "浠呴��娆句笉閫�璐�()"}); + this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; + this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; // // gvMx1note // this.gvMx1note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1note.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gvMx1note.AppearanceCell.Options.UseFont = true; - this.gvMx1note.Caption = "澶囨敞 "; + this.gvMx1note.AppearanceCell.Options.UseForeColor = true; + this.gvMx1note.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gvMx1note.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1note.Caption = "鐢宠澶囨敞 "; this.gvMx1note.FieldName = "note"; this.gvMx1note.MinWidth = 50; this.gvMx1note.Name = "gvMx1note"; - this.gvMx1note.Tag = "query_a.NOTE"; + this.gvMx1note.Tag = "edit"; this.gvMx1note.Visible = true; - this.gvMx1note.VisibleIndex = 13; + this.gvMx1note.VisibleIndex = 8; this.gvMx1note.Width = 94; // // gvMx1lotNumber @@ -411,7 +426,7 @@ this.gvMx1lotNumber.Name = "gvMx1lotNumber"; this.gvMx1lotNumber.Tag = "query_a.LOT_NUMBER"; this.gvMx1lotNumber.Visible = true; - this.gvMx1lotNumber.VisibleIndex = 12; + this.gvMx1lotNumber.VisibleIndex = 14; this.gvMx1lotNumber.Width = 94; // // gvMx1planTrackingNumber @@ -424,7 +439,7 @@ this.gvMx1planTrackingNumber.Name = "gvMx1planTrackingNumber"; this.gvMx1planTrackingNumber.Tag = "query_a.PLAN_TRACKING_NUMBER"; this.gvMx1planTrackingNumber.Visible = true; - this.gvMx1planTrackingNumber.VisibleIndex = 11; + this.gvMx1planTrackingNumber.VisibleIndex = 13; this.gvMx1planTrackingNumber.Width = 94; // // gvMx1warehouse @@ -437,21 +452,35 @@ this.gvMx1warehouse.Name = "gvMx1warehouse"; this.gvMx1warehouse.Tag = "query_a.WAREHOUSE"; this.gvMx1warehouse.Visible = true; - this.gvMx1warehouse.VisibleIndex = 10; + this.gvMx1warehouse.VisibleIndex = 12; this.gvMx1warehouse.Width = 94; // // gvMx1returnDate // this.gvMx1returnDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1returnDate.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gvMx1returnDate.AppearanceCell.Options.UseFont = true; + this.gvMx1returnDate.AppearanceCell.Options.UseForeColor = true; + this.gvMx1returnDate.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gvMx1returnDate.AppearanceHeader.Options.UseForeColor = true; this.gvMx1returnDate.Caption = "閫�璐ф棩鏈� "; + this.gvMx1returnDate.ColumnEdit = this.repositoryItemDateEdit1; this.gvMx1returnDate.FieldName = "returnDate"; this.gvMx1returnDate.MinWidth = 50; this.gvMx1returnDate.Name = "gvMx1returnDate"; - this.gvMx1returnDate.Tag = "query_a.RETURN_DATE"; + this.gvMx1returnDate.Tag = "edit"; this.gvMx1returnDate.Visible = true; - this.gvMx1returnDate.VisibleIndex = 9; + this.gvMx1returnDate.VisibleIndex = 11; this.gvMx1returnDate.Width = 94; + // + // repositoryItemDateEdit1 + // + this.repositoryItemDateEdit1.AutoHeight = false; + this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; // // gvMx1isFree // @@ -463,7 +492,7 @@ this.gvMx1isFree.Name = "gvMx1isFree"; this.gvMx1isFree.Tag = "query_a.IS_FREE"; this.gvMx1isFree.Visible = true; - this.gvMx1isFree.VisibleIndex = 8; + this.gvMx1isFree.VisibleIndex = 9; this.gvMx1isFree.Width = 94; // // gvMx1salesQuantity @@ -572,7 +601,9 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemSearchLookUpEdit1, - this.repositoryItemButtonEdit1}); + this.repositoryItemButtonEdit1, + this.repositoryItemComboBox1, + this.repositoryItemDateEdit1}); this.gcMx1.Size = new System.Drawing.Size(1124, 236); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -589,17 +620,17 @@ this.gvMx1materialSpecification, this.gvMx1salesUnitId, this.gvMx1salesQuantity, - this.gvMx1isFree, + this.gvMx1note, + this.gridColumn13, this.gvMx1returnDate, + this.gvMx1isFree, this.gvMx1warehouse, this.gvMx1planTrackingNumber, this.gvMx1lotNumber, - this.gvMx1note, this.gvMx1returnType, this.gvMx1salesClerk, this.gvMx1inventoryUnit, this.gvMx1inventoryQuantity, - this.gvMx1materialCategory, this.gvMx1ownerTypeId, this.gvMx1ownerId, this.gvMx1sourceBillType, @@ -607,7 +638,7 @@ this.gvMx1orderBillNo, this.gvMx1erpLineId, this.gvMx1erpHeadId, - this.gridColumn3, + this.gridColumn12, this.gvMxDel}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -639,6 +670,7 @@ this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1"; this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨"; this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View; + this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged); // // repositoryItemSearchLookUpEdit1View // @@ -649,7 +681,8 @@ this.gridColumn7, this.gridColumn8, this.gridColumn9, - this.gridColumn10}); + this.gridColumn10, + this.gridColumn11}); this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View"; this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; @@ -658,6 +691,7 @@ // gridColumn4 // this.gridColumn4.Caption = "閿�鍞崟鍙�"; + this.gridColumn4.FieldName = "xsHno"; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 0; @@ -665,6 +699,7 @@ // gridColumn5 // this.gridColumn5.Caption = "鍙戣揣鍗曞彿"; + this.gridColumn5.FieldName = "fhNo"; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 1; @@ -672,6 +707,7 @@ // gridColumn6 // this.gridColumn6.Caption = "鐗╂枡缂栧彿"; + this.gridColumn6.FieldName = "itemNo"; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 2; @@ -679,6 +715,7 @@ // gridColumn7 // this.gridColumn7.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn7.FieldName = "itemName"; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 3; @@ -686,6 +723,7 @@ // gridColumn8 // this.gridColumn8.Caption = "鐗╂枡瑙勬牸"; + this.gridColumn8.FieldName = "itemModel"; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 4; @@ -693,6 +731,7 @@ // gridColumn9 // this.gridColumn9.Caption = "鍙戣揣鏁伴噺"; + this.gridColumn9.FieldName = "fhSl"; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 5; @@ -700,18 +739,43 @@ // gridColumn10 // this.gridColumn10.Caption = "宸查��鏁伴噺"; + this.gridColumn10.FieldName = "ytSl"; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 6; // - // gridColumn3 + // gridColumn11 // - this.gridColumn3.Caption = "gridColumn3"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 26; - this.gridColumn3.Width = 94; + this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid"; + this.gridColumn11.FieldName = "ckmxGuid"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 7; + // + // gridColumn13 + // + this.gridColumn13.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn13.AppearanceCell.Options.UseForeColor = true; + this.gridColumn13.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn13.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn13.Caption = "鐢宠鏁伴噺"; + this.gridColumn13.FieldName = "sqQty"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Tag = "yz_quantity_0_edit"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 10; + this.gridColumn13.Width = 94; + // + // gridColumn12 + // + this.gridColumn12.Caption = "閫�璐ф槑缁唃uid"; + this.gridColumn12.FieldName = "deliveDetailGuid"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 27; + this.gridColumn12.Width = 94; // // gvMxDel // @@ -720,23 +784,25 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 27; + this.gvMxDel.VisibleIndex = 26; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; + this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // lb_billStatus // this.lb_billStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_billStatus.Appearance.Options.UseFont = true; - this.lb_billStatus.Location = new System.Drawing.Point(770, 54); + this.lb_billStatus.Location = new System.Drawing.Point(770, 52); this.lb_billStatus.Name = "lb_billStatus"; this.lb_billStatus.Size = new System.Drawing.Size(73, 21); this.lb_billStatus.TabIndex = 450; @@ -744,7 +810,7 @@ // // txt_billStatus // - this.txt_billStatus.Location = new System.Drawing.Point(830, 54); + this.txt_billStatus.Location = new System.Drawing.Point(830, 48); this.txt_billStatus.Name = "txt_billStatus"; this.txt_billStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_billStatus.Properties.Appearance.Options.UseFont = true; @@ -994,7 +1060,7 @@ // this.lb_modifiedBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_modifiedBy.Appearance.Options.UseFont = true; - this.lb_modifiedBy.Location = new System.Drawing.Point(520, 212); + this.lb_modifiedBy.Location = new System.Drawing.Point(520, 180); this.lb_modifiedBy.Name = "lb_modifiedBy"; this.lb_modifiedBy.Size = new System.Drawing.Size(56, 21); this.lb_modifiedBy.TabIndex = 327; @@ -1002,7 +1068,7 @@ // // txt_modifiedBy // - this.txt_modifiedBy.Location = new System.Drawing.Point(580, 212); + this.txt_modifiedBy.Location = new System.Drawing.Point(580, 180); 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; @@ -1027,7 +1093,7 @@ // this.lb_createdDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createdDate.Appearance.Options.UseFont = true; - this.lb_createdDate.Location = new System.Drawing.Point(270, 212); + this.lb_createdDate.Location = new System.Drawing.Point(253, 155); this.lb_createdDate.Name = "lb_createdDate"; this.lb_createdDate.Size = new System.Drawing.Size(73, 21); this.lb_createdDate.TabIndex = 319; @@ -1035,7 +1101,7 @@ // // txt_createdDate // - this.txt_createdDate.Location = new System.Drawing.Point(330, 212); + this.txt_createdDate.Location = new System.Drawing.Point(313, 155); 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; @@ -1126,7 +1192,7 @@ // this.lb_receiverName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_receiverName.Appearance.Options.UseFont = true; - this.lb_receiverName.Location = new System.Drawing.Point(520, 180); + this.lb_receiverName.Location = new System.Drawing.Point(520, 148); this.lb_receiverName.Name = "lb_receiverName"; this.lb_receiverName.Size = new System.Drawing.Size(90, 21); this.lb_receiverName.TabIndex = 298; @@ -1134,7 +1200,7 @@ // // txt_receiverName // - this.txt_receiverName.Location = new System.Drawing.Point(580, 180); + this.txt_receiverName.Location = new System.Drawing.Point(580, 148); this.txt_receiverName.Name = "txt_receiverName"; this.txt_receiverName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_receiverName.Properties.Appearance.Options.UseFont = true; @@ -1159,7 +1225,7 @@ // this.lb_receiverAddress.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_receiverAddress.Appearance.Options.UseFont = true; - this.lb_receiverAddress.Location = new System.Drawing.Point(270, 180); + this.lb_receiverAddress.Location = new System.Drawing.Point(270, 116); this.lb_receiverAddress.Name = "lb_receiverAddress"; this.lb_receiverAddress.Size = new System.Drawing.Size(90, 21); this.lb_receiverAddress.TabIndex = 291; @@ -1167,7 +1233,7 @@ // // txt_receiverAddress // - this.txt_receiverAddress.Location = new System.Drawing.Point(330, 180); + this.txt_receiverAddress.Location = new System.Drawing.Point(330, 112); this.txt_receiverAddress.Name = "txt_receiverAddress"; this.txt_receiverAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_receiverAddress.Properties.Appearance.Options.UseFont = true; @@ -1258,7 +1324,7 @@ // this.lb_expressNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_expressNo.Appearance.Options.UseFont = true; - this.lb_expressNo.Location = new System.Drawing.Point(520, 148); + this.lb_expressNo.Location = new System.Drawing.Point(520, 116); this.lb_expressNo.Name = "lb_expressNo"; this.lb_expressNo.Size = new System.Drawing.Size(73, 21); this.lb_expressNo.TabIndex = 273; @@ -1266,7 +1332,7 @@ // // txt_expressNo // - this.txt_expressNo.Location = new System.Drawing.Point(580, 148); + this.txt_expressNo.Location = new System.Drawing.Point(580, 112); this.txt_expressNo.Name = "txt_expressNo"; this.txt_expressNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_expressNo.Properties.Appearance.Options.UseFont = true; @@ -1291,7 +1357,7 @@ // this.lb_salesPerson.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_salesPerson.Appearance.Options.UseFont = true; - this.lb_salesPerson.Location = new System.Drawing.Point(270, 148); + this.lb_salesPerson.Location = new System.Drawing.Point(270, 84); this.lb_salesPerson.Name = "lb_salesPerson"; this.lb_salesPerson.Size = new System.Drawing.Size(56, 21); this.lb_salesPerson.TabIndex = 267; @@ -1299,7 +1365,7 @@ // // txt_salesPerson // - this.txt_salesPerson.Location = new System.Drawing.Point(330, 148); + this.txt_salesPerson.Location = new System.Drawing.Point(330, 80); this.txt_salesPerson.Name = "txt_salesPerson"; this.txt_salesPerson.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_salesPerson.Properties.Appearance.Options.UseFont = true; @@ -1332,7 +1398,7 @@ // // txt_salesGroup // - this.txt_salesGroup.Location = new System.Drawing.Point(80, 116); + this.txt_salesGroup.Location = new System.Drawing.Point(80, 112); this.txt_salesGroup.Name = "txt_salesGroup"; this.txt_salesGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_salesGroup.Properties.Appearance.Options.UseFont = true; @@ -1365,7 +1431,7 @@ // // txt_warehouseManager // - this.txt_warehouseManager.Location = new System.Drawing.Point(830, 116); + this.txt_warehouseManager.Location = new System.Drawing.Point(830, 112); this.txt_warehouseManager.Name = "txt_warehouseManager"; this.txt_warehouseManager.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_warehouseManager.Properties.Appearance.Options.UseFont = true; @@ -1390,7 +1456,7 @@ // this.lb_inventoryGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_inventoryGroup.Appearance.Options.UseFont = true; - this.lb_inventoryGroup.Location = new System.Drawing.Point(520, 116); + this.lb_inventoryGroup.Location = new System.Drawing.Point(520, 84); this.lb_inventoryGroup.Name = "lb_inventoryGroup"; this.lb_inventoryGroup.Size = new System.Drawing.Size(56, 21); this.lb_inventoryGroup.TabIndex = 252; @@ -1398,7 +1464,7 @@ // // txt_inventoryGroup // - this.txt_inventoryGroup.Location = new System.Drawing.Point(580, 116); + this.txt_inventoryGroup.Location = new System.Drawing.Point(580, 80); this.txt_inventoryGroup.Name = "txt_inventoryGroup"; this.txt_inventoryGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_inventoryGroup.Properties.Appearance.Options.UseFont = true; @@ -1423,7 +1489,7 @@ // this.lb_inventoryDept.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_inventoryDept.Appearance.Options.UseFont = true; - this.lb_inventoryDept.Location = new System.Drawing.Point(270, 116); + this.lb_inventoryDept.Location = new System.Drawing.Point(270, 52); this.lb_inventoryDept.Name = "lb_inventoryDept"; this.lb_inventoryDept.Size = new System.Drawing.Size(73, 21); this.lb_inventoryDept.TabIndex = 247; @@ -1431,7 +1497,7 @@ // // txt_inventoryDept // - this.txt_inventoryDept.Location = new System.Drawing.Point(330, 116); + this.txt_inventoryDept.Location = new System.Drawing.Point(330, 48); this.txt_inventoryDept.Name = "txt_inventoryDept"; this.txt_inventoryDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_inventoryDept.Properties.Appearance.Options.UseFont = true; @@ -1464,7 +1530,7 @@ // // txt_inventoryOrg // - this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 84); + this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 80); 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; @@ -1497,7 +1563,7 @@ // // txt_deliveryLocation // - this.txt_deliveryLocation.Location = new System.Drawing.Point(830, 84); + this.txt_deliveryLocation.Location = new System.Drawing.Point(830, 80); this.txt_deliveryLocation.Name = "txt_deliveryLocation"; this.txt_deliveryLocation.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_deliveryLocation.Properties.Appearance.Options.UseFont = true; @@ -1522,7 +1588,7 @@ // this.lb_returnReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_returnReason.Appearance.Options.UseFont = true; - this.lb_returnReason.Location = new System.Drawing.Point(388, 263); + this.lb_returnReason.Location = new System.Drawing.Point(287, 263); this.lb_returnReason.Name = "lb_returnReason"; this.lb_returnReason.Size = new System.Drawing.Size(73, 21); this.lb_returnReason.TabIndex = 235; @@ -1530,7 +1596,7 @@ // // txt_returnReason // - this.txt_returnReason.Location = new System.Drawing.Point(448, 259); + this.txt_returnReason.Location = new System.Drawing.Point(347, 259); 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; @@ -1577,7 +1643,7 @@ // // txt_returnCustomer // - this.txt_returnCustomer.Location = new System.Drawing.Point(80, 52); + this.txt_returnCustomer.Location = new System.Drawing.Point(80, 48); this.txt_returnCustomer.Name = "txt_returnCustomer"; this.txt_returnCustomer.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_returnCustomer.Properties.Appearance.Options.UseFont = true; @@ -1634,7 +1700,7 @@ // // txt_salesDept // - this.txt_salesDept.Location = new System.Drawing.Point(580, 52); + this.txt_salesDept.Location = new System.Drawing.Point(580, 48); this.txt_salesDept.Name = "txt_salesDept"; this.txt_salesDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_salesDept.Properties.Appearance.Options.UseFont = true; @@ -1659,7 +1725,7 @@ // this.lb_salesOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_salesOrg.Appearance.Options.UseFont = true; - this.lb_salesOrg.Location = new System.Drawing.Point(270, 52); + this.lb_salesOrg.Location = new System.Drawing.Point(270, 20); this.lb_salesOrg.Name = "lb_salesOrg"; this.lb_salesOrg.Size = new System.Drawing.Size(73, 21); this.lb_salesOrg.TabIndex = 219; @@ -1667,7 +1733,7 @@ // // txt_salesOrg // - this.txt_salesOrg.Location = new System.Drawing.Point(330, 52); + this.txt_salesOrg.Location = new System.Drawing.Point(330, 16); this.txt_salesOrg.Name = "txt_salesOrg"; this.txt_salesOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_salesOrg.Properties.Appearance.Options.UseFont = true; @@ -1714,7 +1780,7 @@ // // txt_fDate // - this.txt_fDate.Location = new System.Drawing.Point(830, 20); + this.txt_fDate.Location = new System.Drawing.Point(830, 16); this.txt_fDate.Name = "txt_fDate"; this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fDate.Properties.Appearance.Options.UseFont = true; @@ -1747,7 +1813,7 @@ // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(580, 20); + this.txt_billNo.Location = new System.Drawing.Point(580, 16); 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; @@ -1772,20 +1838,11 @@ // this.lb_billType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_billType.Appearance.Options.UseFont = true; - this.lb_billType.Location = new System.Drawing.Point(631, 263); + this.lb_billType.Location = new System.Drawing.Point(510, 262); this.lb_billType.Name = "lb_billType"; this.lb_billType.Size = new System.Drawing.Size(73, 21); this.lb_billType.TabIndex = 211; this.lb_billType.Text = "鍗曟嵁绫诲瀷 "; - // - // txt_billType - // - this.txt_billType.Location = new System.Drawing.Point(691, 259); - this.txt_billType.Name = "txt_billType"; - this.txt_billType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_billType.Properties.Appearance.Options.UseFont = true; - this.txt_billType.Size = new System.Drawing.Size(150, 28); - this.txt_billType.TabIndex = 211; // // gv_billType // @@ -1813,7 +1870,7 @@ // // txt_id // - this.txt_id.Location = new System.Drawing.Point(80, 20); + this.txt_id.Location = new System.Drawing.Point(80, 16); 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; @@ -1979,6 +2036,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_billType); this.panel1.Controls.Add(this.txt_customerOrderNo); this.panel1.Controls.Add(this.labelControl11); this.panel1.Controls.Add(this.lbGuid); @@ -2036,7 +2094,6 @@ this.panel1.Controls.Add(this.lb_billNo); this.panel1.Controls.Add(this.txt_billNo); this.panel1.Controls.Add(this.lb_billType); - this.panel1.Controls.Add(this.txt_billType); this.panel1.Controls.Add(this.lb_id); this.panel1.Controls.Add(this.txt_id); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2046,12 +2103,25 @@ this.panel1.Size = new System.Drawing.Size(1126, 302); this.panel1.TabIndex = 1; // + // txt_billType + // + this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; + this.txt_billType.Location = new System.Drawing.Point(589, 260); + 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(185, 24); + this.txt_billType.TabIndex = 451; + // // txt_customerOrderNo // this.txt_customerOrderNo.IsReadly = false; this.txt_customerOrderNo.Location = new System.Drawing.Point(113, 259); this.txt_customerOrderNo.Name = "txt_customerOrderNo"; - this.txt_customerOrderNo.Size = new System.Drawing.Size(234, 29); + this.txt_customerOrderNo.Size = new System.Drawing.Size(141, 29); this.txt_customerOrderNo.TabIndex = 0; // // labelControl11 @@ -2092,6 +2162,9 @@ this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_SalesReturnNotice"; this.Text = "閿�鍞��璐х敵璇峰崟"; + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); @@ -2124,7 +2197,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); @@ -2136,6 +2208,7 @@ this.tabMx.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -2161,7 +2234,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceBillType; private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerId; private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerTypeId; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialCategory; private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryQuantity; private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit; private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesClerk; @@ -2301,7 +2373,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraEditors.LabelControl lb_billType; - private DevExpress.XtraEditors.TextEdit txt_billType; private DevExpress.XtraGrid.Columns.GridColumn gv_billType; private DevExpress.XtraEditors.LabelControl lb_id; @@ -2311,7 +2382,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private UserControl.UcLookSales txt_customerOrderNo; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1; private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; @@ -2323,5 +2393,11 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraEditors.ComboBoxEdit txt_billType; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; } } \ No newline at end of file -- Gitblit v1.9.3