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 |  761 ++++++++++++++++++++--------------------------------------
 1 files changed, 265 insertions(+), 496 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index e06d84e..aa263be 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -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();
@@ -65,27 +66,26 @@
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
             this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            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.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();
             this.txt_billStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_billStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_erpId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_erpId = new DevExpress.XtraEditors.TextEdit();
             this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_manualCloseFlag = new DevExpress.XtraEditors.LabelControl();
-            this.txt_manualCloseFlag = new DevExpress.XtraEditors.TextEdit();
             this.gv_manualCloseFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancelDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancelDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancelDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancelledBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancelledBy = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancelledBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancelStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancelStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_approvedDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
@@ -93,14 +93,8 @@
             this.lb_approvedBy = new DevExpress.XtraEditors.LabelControl();
             this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
             this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeReason = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeReason = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closedBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closedBy = new DevExpress.XtraEditors.TextEdit();
             this.gv_closedBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_modifiedDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
@@ -156,8 +150,6 @@
             this.lb_returnReason = new DevExpress.XtraEditors.LabelControl();
             this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
             this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_taobaoRemark = new DevExpress.XtraEditors.LabelControl();
-            this.txt_taobaoRemark = new DevExpress.XtraEditors.TextEdit();
             this.gv_taobaoRemark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_returnCustomer = new DevExpress.XtraEditors.LabelControl();
             this.txt_returnCustomer = new DevExpress.XtraEditors.TextEdit();
@@ -170,8 +162,6 @@
             this.lb_salesOrg = new DevExpress.XtraEditors.LabelControl();
             this.txt_salesOrg = new DevExpress.XtraEditors.TextEdit();
             this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_currency = new DevExpress.XtraEditors.LabelControl();
-            this.txt_currency = new DevExpress.XtraEditors.TextEdit();
             this.gv_currency = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
@@ -180,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();
@@ -195,36 +184,23 @@
             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();
-            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.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            ((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();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_manualCloseFlag.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelledBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeReason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closedBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
@@ -243,14 +219,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_taobaoRemark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_currency.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();
@@ -261,8 +234,8 @@
             ((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();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1erpHeadId
@@ -356,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);
@@ -379,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
@@ -392,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
@@ -405,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
@@ -444,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
@@ -457,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
@@ -470,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
             // 
@@ -496,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
@@ -594,7 +590,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 137);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 236);
             this.tabMxPage1.Text = "鏄庣粏1";
             // 
             // gcMx1
@@ -605,8 +601,10 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
-            this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 137);
+            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[] {
             this.gvMx1});
@@ -622,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,
@@ -640,7 +638,7 @@
             this.gvMx1orderBillNo,
             this.gvMx1erpLineId,
             this.gvMx1erpHeadId,
-            this.gridColumn3,
+            this.gridColumn12,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -670,7 +668,9 @@
             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.repositoryItemSearchLookUpEdit1View;
+            this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
             // 
             // repositoryItemSearchLookUpEdit1View
             // 
@@ -681,26 +681,128 @@
             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;
             this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
-            // gridColumn3
+            // gridColumn4
             // 
-            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.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";
+            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
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 26;
+            this.gvMxDel.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            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, 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, 308);
+            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;
@@ -708,7 +810,7 @@
             // 
             // txt_billStatus
             // 
-            this.txt_billStatus.Location = new System.Drawing.Point(830, 308);
+            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;
@@ -729,25 +831,6 @@
             this.gv_billStatus.VisibleIndex = 39;
             this.gv_billStatus.Width = 94;
             // 
-            // lb_erpId
-            // 
-            this.lb_erpId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_erpId.Appearance.Options.UseFont = true;
-            this.lb_erpId.Location = new System.Drawing.Point(520, 308);
-            this.lb_erpId.Name = "lb_erpId";
-            this.lb_erpId.Size = new System.Drawing.Size(70, 21);
-            this.lb_erpId.TabIndex = 438;
-            this.lb_erpId.Text = "ERP澶碔D ";
-            // 
-            // txt_erpId
-            // 
-            this.txt_erpId.Location = new System.Drawing.Point(580, 308);
-            this.txt_erpId.Name = "txt_erpId";
-            this.txt_erpId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_erpId.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpId.Size = new System.Drawing.Size(150, 28);
-            this.txt_erpId.TabIndex = 438;
-            // 
             // gv_erpId
             // 
             this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -761,25 +844,6 @@
             this.gv_erpId.Visible = true;
             this.gv_erpId.VisibleIndex = 38;
             this.gv_erpId.Width = 94;
-            // 
-            // lb_manualCloseFlag
-            // 
-            this.lb_manualCloseFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_manualCloseFlag.Appearance.Options.UseFont = true;
-            this.lb_manualCloseFlag.Location = new System.Drawing.Point(270, 308);
-            this.lb_manualCloseFlag.Name = "lb_manualCloseFlag";
-            this.lb_manualCloseFlag.Size = new System.Drawing.Size(107, 21);
-            this.lb_manualCloseFlag.TabIndex = 427;
-            this.lb_manualCloseFlag.Text = "鏄惁鎵嬪姩鍏抽棴 ";
-            // 
-            // txt_manualCloseFlag
-            // 
-            this.txt_manualCloseFlag.Location = new System.Drawing.Point(330, 308);
-            this.txt_manualCloseFlag.Name = "txt_manualCloseFlag";
-            this.txt_manualCloseFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_manualCloseFlag.Properties.Appearance.Options.UseFont = true;
-            this.txt_manualCloseFlag.Size = new System.Drawing.Size(150, 28);
-            this.txt_manualCloseFlag.TabIndex = 427;
             // 
             // gv_manualCloseFlag
             // 
@@ -795,25 +859,6 @@
             this.gv_manualCloseFlag.VisibleIndex = 37;
             this.gv_manualCloseFlag.Width = 94;
             // 
-            // lb_closeStatus
-            // 
-            this.lb_closeStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeStatus.Appearance.Options.UseFont = true;
-            this.lb_closeStatus.Location = new System.Drawing.Point(20, 308);
-            this.lb_closeStatus.Name = "lb_closeStatus";
-            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeStatus.TabIndex = 417;
-            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
-            // 
-            // txt_closeStatus
-            // 
-            this.txt_closeStatus.Location = new System.Drawing.Point(80, 308);
-            this.txt_closeStatus.Name = "txt_closeStatus";
-            this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeStatus.TabIndex = 417;
-            // 
             // gv_closeStatus
             // 
             this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -827,25 +872,6 @@
             this.gv_closeStatus.Visible = true;
             this.gv_closeStatus.VisibleIndex = 36;
             this.gv_closeStatus.Width = 94;
-            // 
-            // lb_cancelDate
-            // 
-            this.lb_cancelDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancelDate.Appearance.Options.UseFont = true;
-            this.lb_cancelDate.Location = new System.Drawing.Point(770, 276);
-            this.lb_cancelDate.Name = "lb_cancelDate";
-            this.lb_cancelDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancelDate.TabIndex = 408;
-            this.lb_cancelDate.Text = "浣滃簾鏃ユ湡 ";
-            // 
-            // txt_cancelDate
-            // 
-            this.txt_cancelDate.Location = new System.Drawing.Point(830, 276);
-            this.txt_cancelDate.Name = "txt_cancelDate";
-            this.txt_cancelDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancelDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancelDate.TabIndex = 408;
             // 
             // gv_cancelDate
             // 
@@ -861,25 +887,6 @@
             this.gv_cancelDate.VisibleIndex = 35;
             this.gv_cancelDate.Width = 94;
             // 
-            // lb_cancelledBy
-            // 
-            this.lb_cancelledBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancelledBy.Appearance.Options.UseFont = true;
-            this.lb_cancelledBy.Location = new System.Drawing.Point(520, 276);
-            this.lb_cancelledBy.Name = "lb_cancelledBy";
-            this.lb_cancelledBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_cancelledBy.TabIndex = 397;
-            this.lb_cancelledBy.Text = "浣滃簾浜� ";
-            // 
-            // txt_cancelledBy
-            // 
-            this.txt_cancelledBy.Location = new System.Drawing.Point(580, 276);
-            this.txt_cancelledBy.Name = "txt_cancelledBy";
-            this.txt_cancelledBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancelledBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelledBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancelledBy.TabIndex = 397;
-            // 
             // gv_cancelledBy
             // 
             this.gv_cancelledBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -893,25 +900,6 @@
             this.gv_cancelledBy.Visible = true;
             this.gv_cancelledBy.VisibleIndex = 34;
             this.gv_cancelledBy.Width = 94;
-            // 
-            // lb_cancelStatus
-            // 
-            this.lb_cancelStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancelStatus.Appearance.Options.UseFont = true;
-            this.lb_cancelStatus.Location = new System.Drawing.Point(270, 276);
-            this.lb_cancelStatus.Name = "lb_cancelStatus";
-            this.lb_cancelStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancelStatus.TabIndex = 387;
-            this.lb_cancelStatus.Text = "浣滃簾鐘舵�� ";
-            // 
-            // txt_cancelStatus
-            // 
-            this.txt_cancelStatus.Location = new System.Drawing.Point(330, 276);
-            this.txt_cancelStatus.Name = "txt_cancelStatus";
-            this.txt_cancelStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancelStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancelStatus.TabIndex = 387;
             // 
             // gv_cancelStatus
             // 
@@ -931,7 +919,7 @@
             // 
             this.lb_approvedDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_approvedDate.Appearance.Options.UseFont = true;
-            this.lb_approvedDate.Location = new System.Drawing.Point(20, 276);
+            this.lb_approvedDate.Location = new System.Drawing.Point(20, 218);
             this.lb_approvedDate.Name = "lb_approvedDate";
             this.lb_approvedDate.Size = new System.Drawing.Size(73, 21);
             this.lb_approvedDate.TabIndex = 378;
@@ -939,7 +927,7 @@
             // 
             // txt_approvedDate
             // 
-            this.txt_approvedDate.Location = new System.Drawing.Point(80, 276);
+            this.txt_approvedDate.Location = new System.Drawing.Point(80, 218);
             this.txt_approvedDate.Name = "txt_approvedDate";
             this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
@@ -993,25 +981,6 @@
             this.gv_approvedBy.VisibleIndex = 31;
             this.gv_approvedBy.Width = 94;
             // 
-            // lb_closeDate
-            // 
-            this.lb_closeDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeDate.Appearance.Options.UseFont = true;
-            this.lb_closeDate.Location = new System.Drawing.Point(520, 244);
-            this.lb_closeDate.Name = "lb_closeDate";
-            this.lb_closeDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeDate.TabIndex = 360;
-            this.lb_closeDate.Text = "鍏抽棴鏃ユ湡 ";
-            // 
-            // txt_closeDate
-            // 
-            this.txt_closeDate.Location = new System.Drawing.Point(580, 244);
-            this.txt_closeDate.Name = "txt_closeDate";
-            this.txt_closeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeDate.TabIndex = 360;
-            // 
             // gv_closeDate
             // 
             this.gv_closeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1026,25 +995,6 @@
             this.gv_closeDate.VisibleIndex = 30;
             this.gv_closeDate.Width = 94;
             // 
-            // lb_closeReason
-            // 
-            this.lb_closeReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeReason.Appearance.Options.UseFont = true;
-            this.lb_closeReason.Location = new System.Drawing.Point(270, 244);
-            this.lb_closeReason.Name = "lb_closeReason";
-            this.lb_closeReason.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeReason.TabIndex = 351;
-            this.lb_closeReason.Text = "鍏抽棴鍘熷洜 ";
-            // 
-            // txt_closeReason
-            // 
-            this.txt_closeReason.Location = new System.Drawing.Point(330, 244);
-            this.txt_closeReason.Name = "txt_closeReason";
-            this.txt_closeReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeReason.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeReason.TabIndex = 351;
-            // 
             // gv_closeReason
             // 
             this.gv_closeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1058,25 +1008,6 @@
             this.gv_closeReason.Visible = true;
             this.gv_closeReason.VisibleIndex = 29;
             this.gv_closeReason.Width = 94;
-            // 
-            // lb_closedBy
-            // 
-            this.lb_closedBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closedBy.Appearance.Options.UseFont = true;
-            this.lb_closedBy.Location = new System.Drawing.Point(20, 244);
-            this.lb_closedBy.Name = "lb_closedBy";
-            this.lb_closedBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_closedBy.TabIndex = 343;
-            this.lb_closedBy.Text = "鍏抽棴浜� ";
-            // 
-            // txt_closedBy
-            // 
-            this.txt_closedBy.Location = new System.Drawing.Point(80, 244);
-            this.txt_closedBy.Name = "txt_closedBy";
-            this.txt_closedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_closedBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_closedBy.TabIndex = 343;
             // 
             // gv_closedBy
             // 
@@ -1129,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;
@@ -1137,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;
@@ -1162,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;
@@ -1170,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;
@@ -1195,7 +1126,7 @@
             // 
             this.lb_createdBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createdBy.Appearance.Options.UseFont = true;
-            this.lb_createdBy.Location = new System.Drawing.Point(20, 212);
+            this.lb_createdBy.Location = new System.Drawing.Point(20, 180);
             this.lb_createdBy.Name = "lb_createdBy";
             this.lb_createdBy.Size = new System.Drawing.Size(56, 21);
             this.lb_createdBy.TabIndex = 312;
@@ -1203,7 +1134,7 @@
             // 
             // txt_createdBy
             // 
-            this.txt_createdBy.Location = new System.Drawing.Point(80, 212);
+            this.txt_createdBy.Location = new System.Drawing.Point(80, 180);
             this.txt_createdBy.Name = "txt_createdBy";
             this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
@@ -1261,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;
@@ -1269,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;
@@ -1294,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;
@@ -1302,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;
@@ -1327,7 +1258,7 @@
             // 
             this.lb_receiverContact.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_receiverContact.Appearance.Options.UseFont = true;
-            this.lb_receiverContact.Location = new System.Drawing.Point(20, 180);
+            this.lb_receiverContact.Location = new System.Drawing.Point(20, 148);
             this.lb_receiverContact.Name = "lb_receiverContact";
             this.lb_receiverContact.Size = new System.Drawing.Size(107, 21);
             this.lb_receiverContact.TabIndex = 285;
@@ -1335,7 +1266,7 @@
             // 
             // txt_receiverContact
             // 
-            this.txt_receiverContact.Location = new System.Drawing.Point(80, 180);
+            this.txt_receiverContact.Location = new System.Drawing.Point(80, 148);
             this.txt_receiverContact.Name = "txt_receiverContact";
             this.txt_receiverContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_receiverContact.Properties.Appearance.Options.UseFont = true;
@@ -1393,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;
@@ -1401,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;
@@ -1426,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;
@@ -1434,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;
@@ -1459,7 +1390,7 @@
             // 
             this.lb_salesGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_salesGroup.Appearance.Options.UseFont = true;
-            this.lb_salesGroup.Location = new System.Drawing.Point(20, 148);
+            this.lb_salesGroup.Location = new System.Drawing.Point(20, 116);
             this.lb_salesGroup.Name = "lb_salesGroup";
             this.lb_salesGroup.Size = new System.Drawing.Size(56, 21);
             this.lb_salesGroup.TabIndex = 262;
@@ -1467,7 +1398,7 @@
             // 
             // txt_salesGroup
             // 
-            this.txt_salesGroup.Location = new System.Drawing.Point(80, 148);
+            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;
@@ -1500,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;
@@ -1525,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;
@@ -1533,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;
@@ -1558,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;
@@ -1566,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;
@@ -1591,7 +1522,7 @@
             // 
             this.lb_inventoryOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_inventoryOrg.Appearance.Options.UseFont = true;
-            this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 116);
+            this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 84);
             this.lb_inventoryOrg.Name = "lb_inventoryOrg";
             this.lb_inventoryOrg.Size = new System.Drawing.Size(73, 21);
             this.lb_inventoryOrg.TabIndex = 243;
@@ -1599,7 +1530,7 @@
             // 
             // txt_inventoryOrg
             // 
-            this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 116);
+            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;
@@ -1632,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;
@@ -1657,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(418, 361);
+            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;
@@ -1665,7 +1596,7 @@
             // 
             // txt_returnReason
             // 
-            this.txt_returnReason.Location = new System.Drawing.Point(478, 357);
+            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;
@@ -1686,25 +1617,6 @@
             this.gv_returnReason.VisibleIndex = 10;
             this.gv_returnReason.Width = 94;
             // 
-            // lb_taobaoRemark
-            // 
-            this.lb_taobaoRemark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_taobaoRemark.Appearance.Options.UseFont = true;
-            this.lb_taobaoRemark.Location = new System.Drawing.Point(270, 84);
-            this.lb_taobaoRemark.Name = "lb_taobaoRemark";
-            this.lb_taobaoRemark.Size = new System.Drawing.Size(107, 21);
-            this.lb_taobaoRemark.TabIndex = 231;
-            this.lb_taobaoRemark.Text = "娣樺疂瀹㈡埛澶囨敞 ";
-            // 
-            // txt_taobaoRemark
-            // 
-            this.txt_taobaoRemark.Location = new System.Drawing.Point(330, 84);
-            this.txt_taobaoRemark.Name = "txt_taobaoRemark";
-            this.txt_taobaoRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_taobaoRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_taobaoRemark.Size = new System.Drawing.Size(150, 28);
-            this.txt_taobaoRemark.TabIndex = 231;
-            // 
             // gv_taobaoRemark
             // 
             this.gv_taobaoRemark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1723,7 +1635,7 @@
             // 
             this.lb_returnCustomer.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_returnCustomer.Appearance.Options.UseFont = true;
-            this.lb_returnCustomer.Location = new System.Drawing.Point(20, 84);
+            this.lb_returnCustomer.Location = new System.Drawing.Point(20, 52);
             this.lb_returnCustomer.Name = "lb_returnCustomer";
             this.lb_returnCustomer.Size = new System.Drawing.Size(73, 21);
             this.lb_returnCustomer.TabIndex = 228;
@@ -1731,7 +1643,7 @@
             // 
             // txt_returnCustomer
             // 
-            this.txt_returnCustomer.Location = new System.Drawing.Point(80, 84);
+            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;
@@ -1756,7 +1668,7 @@
             // 
             this.lb_customerOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_customerOrderNo.Appearance.Options.UseFont = true;
-            this.lb_customerOrderNo.Location = new System.Drawing.Point(50, 361);
+            this.lb_customerOrderNo.Location = new System.Drawing.Point(20, 263);
             this.lb_customerOrderNo.Name = "lb_customerOrderNo";
             this.lb_customerOrderNo.Size = new System.Drawing.Size(73, 21);
             this.lb_customerOrderNo.TabIndex = 226;
@@ -1788,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;
@@ -1813,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;
@@ -1821,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;
@@ -1841,25 +1753,6 @@
             this.gv_salesOrg.Visible = true;
             this.gv_salesOrg.VisibleIndex = 5;
             this.gv_salesOrg.Width = 94;
-            // 
-            // lb_currency
-            // 
-            this.lb_currency.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_currency.Appearance.Options.UseFont = true;
-            this.lb_currency.Location = new System.Drawing.Point(20, 52);
-            this.lb_currency.Name = "lb_currency";
-            this.lb_currency.Size = new System.Drawing.Size(73, 21);
-            this.lb_currency.TabIndex = 217;
-            this.lb_currency.Text = "缁撶畻甯佸埆 ";
-            // 
-            // txt_currency
-            // 
-            this.txt_currency.Location = new System.Drawing.Point(80, 52);
-            this.txt_currency.Name = "txt_currency";
-            this.txt_currency.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_currency.Properties.Appearance.Options.UseFont = true;
-            this.txt_currency.Size = new System.Drawing.Size(150, 28);
-            this.txt_currency.TabIndex = 217;
             // 
             // gv_currency
             // 
@@ -1887,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;
@@ -1920,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;
@@ -1945,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(661, 361);
+            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(721, 357);
-            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
             // 
@@ -1986,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;
@@ -2141,10 +2025,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 401);
+            this.tabMx.Location = new System.Drawing.Point(0, 302);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 169);
+            this.tabMx.Size = new System.Drawing.Size(1126, 268);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -2152,33 +2036,16 @@
             // 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);
             this.panel1.Controls.Add(this.lb_billStatus);
             this.panel1.Controls.Add(this.txt_billStatus);
-            this.panel1.Controls.Add(this.lb_erpId);
-            this.panel1.Controls.Add(this.txt_erpId);
-            this.panel1.Controls.Add(this.lb_manualCloseFlag);
-            this.panel1.Controls.Add(this.txt_manualCloseFlag);
-            this.panel1.Controls.Add(this.lb_closeStatus);
-            this.panel1.Controls.Add(this.txt_closeStatus);
-            this.panel1.Controls.Add(this.lb_cancelDate);
-            this.panel1.Controls.Add(this.txt_cancelDate);
-            this.panel1.Controls.Add(this.lb_cancelledBy);
-            this.panel1.Controls.Add(this.txt_cancelledBy);
-            this.panel1.Controls.Add(this.lb_cancelStatus);
-            this.panel1.Controls.Add(this.txt_cancelStatus);
             this.panel1.Controls.Add(this.lb_approvedDate);
             this.panel1.Controls.Add(this.txt_approvedDate);
             this.panel1.Controls.Add(this.lb_approvedBy);
             this.panel1.Controls.Add(this.txt_approvedBy);
-            this.panel1.Controls.Add(this.lb_closeDate);
-            this.panel1.Controls.Add(this.txt_closeDate);
-            this.panel1.Controls.Add(this.lb_closeReason);
-            this.panel1.Controls.Add(this.txt_closeReason);
-            this.panel1.Controls.Add(this.lb_closedBy);
-            this.panel1.Controls.Add(this.txt_closedBy);
             this.panel1.Controls.Add(this.lb_modifiedDate);
             this.panel1.Controls.Add(this.txt_modifiedDate);
             this.panel1.Controls.Add(this.lb_modifiedBy);
@@ -2215,8 +2082,6 @@
             this.panel1.Controls.Add(this.txt_deliveryLocation);
             this.panel1.Controls.Add(this.lb_returnReason);
             this.panel1.Controls.Add(this.txt_returnReason);
-            this.panel1.Controls.Add(this.lb_taobaoRemark);
-            this.panel1.Controls.Add(this.txt_taobaoRemark);
             this.panel1.Controls.Add(this.lb_returnCustomer);
             this.panel1.Controls.Add(this.txt_returnCustomer);
             this.panel1.Controls.Add(this.lb_customerOrderNo);
@@ -2224,34 +2089,44 @@
             this.panel1.Controls.Add(this.txt_salesDept);
             this.panel1.Controls.Add(this.lb_salesOrg);
             this.panel1.Controls.Add(this.txt_salesOrg);
-            this.panel1.Controls.Add(this.lb_currency);
-            this.panel1.Controls.Add(this.txt_currency);
             this.panel1.Controls.Add(this.lb_fDate);
             this.panel1.Controls.Add(this.txt_fDate);
             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;
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 401);
+            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(143, 357);
+            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
             // 
-            this.labelControl11.Location = new System.Drawing.Point(807, 343);
+            this.labelControl11.Location = new System.Drawing.Point(999, 171);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -2261,7 +2136,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(858, 343);
+            this.lbGuid.Location = new System.Drawing.Point(1050, 171);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -2277,74 +2152,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "閿�鍞崟鍙�";
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 0;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 1;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 2;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 3;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 4;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 5;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "宸查��鏁伴噺";
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 6;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 27;
-            this.gvMxDel.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
             // Frm_SalesReturnNotice
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2355,23 +2162,18 @@
             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();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_manualCloseFlag.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelledBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeReason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closedBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
@@ -2390,14 +2192,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_taobaoRemark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_currency.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();
@@ -2409,8 +2208,8 @@
             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();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2435,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;
@@ -2459,29 +2257,11 @@
         private DevExpress.XtraEditors.LabelControl lb_billStatus;
         private DevExpress.XtraEditors.TextEdit txt_billStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_erpId;
-        private DevExpress.XtraEditors.TextEdit txt_erpId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
-
-        private DevExpress.XtraEditors.LabelControl lb_manualCloseFlag;
-        private DevExpress.XtraEditors.TextEdit txt_manualCloseFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gv_manualCloseFlag;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
-        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelDate;
-        private DevExpress.XtraEditors.TextEdit txt_cancelDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelledBy;
-        private DevExpress.XtraEditors.TextEdit txt_cancelledBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelledBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelStatus;
-        private DevExpress.XtraEditors.TextEdit txt_cancelStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
 
         private DevExpress.XtraEditors.LabelControl lb_approvedDate;
@@ -2491,17 +2271,8 @@
         private DevExpress.XtraEditors.LabelControl lb_approvedBy;
         private DevExpress.XtraEditors.TextEdit txt_approvedBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_approvedBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeDate;
-        private DevExpress.XtraEditors.TextEdit txt_closeDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeReason;
-        private DevExpress.XtraEditors.TextEdit txt_closeReason;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeReason;
-
-        private DevExpress.XtraEditors.LabelControl lb_closedBy;
-        private DevExpress.XtraEditors.TextEdit txt_closedBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closedBy;
 
         private DevExpress.XtraEditors.LabelControl lb_modifiedDate;
@@ -2575,9 +2346,6 @@
         private DevExpress.XtraEditors.LabelControl lb_returnReason;
         private DevExpress.XtraEditors.TextEdit txt_returnReason;
         private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
-
-        private DevExpress.XtraEditors.LabelControl lb_taobaoRemark;
-        private DevExpress.XtraEditors.TextEdit txt_taobaoRemark;
         private DevExpress.XtraGrid.Columns.GridColumn gv_taobaoRemark;
 
         private DevExpress.XtraEditors.LabelControl lb_returnCustomer;
@@ -2594,9 +2362,6 @@
         private DevExpress.XtraEditors.LabelControl lb_salesOrg;
         private DevExpress.XtraEditors.TextEdit txt_salesOrg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrg;
-
-        private DevExpress.XtraEditors.LabelControl lb_currency;
-        private DevExpress.XtraEditors.TextEdit txt_currency;
         private DevExpress.XtraGrid.Columns.GridColumn gv_currency;
 
         private DevExpress.XtraEditors.LabelControl lb_fDate;
@@ -2608,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;
@@ -2618,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;
@@ -2630,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