From ca3e38cbf7441c4177cd138b0498bc3d72a0130c Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期日, 17 八月 2025 08:29:45 +0800 Subject: [PATCH] 销售 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 970 ++++++++++++++++++++++++++------------------------------ 1 files changed, 457 insertions(+), 513 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 1d79e6b..a9ad6aa 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs @@ -84,49 +84,55 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); + this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); + this.txt_returnCustomer = new Gs.DevApp.UserControl.UcLookCustomer(); + this.txt_salesDept = new Gs.DevApp.UserControl.UcLookDepartment(); + this.txt_inventoryOrg = new Gs.DevApp.UserControl.UcLookOrg(); + this.txt_salesOrg = new Gs.DevApp.UserControl.UcLookOrg(); this.txt_fHasLinkRad = 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(); this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit(); this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit(); - this.txt_salesOrderId = new Gs.DevApp.UserControl.UcLookSales(); this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit(); this.txt_id = new DevExpress.XtraEditors.TextEdit(); this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit(); - this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit(); - this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit(); this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit(); this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); this.txt_salerName = new DevExpress.XtraEditors.TextEdit(); this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit(); this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit(); - this.txt_custName = new DevExpress.XtraEditors.TextEdit(); this.txt_createdDate = new DevExpress.XtraEditors.TextEdit(); this.txt_returnReason = new DevExpress.XtraEditors.TextEdit(); this.txt_createdBy = new DevExpress.XtraEditors.TextEdit(); + this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); + this.textEdit2 = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); - this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -161,18 +167,6 @@ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit(); - this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -237,39 +231,41 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -310,8 +306,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); @@ -333,7 +327,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -344,7 +338,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1439, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -354,7 +348,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1437, 570); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -375,7 +369,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1274, 570); + this.split1.Size = new System.Drawing.Size(1437, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // @@ -385,7 +379,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1274, 519); + this.gcMain1.Size = new System.Drawing.Size(1437, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -460,7 +454,7 @@ this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 3; + this.gridColumn27.VisibleIndex = 2; this.gridColumn27.Width = 94; // // gv_billType @@ -473,7 +467,7 @@ this.gv_billType.OptionsColumn.AllowEdit = false; this.gv_billType.Tag = "query_a.BILL_TYPE"; this.gv_billType.Visible = true; - this.gv_billType.VisibleIndex = 2; + this.gv_billType.VisibleIndex = 17; this.gv_billType.Width = 94; // // gv_billNo @@ -486,7 +480,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 4; + this.gv_billNo.VisibleIndex = 3; this.gv_billNo.Width = 94; // // gv_salesOrg @@ -499,7 +493,7 @@ this.gv_salesOrg.OptionsColumn.AllowEdit = false; this.gv_salesOrg.Tag = "query_a.SALES_ORG"; this.gv_salesOrg.Visible = true; - this.gv_salesOrg.VisibleIndex = 5; + this.gv_salesOrg.VisibleIndex = 16; this.gv_salesOrg.Width = 94; // // gv_salesDept @@ -524,8 +518,6 @@ this.gv_salesPerson.Name = "gv_salesPerson"; this.gv_salesPerson.OptionsColumn.AllowEdit = false; this.gv_salesPerson.Tag = "query_a.SALES_PERSON"; - this.gv_salesPerson.Visible = true; - this.gv_salesPerson.VisibleIndex = 8; this.gv_salesPerson.Width = 94; // // gv_returnReason @@ -538,7 +530,7 @@ this.gv_returnReason.OptionsColumn.AllowEdit = false; this.gv_returnReason.Tag = "query_a.RETURN_REASON"; this.gv_returnReason.Visible = true; - this.gv_returnReason.VisibleIndex = 9; + this.gv_returnReason.VisibleIndex = 7; this.gv_returnReason.Width = 94; // // gv_createdBy @@ -551,7 +543,7 @@ this.gv_createdBy.OptionsColumn.AllowEdit = false; this.gv_createdBy.Tag = "query_a.CREATED_BY"; this.gv_createdBy.Visible = true; - this.gv_createdBy.VisibleIndex = 10; + this.gv_createdBy.VisibleIndex = 8; this.gv_createdBy.Width = 94; // // gv_createdDate @@ -564,7 +556,7 @@ this.gv_createdDate.OptionsColumn.AllowEdit = false; this.gv_createdDate.Tag = "query_a.CREATED_DATE"; this.gv_createdDate.Visible = true; - this.gv_createdDate.VisibleIndex = 11; + this.gv_createdDate.VisibleIndex = 9; this.gv_createdDate.Width = 94; // // gv_modifiedBy @@ -577,7 +569,7 @@ this.gv_modifiedBy.OptionsColumn.AllowEdit = false; this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY"; this.gv_modifiedBy.Visible = true; - this.gv_modifiedBy.VisibleIndex = 12; + this.gv_modifiedBy.VisibleIndex = 10; this.gv_modifiedBy.Width = 94; // // gv_modifiedDate @@ -590,7 +582,7 @@ this.gv_modifiedDate.OptionsColumn.AllowEdit = false; this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE"; this.gv_modifiedDate.Visible = true; - this.gv_modifiedDate.VisibleIndex = 13; + this.gv_modifiedDate.VisibleIndex = 11; this.gv_modifiedDate.Width = 94; // // gv_approvedBy @@ -603,7 +595,7 @@ this.gv_approvedBy.OptionsColumn.AllowEdit = false; this.gv_approvedBy.Tag = "query_a.APPROVED_BY"; this.gv_approvedBy.Visible = true; - this.gv_approvedBy.VisibleIndex = 14; + this.gv_approvedBy.VisibleIndex = 12; this.gv_approvedBy.Width = 94; // // gv_approvedDate @@ -616,7 +608,7 @@ this.gv_approvedDate.OptionsColumn.AllowEdit = false; this.gv_approvedDate.Tag = "query_a.APPROVED_DATE"; this.gv_approvedDate.Visible = true; - this.gv_approvedDate.VisibleIndex = 15; + this.gv_approvedDate.VisibleIndex = 13; this.gv_approvedDate.Width = 94; // // gridColumn18 @@ -626,7 +618,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 16; + this.gridColumn18.VisibleIndex = 4; this.gridColumn18.Width = 94; // // gv_customerOrderNo @@ -639,7 +631,7 @@ this.gv_customerOrderNo.OptionsColumn.AllowEdit = false; this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO"; this.gv_customerOrderNo.Visible = true; - this.gv_customerOrderNo.VisibleIndex = 7; + this.gv_customerOrderNo.VisibleIndex = 5; this.gv_customerOrderNo.Width = 94; // // gridColumn24 @@ -657,7 +649,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 17; + this.gridColumn25.VisibleIndex = 14; this.gridColumn25.Width = 94; // // gridColumn26 @@ -667,7 +659,7 @@ this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 18; + this.gridColumn26.VisibleIndex = 15; this.gridColumn26.Width = 94; // // pageBar1 @@ -678,7 +670,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1274, 39); + this.pageBar1.Size = new System.Drawing.Size(1437, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -686,7 +678,7 @@ // this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1437, 570); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -706,70 +698,117 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.splitMx1.Size = new System.Drawing.Size(1274, 570); - this.splitMx1.SplitterPosition = 144; + this.splitMx1.Size = new System.Drawing.Size(1437, 570); + this.splitMx1.SplitterPosition = 149; this.splitMx1.TabIndex = 0; // // layoutMx1 // + this.layoutMx1.Controls.Add(this.btnSelect); + this.layoutMx1.Controls.Add(this.txt_returnCustomer); + this.layoutMx1.Controls.Add(this.txt_salesDept); + this.layoutMx1.Controls.Add(this.txt_inventoryOrg); + this.layoutMx1.Controls.Add(this.txt_salesOrg); this.layoutMx1.Controls.Add(this.txt_fHasLinkRad); 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); this.layoutMx1.Controls.Add(this.txt_billType); - this.layoutMx1.Controls.Add(this.txt_salesOrderId); this.layoutMx1.Controls.Add(this.txt_approvedDate); this.layoutMx1.Controls.Add(this.txt_id); this.layoutMx1.Controls.Add(this.txt_approvedBy); - this.layoutMx1.Controls.Add(this.txt_xsOrgName); - this.layoutMx1.Controls.Add(this.txt_inventoryOrg); this.layoutMx1.Controls.Add(this.txt_modifiedDate); this.layoutMx1.Controls.Add(this.txt_billNo); this.layoutMx1.Controls.Add(this.txt_salerName); this.layoutMx1.Controls.Add(this.txt_modifiedBy); this.layoutMx1.Controls.Add(this.txt_saleDeptName); - this.layoutMx1.Controls.Add(this.txt_custName); this.layoutMx1.Controls.Add(this.txt_createdDate); this.layoutMx1.Controls.Add(this.txt_returnReason); this.layoutMx1.Controls.Add(this.txt_createdBy); + this.layoutMx1.Controls.Add(this.textEdit1); + this.layoutMx1.Controls.Add(this.textEdit2); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem19, this.layoutControlItem1, this.layoutControlItem12, this.layoutControlItem11, - this.layoutControlItem3, - this.layoutControlItem18}); + this.layoutControlItem18, + this.layoutControlItem6, + this.layoutControlItem13, + this.layoutControlItem14}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(620, 530, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1274, 144); + this.layoutMx1.Size = new System.Drawing.Size(1437, 149); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; + // + // btnSelect + // + this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; + this.btnSelect.Location = new System.Drawing.Point(12, 108); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(126, 27); + this.btnSelect.StyleController = this.layoutMx1; + this.btnSelect.TabIndex = 541; + this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�"; + // + // txt_returnCustomer + // + this.txt_returnCustomer.IsReadly = false; + this.txt_returnCustomer.Location = new System.Drawing.Point(438, 44); + this.txt_returnCustomer.Name = "txt_returnCustomer"; + this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24); + this.txt_returnCustomer.TabIndex = 539; + // + // txt_salesDept + // + this.txt_salesDept.IsReadly = false; + this.txt_salesDept.Location = new System.Drawing.Point(1146, 108); + this.txt_salesDept.Name = "txt_salesDept"; + this.txt_salesDept.Size = new System.Drawing.Size(279, 24); + this.txt_salesDept.TabIndex = 538; + // + // txt_inventoryOrg + // + this.txt_inventoryOrg.IsReadly = false; + this.txt_inventoryOrg.Location = new System.Drawing.Point(792, 108); + this.txt_inventoryOrg.Name = "txt_inventoryOrg"; + this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24); + this.txt_inventoryOrg.TabIndex = 537; + // + // txt_salesOrg + // + this.txt_salesOrg.IsReadly = false; + this.txt_salesOrg.Location = new System.Drawing.Point(84, 44); + this.txt_salesOrg.Name = "txt_salesOrg"; + this.txt_salesOrg.Size = new System.Drawing.Size(278, 24); + this.txt_salesOrg.TabIndex = 535; // // txt_fHasLinkRad // this.txt_fHasLinkRad.EditValue = "1"; - this.txt_fHasLinkRad.Location = new System.Drawing.Point(84, 42); + this.txt_fHasLinkRad.Location = new System.Drawing.Point(438, 106); this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0); this.txt_fHasLinkRad.Name = "txt_fHasLinkRad"; this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"), - new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)}); + new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")}); this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0); - this.txt_fHasLinkRad.Size = new System.Drawing.Size(232, 32); + this.txt_fHasLinkRad.Size = new System.Drawing.Size(278, 33); this.txt_fHasLinkRad.StyleController = this.layoutMx1; this.txt_fHasLinkRad.TabIndex = 534; // // txt_fstockid // this.txt_fstockid.IsReadly = false; - this.txt_fstockid.Location = new System.Drawing.Point(392, 76); + this.txt_fstockid.Location = new System.Drawing.Point(84, 76); this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0); this.txt_fstockid.Name = "txt_fstockid"; - this.txt_fstockid.Size = new System.Drawing.Size(232, 24); + this.txt_fstockid.Size = new System.Drawing.Size(278, 24); this.txt_fstockid.TabIndex = 454; // // lbGuid @@ -792,10 +831,10 @@ // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(628, 108); + this.txt_chkStatus.Location = new System.Drawing.Point(1074, 76); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_chkStatus.Size = new System.Drawing.Size(304, 24); + this.txt_chkStatus.Size = new System.Drawing.Size(351, 24); this.txt_chkStatus.StyleController = this.layoutMx1; this.txt_chkStatus.TabIndex = 452; this.txt_chkStatus.Tag = "readonly"; @@ -803,31 +842,23 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(392, 44); + this.txt_billType.Location = new System.Drawing.Point(438, 12); 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(232, 24); + this.txt_billType.Size = new System.Drawing.Size(278, 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(84, 76); - this.txt_salesOrderId.Name = "txt_salesOrderId"; - this.txt_salesOrderId.Size = new System.Drawing.Size(232, 24); - this.txt_salesOrderId.TabIndex = 0; - // // txt_approvedDate // - this.txt_approvedDate.Location = new System.Drawing.Point(1008, 108); + this.txt_approvedDate.Location = new System.Drawing.Point(1146, 44); this.txt_approvedDate.Name = "txt_approvedDate"; this.txt_approvedDate.Properties.Appearance.Options.UseFont = true; - this.txt_approvedDate.Size = new System.Drawing.Size(233, 24); + this.txt_approvedDate.Size = new System.Drawing.Size(279, 24); this.txt_approvedDate.StyleController = this.layoutMx1; this.txt_approvedDate.TabIndex = 378; this.txt_approvedDate.Tag = "readonly"; @@ -844,37 +875,17 @@ // // txt_approvedBy // - this.txt_approvedBy.Location = new System.Drawing.Point(1008, 76); + this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12); this.txt_approvedBy.Name = "txt_approvedBy"; this.txt_approvedBy.Properties.Appearance.Options.UseFont = true; - this.txt_approvedBy.Size = new System.Drawing.Size(233, 24); + this.txt_approvedBy.Size = new System.Drawing.Size(279, 24); 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(392, 12); - this.txt_xsOrgName.Name = "txt_xsOrgName"; - this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true; - this.txt_xsOrgName.Size = new System.Drawing.Size(232, 24); - 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(710, 12); - this.txt_inventoryOrg.Name = "txt_inventoryOrg"; - this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true; - this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24); - 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(1008, 44); + this.txt_modifiedDate.Location = new System.Drawing.Point(1008, 42); this.txt_modifiedDate.Name = "txt_modifiedDate"; this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true; this.txt_modifiedDate.Size = new System.Drawing.Size(233, 24); @@ -887,7 +898,7 @@ this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(232, 24); + this.txt_billNo.Size = new System.Drawing.Size(278, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readonly"; @@ -904,7 +915,7 @@ // // txt_modifiedBy // - this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 12); + this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 10); this.txt_modifiedBy.Name = "txt_modifiedBy"; this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true; this.txt_modifiedBy.Size = new System.Drawing.Size(233, 24); @@ -914,23 +925,13 @@ // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(700, 76); + this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76); this.txt_saleDeptName.Name = "txt_saleDeptName"; this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true; - this.txt_saleDeptName.Size = new System.Drawing.Size(232, 24); + this.txt_saleDeptName.Size = new System.Drawing.Size(278, 24); 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(700, 12); - this.txt_custName.Name = "txt_custName"; - this.txt_custName.Properties.Appearance.Options.UseFont = true; - this.txt_custName.Size = new System.Drawing.Size(232, 24); - this.txt_custName.StyleController = this.layoutMx1; - this.txt_custName.TabIndex = 252; - this.txt_custName.Tag = "readonly"; // // txt_createdDate // @@ -944,10 +945,10 @@ // // txt_returnReason // - this.txt_returnReason.Location = new System.Drawing.Point(84, 108); + this.txt_returnReason.Location = new System.Drawing.Point(438, 76); this.txt_returnReason.Name = "txt_returnReason"; this.txt_returnReason.Properties.Appearance.Options.UseFont = true; - this.txt_returnReason.Size = new System.Drawing.Size(540, 24); + this.txt_returnReason.Size = new System.Drawing.Size(278, 24); this.txt_returnReason.StyleController = this.layoutMx1; this.txt_returnReason.TabIndex = 235; // @@ -960,6 +961,24 @@ this.txt_createdBy.StyleController = this.layoutMx1; this.txt_createdBy.TabIndex = 312; this.txt_createdBy.Tag = "readonly"; + // + // textEdit1 + // + this.textEdit1.Location = new System.Drawing.Point(792, 12); + this.textEdit1.Name = "textEdit1"; + this.textEdit1.Size = new System.Drawing.Size(278, 24); + this.textEdit1.StyleController = this.layoutMx1; + this.textEdit1.TabIndex = 542; + this.textEdit1.Tag = "readonly"; + // + // textEdit2 + // + this.textEdit2.Location = new System.Drawing.Point(792, 44); + this.textEdit2.Name = "textEdit2"; + this.textEdit2.Size = new System.Drawing.Size(278, 24); + this.textEdit2.StyleController = this.layoutMx1; + this.textEdit2.TabIndex = 543; + this.textEdit2.Tag = "readonly"; // // layoutControlItem19 // @@ -1004,16 +1023,6 @@ this.layoutControlItem11.Text = "鍒涘缓浜哄憳"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_inventoryOrg; - this.layoutControlItem3.Location = new System.Drawing.Point(626, 0); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(313, 32); - this.layoutControlItem3.Text = "搴撳瓨缁勭粐"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_wjStatus; @@ -1026,26 +1035,59 @@ this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem18.TextVisible = false; // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_salerName; + this.layoutControlItem6.Location = new System.Drawing.Point(616, 32); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(308, 32); + this.layoutControlItem6.Text = "閿�鍞憳鍚�"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_modifiedBy; + this.layoutControlItem13.Location = new System.Drawing.Point(924, 0); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem13.Size = new System.Drawing.Size(309, 32); + this.layoutControlItem13.Text = "淇敼浜哄憳"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_modifiedDate; + this.layoutControlItem14.Location = new System.Drawing.Point(924, 32); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem14.Size = new System.Drawing.Size(309, 32); + this.layoutControlItem14.Text = "淇敼鏃堕棿"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem2, - this.layoutControlItem13, - this.layoutControlItem14, + this.layoutControlItem4, this.layoutControlItem15, this.layoutControlItem16, - this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem21, - this.layoutControlItem8, - this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem10, + this.layoutControlItem17, this.layoutControlItem20, + this.layItem1, + this.layoutControlItem3, + this.layoutControlItem21, this.layoutControlItem9, - this.layoutControlItem17}); + this.layoutControlItem7, + this.layoutControlItem2, + this.layoutControlItem5, + this.layoutControlItem10, + this.layItem2, + this.layItem3, + this.layItem4}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1074,169 +1116,189 @@ rowDefinition2, rowDefinition3, rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1253, 148); + this.Root.Size = new System.Drawing.Size(1437, 149); this.Root.TextVisible = false; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_xsOrgName; - this.layoutControlItem2.Location = new System.Drawing.Point(308, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem2.Text = "閿�鍞粍缁�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_modifiedBy; - this.layoutControlItem13.Location = new System.Drawing.Point(924, 0); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(309, 32); - this.layoutControlItem13.Text = "淇敼浜哄憳"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_modifiedDate; - this.layoutControlItem14.Location = new System.Drawing.Point(924, 32); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(309, 32); - this.layoutControlItem14.Text = "淇敼鏃堕棿"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_approvedBy; - this.layoutControlItem15.Location = new System.Drawing.Point(924, 64); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem15.Size = new System.Drawing.Size(309, 32); - this.layoutControlItem15.Text = "瀹℃牳浜哄憳"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_approvedDate; - this.layoutControlItem16.Location = new System.Drawing.Point(924, 96); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(309, 32); - this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_billNo; this.layoutControlItem4.Location = new System.Drawing.Point(0, 0); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(308, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(354, 32); this.layoutControlItem4.Text = "鐢宠鍗曞彿"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem5 + // layoutControlItem15 // - this.layoutControlItem5.Control = this.txt_salesOrderId; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem5.Text = "閿�鍞鍗�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem15.Control = this.txt_approvedBy; + this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(355, 32); + this.layoutControlItem15.Text = "瀹℃牳浜哄憳"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem21 + // layoutControlItem16 // - this.layoutControlItem21.Control = this.txt_fHasLinkRad; - this.layoutControlItem21.Location = new System.Drawing.Point(0, 32); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0); - this.layoutControlItem21.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem21.Text = "鏈夋棤婧愬崟"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem16.Control = this.txt_approvedDate; + this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem16.Size = new System.Drawing.Size(355, 32); + this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem8 + // layoutControlItem17 // - this.layoutControlItem8.Control = this.txt_custName; - this.layoutControlItem8.Location = new System.Drawing.Point(616, 0); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_salerName; - this.layoutControlItem6.Location = new System.Drawing.Point(616, 32); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem6.Text = "閿�鍞憳鍚�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_saleDeptName; - this.layoutControlItem7.Location = new System.Drawing.Point(616, 64); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem7.Text = "閿�鍞儴闂�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_billType; - this.layoutControlItem10.Location = new System.Drawing.Point(308, 32); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem17.Control = this.txt_chkStatus; + this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem17.Size = new System.Drawing.Size(355, 32); + this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem17.TextVisible = false; // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_fstockid; - this.layoutControlItem20.Location = new System.Drawing.Point(308, 64); + this.layoutControlItem20.Location = new System.Drawing.Point(0, 64); this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem20.Size = new System.Drawing.Size(308, 32); + this.layoutControlItem20.Size = new System.Drawing.Size(354, 32); this.layoutControlItem20.Text = "閫夋嫨浠撳簱"; this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); + // + // layItem1 + // + this.layItem1.Control = this.txt_salesOrg; + this.layItem1.Location = new System.Drawing.Point(0, 32); + this.layItem1.Name = "layItem1"; + this.layItem1.OptionsTableLayoutItem.RowIndex = 1; + this.layItem1.Size = new System.Drawing.Size(354, 32); + this.layItem1.Text = "閿�鍞粍缁�"; + this.layItem1.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.btnSelect; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31); + this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem3.Size = new System.Drawing.Size(354, 33); + this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem3.Text = "閫夋嫨鏄庣粏"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem3.TextVisible = false; + // + // layoutControlItem21 + // + this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; + this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true; + this.layoutControlItem21.Control = this.txt_fHasLinkRad; + this.layoutControlItem21.Location = new System.Drawing.Point(354, 96); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0); + this.layoutControlItem21.Size = new System.Drawing.Size(354, 33); + this.layoutControlItem21.Text = "婧愬崟绫诲瀷"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_returnReason; this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜"; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem9.Location = new System.Drawing.Point(354, 64); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(616, 32); + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem9.Size = new System.Drawing.Size(354, 32); this.layoutControlItem9.Text = "鐢宠鍘熷洜"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem17 + // layoutControlItem7 // - this.layoutControlItem17.Control = this.txt_chkStatus; - this.layoutControlItem17.Location = new System.Drawing.Point(616, 96); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem17.Size = new System.Drawing.Size(308, 32); - this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem17.TextVisible = false; + this.layoutControlItem7.Control = this.txt_saleDeptName; + this.layoutControlItem7.Location = new System.Drawing.Point(708, 64); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem7.Size = new System.Drawing.Size(354, 32); + this.layoutControlItem7.Text = "閿�鍞儴闂�"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.textEdit1; + this.layoutControlItem2.Location = new System.Drawing.Point(708, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem2.Size = new System.Drawing.Size(354, 32); + this.layoutControlItem2.Text = "淇敼浜哄憳"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.textEdit2; + this.layoutControlItem5.Location = new System.Drawing.Point(708, 32); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem5.Size = new System.Drawing.Size(354, 32); + this.layoutControlItem5.Text = "淇敼鏃堕棿"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_billType; + this.layoutControlItem10.Location = new System.Drawing.Point(354, 0); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.Size = new System.Drawing.Size(354, 32); + this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + // + // layItem2 + // + this.layItem2.Control = this.txt_returnCustomer; + this.layItem2.Location = new System.Drawing.Point(354, 32); + this.layItem2.Name = "layItem2"; + this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1; + this.layItem2.OptionsTableLayoutItem.RowIndex = 1; + this.layItem2.Size = new System.Drawing.Size(354, 32); + this.layItem2.Text = "閫�璐у鎴�"; + this.layItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layItem3 + // + this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; + this.layItem3.AppearanceItemCaption.Options.UseBackColor = true; + this.layItem3.Control = this.txt_inventoryOrg; + this.layItem3.Location = new System.Drawing.Point(708, 96); + this.layItem3.Name = "layItem3"; + this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2; + this.layItem3.OptionsTableLayoutItem.RowIndex = 3; + this.layItem3.Size = new System.Drawing.Size(354, 33); + this.layItem3.Text = "搴撳瓨缁勭粐"; + this.layItem3.TextSize = new System.Drawing.Size(60, 18); + // + // layItem4 + // + this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; + this.layItem4.AppearanceItemCaption.Options.UseBackColor = true; + this.layItem4.Control = this.txt_salesDept; + this.layItem4.Location = new System.Drawing.Point(1062, 96); + this.layItem4.Name = "layItem4"; + this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3; + this.layItem4.OptionsTableLayoutItem.RowIndex = 3; + this.layItem4.Size = new System.Drawing.Size(355, 33); + this.layItem4.Text = "閿�鍞儴闂�"; + this.layItem4.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -1244,7 +1306,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(1274, 414); + this.tabMx.Size = new System.Drawing.Size(1437, 409); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1254,7 +1316,7 @@ // this.tabMxPage1.Controls.Add(this.split99); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1272, 382); + this.tabMxPage1.Size = new System.Drawing.Size(1435, 377); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // split99 @@ -1274,8 +1336,8 @@ this.split99.Panel2.Controls.Add(this.gcMx1); this.split99.Panel2.Text = "Panel2"; this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split99.Size = new System.Drawing.Size(1272, 382); - this.split99.SplitterPosition = 137; + this.split99.Size = new System.Drawing.Size(1435, 377); + this.split99.SplitterPosition = 132; this.split99.TabIndex = 4; // // layout99 @@ -1298,7 +1360,7 @@ this.layout99.Name = "layout99"; this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500); this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1272, 137); + this.layout99.Size = new System.Drawing.Size(1435, 132); this.layout99.TabIndex = 0; this.layout99.Text = "layoutControl1"; // @@ -1306,10 +1368,10 @@ // this.layoutControl1.Controls.Add(this.txt_iCount_1); this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(692, 76); + this.layoutControl1.Location = new System.Drawing.Point(719, 86); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 28); + this.layoutControl1.Size = new System.Drawing.Size(350, 34); this.layoutControl1.TabIndex = 477; this.layoutControl1.Text = "layoutControl1"; // @@ -1319,16 +1381,16 @@ this.txt_iCount_1.Name = "txt_iCount_1"; this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; this.txt_iCount_1.Properties.ReadOnly = true; - this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.Size = new System.Drawing.Size(69, 24); this.txt_iCount_1.StyleController = this.layoutControl1; this.txt_iCount_1.TabIndex = 228; // // txt_yuliang_1 // - this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Location = new System.Drawing.Point(279, 2); this.txt_yuliang_1.Name = "txt_yuliang_1"; this.txt_yuliang_1.Properties.ReadOnly = true; - this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.Size = new System.Drawing.Size(69, 24); this.txt_yuliang_1.StyleController = this.layoutControl1; this.txt_yuliang_1.TabIndex = 229; // @@ -1353,7 +1415,7 @@ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition5}); this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); + this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem33 @@ -1361,17 +1423,17 @@ this.layoutControlItem33.Control = this.txt_iCount_1; this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem33.Size = new System.Drawing.Size(175, 34); this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem34 // this.layoutControlItem34.Control = this.txt_yuliang_1; - this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem34.Location = new System.Drawing.Point(175, 0); this.layoutControlItem34.Name = "layoutControlItem34"; this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem34.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem34.Size = new System.Drawing.Size(175, 34); this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); // @@ -1379,7 +1441,7 @@ // this.ucBtnPrint1.allClickKey = null; this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42); + this.ucBtnPrint1.Location = new System.Drawing.Point(1072, 47); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; @@ -1388,7 +1450,7 @@ // // radOut // - this.radOut.Location = new System.Drawing.Point(1033, 10); + this.radOut.Location = new System.Drawing.Point(1074, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -1416,67 +1478,68 @@ this.txtWlid.Name = "txtWlid"; this.txtWlid.Properties.Appearance.Options.UseFont = true; this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.Size = new System.Drawing.Size(247, 24); this.txtWlid.StyleController = this.layout99; this.txtWlid.TabIndex = 214; // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44); + this.txt_psnQty_1.Location = new System.Drawing.Point(821, 49); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.Size = new System.Drawing.Size(248, 24); this.txt_psnQty_1.StyleController = this.layout99; this.txt_psnQty_1.TabIndex = 226; // // txtWlmc // - this.txtWlmc.Location = new System.Drawing.Point(114, 44); + this.txtWlmc.Location = new System.Drawing.Point(114, 49); this.txtWlmc.Name = "txtWlmc"; this.txtWlmc.Properties.Appearance.Options.UseFont = true; this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.Size = new System.Drawing.Size(247, 24); this.txtWlmc.StyleController = this.layout99; this.txtWlmc.TabIndex = 216; // // txtWlgg // - this.txtWlgg.Location = new System.Drawing.Point(114, 76); + this.txtWlgg.Location = new System.Drawing.Point(114, 86); this.txtWlgg.Name = "txtWlgg"; this.txtWlgg.Properties.Appearance.Options.UseFont = true; this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(574, 24); + this.txtWlgg.Size = new System.Drawing.Size(601, 24); + this.txtWlgg.StyleController = this.layout99; this.txtWlgg.TabIndex = 218; // // txt_kQty // - this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Location = new System.Drawing.Point(821, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_kQty.Properties.Appearance.Options.UseFont = true; this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.Size = new System.Drawing.Size(248, 24); this.txt_kQty.StyleController = this.layout99; this.txt_kQty.TabIndex = 224; // // txtQuantity // - this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Location = new System.Drawing.Point(467, 12); this.txtQuantity.Name = "txtQuantity"; this.txtQuantity.Properties.Appearance.Options.UseFont = true; this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.Size = new System.Drawing.Size(248, 24); this.txtQuantity.StyleController = this.layout99; this.txtQuantity.TabIndex = 220; // // txt_yQty // - this.txt_yQty.Location = new System.Drawing.Point(454, 44); + this.txt_yQty.Location = new System.Drawing.Point(467, 49); this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; - this.txt_yQty.Size = new System.Drawing.Size(234, 24); + this.txt_yQty.Size = new System.Drawing.Size(248, 24); this.txt_yQty.StyleController = this.layout99; this.txt_yQty.TabIndex = 222; // @@ -1532,7 +1595,7 @@ rowDefinition6, rowDefinition7, rowDefinition8}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); + this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem22 @@ -1540,83 +1603,83 @@ this.layoutControlItem22.Control = this.txtWlid; this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem22.Size = new System.Drawing.Size(353, 37); this.layoutControlItem22.Text = "鐗╂枡缂栫爜"; this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txtWlmc; - this.layoutControlItem23.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem23.Location = new System.Drawing.Point(0, 37); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem23.Size = new System.Drawing.Size(353, 37); this.layoutControlItem23.Text = "鐗╂枡鍚嶇О"; this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txtWlgg; - this.layoutControlItem24.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem24.Location = new System.Drawing.Point(0, 74); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(680, 32); + this.layoutControlItem24.Size = new System.Drawing.Size(707, 38); this.layoutControlItem24.Text = "鐗╂枡瑙勬牸"; this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txtQuantity; - this.layoutControlItem25.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem25.Location = new System.Drawing.Point(353, 0); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem25.Size = new System.Drawing.Size(354, 37); this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_yQty; - this.layoutControlItem26.Location = new System.Drawing.Point(340, 32); + this.layoutControlItem26.Location = new System.Drawing.Point(353, 37); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem26.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem26.Size = new System.Drawing.Size(354, 37); this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_kQty; - this.layoutControlItem27.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem27.Location = new System.Drawing.Point(707, 0); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem27.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem27.Size = new System.Drawing.Size(354, 37); this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_psnQty_1; - this.layoutControlItem28.Location = new System.Drawing.Point(680, 32); + this.layoutControlItem28.Location = new System.Drawing.Point(707, 37); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem28.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem28.Size = new System.Drawing.Size(354, 37); this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem30 // this.layoutControlItem30.Control = this.radOut; - this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0); + this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0); this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28); this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem30.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem30.Size = new System.Drawing.Size(354, 37); this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem30.Text = "鑷姩璁$畻"; this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); @@ -1625,14 +1688,14 @@ // layoutControlItem31 // this.layoutControlItem31.Control = this.ucBtnPrint1; - this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32); + this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37); this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32); this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem31.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem31.Size = new System.Drawing.Size(354, 37); this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0); @@ -1641,11 +1704,11 @@ // layoutControlItem32 // this.layoutControlItem32.Control = this.layoutControl1; - this.layoutControlItem32.Location = new System.Drawing.Point(680, 64); + this.layoutControlItem32.Location = new System.Drawing.Point(707, 74); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem32.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem32.Size = new System.Drawing.Size(354, 38); this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺"; this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem32.TextVisible = false; @@ -1657,11 +1720,10 @@ this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemSearchLookUpEdit1, this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1272, 233); + this.gcMx1.Size = new System.Drawing.Size(1435, 233); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1670,7 +1732,6 @@ // this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn2, this.gvMx1id, this.gvMx1materialId, this.gvMx1materialName, @@ -1692,118 +1753,7 @@ this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; this.gvMx1.OptionsFind.ShowSearchNavButtons = false; - this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; this.gvMx1.OptionsView.ShowGroupPanel = false; - // - // gridColumn2 - // - this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gridColumn2.AppearanceCell.Options.UseForeColor = true; - this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gridColumn2.AppearanceHeader.Options.UseForeColor = true; - this.gridColumn2.Caption = "璇烽�夋嫨"; - this.gridColumn2.ColumnEdit = this.repositoryItemSearchLookUpEdit1; - this.gridColumn2.MinWidth = 25; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Tag = "edit"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 0; - this.gridColumn2.Width = 94; - // - // repositoryItemSearchLookUpEdit1 - // - this.repositoryItemSearchLookUpEdit1.AutoHeight = false; - this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1"; - this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨"; - this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2; - this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged); - // - // gridView2 - // - this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn4, - this.gridColumn5, - this.gridColumn6, - this.gridColumn7, - this.gridColumn8, - this.gridColumn9, - this.gridColumn10, - this.gridColumn11, - this.gridColumn23}); - this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; - this.gridView2.Name = "gridView2"; - this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false; - this.gridView2.OptionsView.ShowGroupPanel = false; - // - // gridColumn4 - // - this.gridColumn4.Caption = "閿�鍞崟鍙�"; - this.gridColumn4.FieldName = "xsHno"; - this.gridColumn4.Name = "gridColumn4"; - this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 0; - // - // gridColumn5 - // - this.gridColumn5.Caption = "鍙戣揣鍗曞彿"; - this.gridColumn5.FieldName = "fhNo"; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 1; - // - // gridColumn6 - // - this.gridColumn6.Caption = "鐗╂枡缂栧彿"; - this.gridColumn6.FieldName = "itemNo"; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 2; - // - // gridColumn7 - // - this.gridColumn7.Caption = "鐗╂枡鍚嶇О"; - this.gridColumn7.FieldName = "itemName"; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 3; - // - // gridColumn8 - // - this.gridColumn8.Caption = "鐗╂枡瑙勬牸"; - this.gridColumn8.FieldName = "itemModel"; - this.gridColumn8.Name = "gridColumn8"; - this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 4; - // - // gridColumn9 - // - this.gridColumn9.Caption = "鍙戣揣鏁伴噺"; - this.gridColumn9.FieldName = "fhSl"; - this.gridColumn9.Name = "gridColumn9"; - this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 5; - // - // gridColumn10 - // - this.gridColumn10.Caption = "宸查��鏁伴噺"; - this.gridColumn10.FieldName = "ytSl"; - this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 6; - // - // gridColumn11 - // - this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid"; - this.gridColumn11.FieldName = "ckmxGuid"; - this.gridColumn11.Name = "gridColumn11"; - // - // gridColumn23 - // - this.gridColumn23.Caption = "鐗╂枡ID"; - this.gridColumn23.FieldName = "itemId"; - this.gridColumn23.Name = "gridColumn23"; // // gvMx1id // @@ -1834,7 +1784,7 @@ this.gvMx1materialName.Name = "gvMx1materialName"; this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME"; this.gvMx1materialName.Visible = true; - this.gvMx1materialName.VisibleIndex = 1; + this.gvMx1materialName.VisibleIndex = 0; this.gvMx1materialName.Width = 94; // // gvMx1materialSpecification @@ -1846,7 +1796,7 @@ this.gvMx1materialSpecification.Name = "gvMx1materialSpecification"; this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION"; this.gvMx1materialSpecification.Visible = true; - this.gvMx1materialSpecification.VisibleIndex = 9; + this.gvMx1materialSpecification.VisibleIndex = 8; this.gvMx1materialSpecification.Width = 94; // // gridColumn20 @@ -1856,7 +1806,7 @@ this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 2; + this.gridColumn20.VisibleIndex = 1; this.gridColumn20.Width = 94; // // gvMx1salesUnitId @@ -1868,7 +1818,7 @@ this.gvMx1salesUnitId.Name = "gvMx1salesUnitId"; this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID"; this.gvMx1salesUnitId.Visible = true; - this.gvMx1salesUnitId.VisibleIndex = 3; + this.gvMx1salesUnitId.VisibleIndex = 2; this.gvMx1salesUnitId.Width = 94; // // gvMx1salesQuantity @@ -1880,7 +1830,7 @@ this.gvMx1salesQuantity.Name = "gvMx1salesQuantity"; this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY"; this.gvMx1salesQuantity.Visible = true; - this.gvMx1salesQuantity.VisibleIndex = 4; + this.gvMx1salesQuantity.VisibleIndex = 3; this.gvMx1salesQuantity.Width = 94; // // gridColumn32 @@ -1890,7 +1840,7 @@ this.gridColumn32.MinWidth = 25; this.gridColumn32.Name = "gridColumn32"; this.gridColumn32.Visible = true; - this.gridColumn32.VisibleIndex = 13; + this.gridColumn32.VisibleIndex = 12; this.gridColumn32.Width = 94; // // gvMx1note @@ -1906,7 +1856,7 @@ this.gvMx1note.Name = "gvMx1note"; this.gvMx1note.Tag = "edit"; this.gvMx1note.Visible = true; - this.gvMx1note.VisibleIndex = 6; + this.gvMx1note.VisibleIndex = 5; this.gvMx1note.Width = 94; // // gridColumn13 @@ -1921,7 +1871,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "yz_quantity_0_edit"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 5; + this.gridColumn13.VisibleIndex = 4; this.gridColumn13.Width = 94; // // gvMx1returnDate @@ -1938,7 +1888,7 @@ this.gvMx1returnDate.Name = "gvMx1returnDate"; this.gvMx1returnDate.Tag = "edit"; this.gvMx1returnDate.Visible = true; - this.gvMx1returnDate.VisibleIndex = 7; + this.gvMx1returnDate.VisibleIndex = 6; this.gvMx1returnDate.Width = 94; // // repositoryItemDateEdit1 @@ -1959,7 +1909,7 @@ this.gvMx1isFree.Name = "gvMx1isFree"; this.gvMx1isFree.Tag = "query_a.IS_FREE"; this.gvMx1isFree.Visible = true; - this.gvMx1isFree.VisibleIndex = 10; + this.gvMx1isFree.VisibleIndex = 9; this.gvMx1isFree.Width = 94; // // gvMx1returnType @@ -1976,7 +1926,7 @@ this.gvMx1returnType.Name = "gvMx1returnType"; this.gvMx1returnType.Tag = "edit"; this.gvMx1returnType.Visible = true; - this.gvMx1returnType.VisibleIndex = 8; + this.gvMx1returnType.VisibleIndex = 7; this.gvMx1returnType.Width = 94; // // repositoryItemComboBox1 @@ -2007,7 +1957,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 11; + this.gridColumn21.VisibleIndex = 10; this.gridColumn21.Width = 94; // // gridColumn22 @@ -2017,7 +1967,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 12; + this.gridColumn22.VisibleIndex = 11; this.gridColumn22.Width = 94; // // gvMxDel @@ -2027,7 +1977,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 14; + this.gvMxDel.VisibleIndex = 13; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -2045,7 +1995,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1272, 382); + this.tabMxPage2.Size = new System.Drawing.Size(1435, 377); this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�"; // // gcMx2 @@ -2054,7 +2004,7 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.Size = new System.Drawing.Size(1272, 382); + this.gcMx2.Size = new System.Drawing.Size(1435, 377); this.gcMx2.TabIndex = 3; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -2235,7 +2185,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1276, 682); + this.ClientSize = new System.Drawing.Size(1439, 682); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); @@ -2267,39 +2217,41 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2340,8 +2292,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); @@ -2384,7 +2334,6 @@ private DevExpress.XtraEditors.CheckEdit txt_wjStatus; private DevExpress.XtraEditors.CheckEdit txt_chkStatus; private DevExpress.XtraEditors.ComboBoxEdit txt_billType; - private UserControl.UcLookSales txt_salesOrderId; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.TextEdit txt_approvedDate; private DevExpress.XtraEditors.TextEdit txt_approvedBy; @@ -2393,40 +2342,22 @@ private DevExpress.XtraEditors.TextEdit txt_createdDate; private DevExpress.XtraEditors.TextEdit txt_createdBy; private DevExpress.XtraEditors.TextEdit txt_salerName; - private DevExpress.XtraEditors.TextEdit txt_custName; - private DevExpress.XtraEditors.TextEdit txt_inventoryOrg; private DevExpress.XtraEditors.TextEdit txt_returnReason; private DevExpress.XtraEditors.TextEdit txt_saleDeptName; - private DevExpress.XtraEditors.TextEdit txt_xsOrgName; private DevExpress.XtraEditors.TextEdit txt_billNo; private DevExpress.XtraEditors.TextEdit txt_id; private DevExpress.XtraLayout.LayoutControl layoutMx1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1; - private DevExpress.XtraGrid.Views.Grid.GridView gridView2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gvMx1id; private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId; private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialName; @@ -2457,7 +2388,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; 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.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; @@ -2465,9 +2395,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - 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; @@ -2505,12 +2432,29 @@ private DevExpress.XtraEditors.TextEdit txt_yuliang_1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private UserControl.UcLookOrg txt_salesOrg; + private UserControl.UcLookDepartment txt_salesDept; + private UserControl.UcLookOrg txt_inventoryOrg; + private UserControl.UcLookCustomer txt_returnCustomer; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraEditors.SimpleButton btnSelect; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraLayout.LayoutControlItem layItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraEditors.TextEdit textEdit1; + private DevExpress.XtraEditors.TextEdit textEdit2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layItem2; + private DevExpress.XtraLayout.LayoutControlItem layItem3; + private DevExpress.XtraLayout.LayoutControlItem layItem4; } } \ No newline at end of file -- Gitblit v1.9.3