From be53dc839f3698dd196ecbb002ea190d5bb7dabb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 10:50:10 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs          |    1 
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs              |   26 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs          |   11 
 DevApp/Gs.DevApp/UserControl/UcLookSales.cs                |   20 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs   | 4078 +++++++++++++++++++++++---------------------
 DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs                 |   30 
 DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs              |  899 ---------
 DevApp/Gs.DevApp/DevFrm/XtraForm1.cs                       |   18 
 DevApp/Gs.DevApp/Properties/licenses.licx                  |   59 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs |  249 +
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs            |    5 
 DevApp/Gs.DevApp/DevFrm/XtraForm1.resx                     |    6 
 12 files changed, 2,406 insertions(+), 2,996 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index d89e316..6ac111e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,7 +50,6 @@
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fApproverStaus = new DevExpress.XtraEditors.TextEdit();
             this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fNote = new DevExpress.XtraEditors.LabelControl();
             this.txt_fNote = new DevExpress.XtraEditors.TextEdit();
@@ -97,6 +96,7 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
             this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
@@ -106,13 +106,20 @@
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = 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.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             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_fApproverStaus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).BeginInit();
@@ -131,6 +138,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
@@ -240,8 +248,8 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 354);
-            this.tabMxPage1.Text = "鏄庣粏1";
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 389);
+            this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
             // 
@@ -252,7 +260,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 354);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 389);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -303,6 +311,15 @@
             // 
             // repositoryItemSearchLookUpEdit1View
             // 
+            this.repositoryItemSearchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn10,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn6});
             this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
             this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
             this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -321,10 +338,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
@@ -333,20 +350,11 @@
             // 
             this.lb_fApproverStaus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fApproverStaus.Appearance.Options.UseFont = true;
-            this.lb_fApproverStaus.Location = new System.Drawing.Point(270, 116);
+            this.lb_fApproverStaus.Location = new System.Drawing.Point(815, 85);
             this.lb_fApproverStaus.Name = "lb_fApproverStaus";
             this.lb_fApproverStaus.Size = new System.Drawing.Size(68, 21);
             this.lb_fApproverStaus.TabIndex = 247;
             this.lb_fApproverStaus.Text = "瀹℃牳鐘舵��";
-            // 
-            // txt_fApproverStaus
-            // 
-            this.txt_fApproverStaus.Location = new System.Drawing.Point(330, 116);
-            this.txt_fApproverStaus.Name = "txt_fApproverStaus";
-            this.txt_fApproverStaus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fApproverStaus.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproverStaus.Size = new System.Drawing.Size(150, 28);
-            this.txt_fApproverStaus.TabIndex = 247;
             // 
             // gv_fApproverStaus
             // 
@@ -366,7 +374,7 @@
             // 
             this.lb_fNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fNote.Appearance.Options.UseFont = true;
-            this.lb_fNote.Location = new System.Drawing.Point(20, 116);
+            this.lb_fNote.Location = new System.Drawing.Point(40, 118);
             this.lb_fNote.Name = "lb_fNote";
             this.lb_fNote.Size = new System.Drawing.Size(39, 21);
             this.lb_fNote.TabIndex = 243;
@@ -374,11 +382,11 @@
             // 
             // txt_fNote
             // 
-            this.txt_fNote.Location = new System.Drawing.Point(80, 116);
+            this.txt_fNote.Location = new System.Drawing.Point(84, 114);
             this.txt_fNote.Name = "txt_fNote";
             this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fNote.Properties.Appearance.Options.UseFont = true;
-            this.txt_fNote.Size = new System.Drawing.Size(150, 28);
+            this.txt_fNote.Size = new System.Drawing.Size(179, 28);
             this.txt_fNote.TabIndex = 243;
             // 
             // gv_fNote
@@ -399,7 +407,7 @@
             // 
             this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fDate.Appearance.Options.UseFont = true;
-            this.lb_fDate.Location = new System.Drawing.Point(770, 84);
+            this.lb_fDate.Location = new System.Drawing.Point(580, 117);
             this.lb_fDate.Name = "lb_fDate";
             this.lb_fDate.Size = new System.Drawing.Size(39, 21);
             this.lb_fDate.TabIndex = 240;
@@ -407,12 +415,13 @@
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(849, 84);
+            this.txt_fDate.Location = new System.Drawing.Point(622, 113);
             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;
-            this.txt_fDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_fDate.Size = new System.Drawing.Size(173, 28);
             this.txt_fDate.TabIndex = 240;
+            this.txt_fDate.Tag = "readonly";
             // 
             // gv_fDate
             // 
@@ -432,7 +441,7 @@
             // 
             this.lb_fCustomerID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fCustomerID.Appearance.Options.UseFont = true;
-            this.lb_fCustomerID.Location = new System.Drawing.Point(520, 84);
+            this.lb_fCustomerID.Location = new System.Drawing.Point(304, 115);
             this.lb_fCustomerID.Name = "lb_fCustomerID";
             this.lb_fCustomerID.Size = new System.Drawing.Size(39, 21);
             this.lb_fCustomerID.TabIndex = 235;
@@ -456,7 +465,7 @@
             // 
             this.lb_fSalesManID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fSalesManID.Appearance.Options.UseFont = true;
-            this.lb_fSalesManID.Location = new System.Drawing.Point(270, 84);
+            this.lb_fSalesManID.Location = new System.Drawing.Point(287, 84);
             this.lb_fSalesManID.Name = "lb_fSalesManID";
             this.lb_fSalesManID.Size = new System.Drawing.Size(56, 21);
             this.lb_fSalesManID.TabIndex = 231;
@@ -464,12 +473,13 @@
             // 
             // txt_fSalesManID
             // 
-            this.txt_fSalesManID.Location = new System.Drawing.Point(330, 84);
+            this.txt_fSalesManID.Location = new System.Drawing.Point(350, 80);
             this.txt_fSalesManID.Name = "txt_fSalesManID";
             this.txt_fSalesManID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fSalesManID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSalesManID.Size = new System.Drawing.Size(150, 28);
+            this.txt_fSalesManID.Size = new System.Drawing.Size(195, 28);
             this.txt_fSalesManID.TabIndex = 231;
+            this.txt_fSalesManID.Tag = "readonly";
             // 
             // gv_fSalesManID
             // 
@@ -489,7 +499,7 @@
             // 
             this.lb_fApproveDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fApproveDate.Appearance.Options.UseFont = true;
-            this.lb_fApproveDate.Location = new System.Drawing.Point(20, 84);
+            this.lb_fApproveDate.Location = new System.Drawing.Point(810, 50);
             this.lb_fApproveDate.Name = "lb_fApproveDate";
             this.lb_fApproveDate.Size = new System.Drawing.Size(73, 21);
             this.lb_fApproveDate.TabIndex = 228;
@@ -497,12 +507,13 @@
             // 
             // txt_fApproveDate
             // 
-            this.txt_fApproveDate.Location = new System.Drawing.Point(80, 84);
+            this.txt_fApproveDate.Location = new System.Drawing.Point(886, 46);
             this.txt_fApproveDate.Name = "txt_fApproveDate";
             this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproveDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_fApproveDate.Size = new System.Drawing.Size(173, 28);
             this.txt_fApproveDate.TabIndex = 228;
+            this.txt_fApproveDate.Tag = "readonly";
             // 
             // gv_fApproveDate
             // 
@@ -522,7 +533,7 @@
             // 
             this.lb_fCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fCreateDate.Appearance.Options.UseFont = true;
-            this.lb_fCreateDate.Location = new System.Drawing.Point(770, 52);
+            this.lb_fCreateDate.Location = new System.Drawing.Point(546, 83);
             this.lb_fCreateDate.Name = "lb_fCreateDate";
             this.lb_fCreateDate.Size = new System.Drawing.Size(73, 21);
             this.lb_fCreateDate.TabIndex = 226;
@@ -530,12 +541,13 @@
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(849, 52);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(622, 79);
             this.txt_fCreateDate.Name = "txt_fCreateDate";
             this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(173, 28);
             this.txt_fCreateDate.TabIndex = 226;
+            this.txt_fCreateDate.Tag = "readonly";
             // 
             // gv_fCreateDate
             // 
@@ -555,7 +567,7 @@
             // 
             this.lb_fApproverID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fApproverID.Appearance.Options.UseFont = true;
-            this.lb_fApproverID.Location = new System.Drawing.Point(520, 52);
+            this.lb_fApproverID.Location = new System.Drawing.Point(832, 17);
             this.lb_fApproverID.Name = "lb_fApproverID";
             this.lb_fApproverID.Size = new System.Drawing.Size(51, 21);
             this.lb_fApproverID.TabIndex = 222;
@@ -563,12 +575,13 @@
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(592, 52);
+            this.txt_fApproverID.Location = new System.Drawing.Point(886, 13);
             this.txt_fApproverID.Name = "txt_fApproverID";
             this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproverID.Size = new System.Drawing.Size(150, 28);
+            this.txt_fApproverID.Size = new System.Drawing.Size(173, 28);
             this.txt_fApproverID.TabIndex = 222;
+            this.txt_fApproverID.Tag = "readonly";
             // 
             // gv_fApproverID
             // 
@@ -588,7 +601,7 @@
             // 
             this.lb_fCreatorId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fCreatorId.Appearance.Options.UseFont = true;
-            this.lb_fCreatorId.Location = new System.Drawing.Point(270, 52);
+            this.lb_fCreatorId.Location = new System.Drawing.Point(563, 50);
             this.lb_fCreatorId.Name = "lb_fCreatorId";
             this.lb_fCreatorId.Size = new System.Drawing.Size(56, 21);
             this.lb_fCreatorId.TabIndex = 219;
@@ -596,12 +609,13 @@
             // 
             // txt_fCreatorId
             // 
-            this.txt_fCreatorId.Location = new System.Drawing.Point(330, 52);
+            this.txt_fCreatorId.Location = new System.Drawing.Point(622, 46);
             this.txt_fCreatorId.Name = "txt_fCreatorId";
             this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreatorId.Size = new System.Drawing.Size(150, 28);
+            this.txt_fCreatorId.Size = new System.Drawing.Size(173, 28);
             this.txt_fCreatorId.TabIndex = 219;
+            this.txt_fCreatorId.Tag = "readonly";
             // 
             // gv_fCreatorId
             // 
@@ -621,7 +635,7 @@
             // 
             this.lb_fStockOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fStockOrgId.Appearance.Options.UseFont = true;
-            this.lb_fStockOrgId.Location = new System.Drawing.Point(20, 52);
+            this.lb_fStockOrgId.Location = new System.Drawing.Point(6, 86);
             this.lb_fStockOrgId.Name = "lb_fStockOrgId";
             this.lb_fStockOrgId.Size = new System.Drawing.Size(73, 21);
             this.lb_fStockOrgId.TabIndex = 217;
@@ -645,7 +659,7 @@
             // 
             this.lb_fSaleOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fSaleOrgId.Appearance.Options.UseFont = true;
-            this.lb_fSaleOrgId.Location = new System.Drawing.Point(770, 20);
+            this.lb_fSaleOrgId.Location = new System.Drawing.Point(270, 50);
             this.lb_fSaleOrgId.Name = "lb_fSaleOrgId";
             this.lb_fSaleOrgId.Size = new System.Drawing.Size(73, 21);
             this.lb_fSaleOrgId.TabIndex = 216;
@@ -669,7 +683,7 @@
             // 
             this.lb_fBillTypeID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fBillTypeID.Appearance.Options.UseFont = true;
-            this.lb_fBillTypeID.Location = new System.Drawing.Point(520, 20);
+            this.lb_fBillTypeID.Location = new System.Drawing.Point(546, 17);
             this.lb_fBillTypeID.Name = "lb_fBillTypeID";
             this.lb_fBillTypeID.Size = new System.Drawing.Size(73, 21);
             this.lb_fBillTypeID.TabIndex = 213;
@@ -693,7 +707,7 @@
             // 
             this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(270, 20);
+            this.lb_billNo.Location = new System.Drawing.Point(270, 17);
             this.lb_billNo.Name = "lb_billNo";
             this.lb_billNo.Size = new System.Drawing.Size(73, 21);
             this.lb_billNo.TabIndex = 211;
@@ -701,12 +715,13 @@
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(330, 20);
+            this.txt_billNo.Location = new System.Drawing.Point(350, 13);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(195, 28);
             this.txt_billNo.TabIndex = 211;
+            this.txt_billNo.Tag = "readonly";
             // 
             // gv_billNo
             // 
@@ -726,20 +741,21 @@
             // 
             this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_id.Appearance.Options.UseFont = true;
-            this.lb_id.Location = new System.Drawing.Point(20, 20);
+            this.lb_id.Location = new System.Drawing.Point(5, 17);
             this.lb_id.Name = "lb_id";
-            this.lb_id.Size = new System.Drawing.Size(18, 21);
+            this.lb_id.Size = new System.Drawing.Size(74, 21);
             this.lb_id.TabIndex = 210;
-            this.lb_id.Text = "id ";
+            this.lb_id.Text = "涓婚敭GUID";
             // 
             // txt_id
             // 
-            this.txt_id.Location = new System.Drawing.Point(80, 20);
+            this.txt_id.Location = new System.Drawing.Point(84, 13);
             this.txt_id.Name = "txt_id";
             this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_id.Properties.Appearance.Options.UseFont = true;
-            this.txt_id.Size = new System.Drawing.Size(150, 28);
+            this.txt_id.Size = new System.Drawing.Size(179, 28);
             this.txt_id.TabIndex = 210;
+            this.txt_id.Tag = "readonly";
             // 
             // gv_id
             // 
@@ -863,10 +879,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 184);
+            this.tabMx.Location = new System.Drawing.Point(0, 149);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 386);
+            this.tabMx.Size = new System.Drawing.Size(1126, 421);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -874,6 +890,7 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_fApproverStaus);
             this.panel1.Controls.Add(this.txt_fStockOrgId);
             this.panel1.Controls.Add(this.txt_fCustomerID);
             this.panel1.Controls.Add(this.txt_salesId);
@@ -883,7 +900,6 @@
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_fApproverStaus);
-            this.panel1.Controls.Add(this.txt_fApproverStaus);
             this.panel1.Controls.Add(this.lb_fNote);
             this.panel1.Controls.Add(this.txt_fNote);
             this.panel1.Controls.Add(this.lb_fDate);
@@ -910,39 +926,49 @@
             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, 184);
+            this.panel1.Size = new System.Drawing.Size(1126, 149);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_fApproverStaus
+            // 
+            this.txt_fApproverStaus.Enabled = false;
+            this.txt_fApproverStaus.Location = new System.Drawing.Point(886, 85);
+            this.txt_fApproverStaus.Name = "txt_fApproverStaus";
+            this.txt_fApproverStaus.Properties.Caption = "";
+            this.txt_fApproverStaus.Size = new System.Drawing.Size(59, 24);
+            this.txt_fApproverStaus.TabIndex = 370;
             // 
             // txt_fStockOrgId
             // 
             this.txt_fStockOrgId.IsReadly = false;
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(80, 48);
+            this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 81);
             this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(138, 30);
+            this.txt_fStockOrgId.Size = new System.Drawing.Size(179, 30);
             this.txt_fStockOrgId.TabIndex = 369;
             // 
             // txt_fCustomerID
             // 
-            this.txt_fCustomerID.Location = new System.Drawing.Point(592, 86);
+            this.txt_fCustomerID.Location = new System.Drawing.Point(350, 111);
             this.txt_fCustomerID.Name = "txt_fCustomerID";
             this.txt_fCustomerID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCustomerID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCustomerID.Size = new System.Drawing.Size(150, 28);
+            this.txt_fCustomerID.Size = new System.Drawing.Size(195, 28);
             this.txt_fCustomerID.TabIndex = 368;
+            this.txt_fCustomerID.Tag = "readonly";
             // 
             // txt_salesId
             // 
             this.txt_salesId.IsReadly = false;
-            this.txt_salesId.Location = new System.Drawing.Point(80, 150);
+            this.txt_salesId.Location = new System.Drawing.Point(84, 48);
             this.txt_salesId.Name = "txt_salesId";
-            this.txt_salesId.Size = new System.Drawing.Size(234, 29);
+            this.txt_salesId.Size = new System.Drawing.Size(179, 30);
             this.txt_salesId.TabIndex = 367;
             // 
             // lb_salesId
             // 
             this.lb_salesId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_salesId.Appearance.Options.UseFont = true;
-            this.lb_salesId.Location = new System.Drawing.Point(20, 150);
+            this.lb_salesId.Location = new System.Drawing.Point(11, 53);
             this.lb_salesId.Name = "lb_salesId";
             this.lb_salesId.Size = new System.Drawing.Size(68, 21);
             this.lb_salesId.TabIndex = 366;
@@ -950,29 +976,30 @@
             // 
             // txt_fSaleOrgId
             // 
-            this.txt_fSaleOrgId.Location = new System.Drawing.Point(849, 13);
+            this.txt_fSaleOrgId.Location = new System.Drawing.Point(350, 46);
             this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
             this.txt_fSaleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fSaleOrgId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSaleOrgId.Size = new System.Drawing.Size(150, 28);
+            this.txt_fSaleOrgId.Size = new System.Drawing.Size(195, 28);
             this.txt_fSaleOrgId.TabIndex = 365;
+            this.txt_fSaleOrgId.Tag = "readonly";
             // 
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(592, 17);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(622, 15);
             this.txt_fBillTypeID.Name = "txt_fBillTypeID";
             this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(146, 24);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(173, 24);
             this.txt_fBillTypeID.TabIndex = 362;
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(529, 126);
+            this.labelControl11.Location = new System.Drawing.Point(983, 104);
             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);
@@ -982,7 +1009,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(580, 126);
+            this.lbGuid.Location = new System.Drawing.Point(1034, 104);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -997,6 +1024,70 @@
             this.picCheckBox.TabIndex = 9;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn3.FieldName = "itemNo";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "閿�鍞崟浣�";
+            this.gridColumn4.FieldName = "dwName";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 2;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "閿�鍞暟閲�";
+            this.gridColumn5.FieldName = "qty";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "渚涘簲缁勭粐";
+            this.gridColumn7.FieldName = "gyOrg";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 4;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "搴撳瓨缁勭粐";
+            this.gridColumn8.FieldName = "kcOrg";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 5;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "鍓╀綑鏈嚭鏁伴噺";
+            this.gridColumn9.FieldName = "syQty";
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 6;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "閿�鍞崟鍙�";
+            this.gridColumn10.FieldName = "billNo";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 0;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "閿�鍞粍缁�";
+            this.gridColumn6.FieldName = "salesOrgName";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 7;
             // 
             // Frm_SalesDeliver
             // 
@@ -1013,7 +1104,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).EndInit();
@@ -1033,6 +1123,7 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
@@ -1065,7 +1156,6 @@
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraEditors.LabelControl lb_fApproverStaus;
-        private DevExpress.XtraEditors.TextEdit txt_fApproverStaus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
 
         private DevExpress.XtraEditors.LabelControl lb_fNote;
@@ -1128,5 +1218,14 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private UserControl.UcLookOrg txt_fStockOrgId;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        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 gridColumn6;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 11979a2..d787e41 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -45,8 +45,14 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             //璁剧疆閿�鍞崟
+            txt_salesId.getSuppler("", "");
             this.txt_salesId.EditChanged += (s, e) =>
             {
+                //鏈夋病鏈夊彂璐х粍缁�
+                string _fhOrg = txt_fStockOrgId.GetId();//鐩墠杩囨护渚涘簲缁勭粐
+                if (string.IsNullOrEmpty(_fhOrg))
+                    return;
+                //鏈夋病鏈夐攢鍞鍗�
                 string _sqGuid = txt_salesId.GetId();
                 if (string.IsNullOrEmpty(_sqGuid))
                     return;
@@ -54,8 +60,7 @@
                 txt_fCustomerID.Text = txt_salesId.GetSalesCusName();
                 txt_fSaleOrgId.Text = txt_salesId.GetSalesOrgName();
                 System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
-                sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
-                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _fhOrg);
                 var json = JsonConvert.SerializeObject(_obj);
                 try
                 {
@@ -558,7 +563,5 @@
                 }
             }
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 6c5e7a2..d9725b2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -31,124 +31,30 @@
         {
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.gvMx1eHid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1settleOrgIds = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1supplyOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1seq = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mapSpec = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mapName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mapId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1custImd = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1custInm = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1custIno = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1basearqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1baseRemainOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1baseReturnQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1baseRetNoticeQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1stockOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1deliQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1srcBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1srcType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1terminaterId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1terminateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mrpTerminateStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mrpCloseStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1outLmtUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1deliveryMinQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1deliveryMaxQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lot = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mtoNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ownerTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1deliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1priceUnitQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1priceUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1qty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1unitId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1erpId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.lb_receiveContact = new DevExpress.XtraEditors.LabelControl();
-            this.txt_receiveContact = new DevExpress.XtraEditors.TextEdit();
             this.gv_receiveContact = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_receiveId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_receiveId = new DevExpress.XtraEditors.TextEdit();
             this.gv_receiveId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_saleOrgId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_saleOrgId = new DevExpress.XtraEditors.TextEdit();
             this.gv_saleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fbilltype = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fbilltype = new DevExpress.XtraEditors.TextEdit();
             this.gv_fbilltype = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_entryNote = new DevExpress.XtraEditors.LabelControl();
-            this.txt_entryNote = new DevExpress.XtraEditors.TextEdit();
             this.gv_entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_changerId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_changerId = new DevExpress.XtraEditors.TextEdit();
             this.gv_changerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_versionNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_versionNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_versionNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancellerId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancellerId = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancellerId = 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_changeDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_changeDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_changeDate = 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_closerId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closerId = new DevExpress.XtraEditors.TextEdit();
             this.gv_closerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_approveDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_approveDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_approveDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_modifyDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_modifyDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_modifyDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_modifierId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_modifierId = new DevExpress.XtraEditors.TextEdit();
             this.gv_modifierId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_creatorId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_creatorId = new DevExpress.XtraEditors.TextEdit();
             this.gv_creatorId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_linkPhone = new DevExpress.XtraEditors.LabelControl();
-            this.txt_linkPhone = new DevExpress.XtraEditors.TextEdit();
             this.gv_linkPhone = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_chargeId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_chargeId = new DevExpress.XtraEditors.TextEdit();
             this.gv_chargeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_linkMan = new DevExpress.XtraEditors.LabelControl();
-            this.txt_linkMan = new DevExpress.XtraEditors.TextEdit();
             this.gv_linkMan = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_approverId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_approverId = new DevExpress.XtraEditors.TextEdit();
             this.gv_approverId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_settleId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_settleId = new DevExpress.XtraEditors.TextEdit();
             this.gv_settleId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_note = new DevExpress.XtraEditors.LabelControl();
-            this.txt_note = new DevExpress.XtraEditors.TextEdit();
             this.gv_note = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_changeReason = new DevExpress.XtraEditors.LabelControl();
-            this.txt_changeReason = new DevExpress.XtraEditors.TextEdit();
             this.gv_changeReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_salerId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_salerId = new DevExpress.XtraEditors.TextEdit();
             this.gv_salerId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_saleDeptId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -169,12 +75,108 @@
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.lbGuid = new DevExpress.XtraEditors.LabelControl();
+            this.panel42 = new System.Windows.Forms.Panel();
+            this.lb_receiveContact = new DevExpress.XtraEditors.LabelControl();
+            this.txt_receiveContact = new DevExpress.XtraEditors.TextEdit();
+            this.panel41 = new System.Windows.Forms.Panel();
+            this.lb_receiveId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_receiveId = new DevExpress.XtraEditors.TextEdit();
+            this.panel40 = new System.Windows.Forms.Panel();
+            this.lb_saleOrgId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_saleOrgId = new DevExpress.XtraEditors.TextEdit();
+            this.panel39 = new System.Windows.Forms.Panel();
+            this.lb_fbilltype = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fbilltype = new DevExpress.XtraEditors.TextEdit();
+            this.panel38 = new System.Windows.Forms.Panel();
+            this.lb_entryNote = new DevExpress.XtraEditors.LabelControl();
+            this.txt_entryNote = new DevExpress.XtraEditors.TextEdit();
+            this.panel34 = new System.Windows.Forms.Panel();
+            this.lb_changerId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_changerId = new DevExpress.XtraEditors.TextEdit();
+            this.panel35 = new System.Windows.Forms.Panel();
+            this.lb_versionNo = new DevExpress.XtraEditors.LabelControl();
+            this.txt_versionNo = new DevExpress.XtraEditors.TextEdit();
+            this.panel36 = new System.Windows.Forms.Panel();
+            this.lb_cancellerId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_cancellerId = new DevExpress.XtraEditors.TextEdit();
+            this.panel37 = new System.Windows.Forms.Panel();
+            this.lb_cancelStatus = new DevExpress.XtraEditors.LabelControl();
+            this.txt_cancelStatus = new DevExpress.XtraEditors.TextEdit();
+            this.panel33 = new System.Windows.Forms.Panel();
+            this.lb_changeDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_changeDate = new DevExpress.XtraEditors.TextEdit();
+            this.panel32 = new System.Windows.Forms.Panel();
+            this.lb_closeDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_closeDate = new DevExpress.XtraEditors.TextEdit();
+            this.panel31 = new System.Windows.Forms.Panel();
+            this.lb_closerId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_closerId = new DevExpress.XtraEditors.TextEdit();
+            this.panel30 = new System.Windows.Forms.Panel();
+            this.lb_approveDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_approveDate = new DevExpress.XtraEditors.TextEdit();
+            this.panel26 = new System.Windows.Forms.Panel();
+            this.lb_modifyDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_modifyDate = new DevExpress.XtraEditors.TextEdit();
+            this.panel27 = new System.Windows.Forms.Panel();
+            this.lb_modifierId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_modifierId = new DevExpress.XtraEditors.TextEdit();
+            this.panel28 = new System.Windows.Forms.Panel();
+            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.panel29 = new System.Windows.Forms.Panel();
+            this.lb_creatorId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_creatorId = new DevExpress.XtraEditors.TextEdit();
+            this.panel22 = new System.Windows.Forms.Panel();
+            this.lb_linkPhone = new DevExpress.XtraEditors.LabelControl();
+            this.txt_linkPhone = new DevExpress.XtraEditors.TextEdit();
+            this.panel23 = new System.Windows.Forms.Panel();
+            this.lb_chargeId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_chargeId = new DevExpress.XtraEditors.TextEdit();
+            this.panel24 = new System.Windows.Forms.Panel();
+            this.lb_linkMan = new DevExpress.XtraEditors.LabelControl();
+            this.txt_linkMan = new DevExpress.XtraEditors.TextEdit();
+            this.panel25 = new System.Windows.Forms.Panel();
+            this.lb_approverId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_approverId = new DevExpress.XtraEditors.TextEdit();
+            this.panel21 = new System.Windows.Forms.Panel();
+            this.lb_settleId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_settleId = new DevExpress.XtraEditors.TextEdit();
+            this.panel20 = new System.Windows.Forms.Panel();
+            this.txt_note = new DevExpress.XtraEditors.TextEdit();
+            this.lb_note = new DevExpress.XtraEditors.LabelControl();
+            this.panel19 = new System.Windows.Forms.Panel();
+            this.lb_changeReason = new DevExpress.XtraEditors.LabelControl();
+            this.txt_changeReason = new DevExpress.XtraEditors.TextEdit();
+            this.panel18 = new System.Windows.Forms.Panel();
+            this.lb_salerId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_salerId = new DevExpress.XtraEditors.TextEdit();
+            this.panel14 = new System.Windows.Forms.Panel();
+            this.lb_custId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_custId = new DevExpress.XtraEditors.TextEdit();
+            this.panel15 = new System.Windows.Forms.Panel();
+            this.lb_saleDeptId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_saleDeptId = new DevExpress.XtraEditors.TextEdit();
+            this.panel16 = new System.Windows.Forms.Panel();
+            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
+            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
+            this.panel17 = new System.Windows.Forms.Panel();
+            this.lb_headLocId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_headLocId = new DevExpress.XtraEditors.TextEdit();
+            this.panel10 = new System.Windows.Forms.Panel();
+            this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
+            this.panel11 = new System.Windows.Forms.Panel();
+            this.lb_headDeliveryWay = new DevExpress.XtraEditors.LabelControl();
+            this.txt_headDeliveryWay = new DevExpress.XtraEditors.TextEdit();
+            this.panel12 = new System.Windows.Forms.Panel();
+            this.lb_businessType = new DevExpress.XtraEditors.LabelControl();
+            this.txt_businessType = new DevExpress.XtraEditors.TextEdit();
+            this.panel13 = new System.Windows.Forms.Panel();
+            this.lb_documentStatus = new DevExpress.XtraEditors.LabelControl();
+            this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit();
             this.panel4 = new System.Windows.Forms.Panel();
             this.lb_id = new DevExpress.XtraEditors.LabelControl();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
@@ -187,86 +189,131 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1erpId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1unitId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1qty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1priceUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1priceUnitQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1deliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1ownerTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mtoNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lot = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1deliveryMaxQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1deliveryMinQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1outLmtUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mrpCloseStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mrpTerminateStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1terminateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1terminaterId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1srcType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1srcBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1deliQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1stockOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1baseRetNoticeQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1baseReturnQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1baseRemainOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1basearqty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1custIno = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1custInm = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1custImd = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mapId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mapName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mapSpec = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1seq = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1supplyOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1settleOrgIds = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1eHid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.panel6 = new System.Windows.Forms.Panel();
-            this.panel7 = new System.Windows.Forms.Panel();
-            this.panel8 = new System.Windows.Forms.Panel();
-            this.panel9 = new System.Windows.Forms.Panel();
-            this.panel10 = new System.Windows.Forms.Panel();
-            this.panel11 = new System.Windows.Forms.Panel();
-            this.panel12 = new System.Windows.Forms.Panel();
-            this.panel13 = new System.Windows.Forms.Panel();
-            this.panel14 = new System.Windows.Forms.Panel();
-            this.panel15 = new System.Windows.Forms.Panel();
-            this.panel16 = new System.Windows.Forms.Panel();
-            this.panel17 = new System.Windows.Forms.Panel();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
-            this.lb_headDeliveryWay = new DevExpress.XtraEditors.LabelControl();
-            this.txt_headDeliveryWay = new DevExpress.XtraEditors.TextEdit();
-            this.lb_businessType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_businessType = new DevExpress.XtraEditors.TextEdit();
-            this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_documentStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit();
-            this.lb_saleDeptId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_saleDeptId = new DevExpress.XtraEditors.TextEdit();
-            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
-            this.lb_custId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_custId = new DevExpress.XtraEditors.TextEdit();
-            this.lb_headLocId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_headLocId = new DevExpress.XtraEditors.TextEdit();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveContact.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrgId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbilltype.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_entryNote.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changerId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_versionNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellerId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changeDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closerId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approveDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifyDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifierId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_creatorId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_linkPhone.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_chargeId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_linkMan.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approverId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_settleId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_note.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changeReason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salerId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
             this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
-            this.tabMx.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.xtraTabPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
             this.splitContainerControl1.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+            this.splitContainerControl1.Panel2.SuspendLayout();
             this.splitContainerControl1.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.panel42.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveContact.Properties)).BeginInit();
+            this.panel41.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveId.Properties)).BeginInit();
+            this.panel40.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrgId.Properties)).BeginInit();
+            this.panel39.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fbilltype.Properties)).BeginInit();
+            this.panel38.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_entryNote.Properties)).BeginInit();
+            this.panel34.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_changerId.Properties)).BeginInit();
+            this.panel35.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_versionNo.Properties)).BeginInit();
+            this.panel36.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellerId.Properties)).BeginInit();
+            this.panel37.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).BeginInit();
+            this.panel33.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_changeDate.Properties)).BeginInit();
+            this.panel32.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).BeginInit();
+            this.panel31.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closerId.Properties)).BeginInit();
+            this.panel30.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approveDate.Properties)).BeginInit();
+            this.panel26.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifyDate.Properties)).BeginInit();
+            this.panel27.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifierId.Properties)).BeginInit();
+            this.panel28.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            this.panel29.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_creatorId.Properties)).BeginInit();
+            this.panel22.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_linkPhone.Properties)).BeginInit();
+            this.panel23.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chargeId.Properties)).BeginInit();
+            this.panel24.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_linkMan.Properties)).BeginInit();
+            this.panel25.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approverId.Properties)).BeginInit();
+            this.panel21.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_settleId.Properties)).BeginInit();
+            this.panel20.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_note.Properties)).BeginInit();
+            this.panel19.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_changeReason.Properties)).BeginInit();
+            this.panel18.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerId.Properties)).BeginInit();
+            this.panel14.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).BeginInit();
+            this.panel15.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).BeginInit();
+            this.panel16.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
+            this.panel17.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).BeginInit();
+            this.panel10.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
+            this.panel11.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).BeginInit();
+            this.panel12.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).BeginInit();
+            this.panel13.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).BeginInit();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
             this.panel5.SuspendLayout();
@@ -275,653 +322,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).BeginInit();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+            this.tabMx.SuspendLayout();
+            this.tabMxPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            this.panel6.SuspendLayout();
-            this.panel7.SuspendLayout();
-            this.panel8.SuspendLayout();
-            this.panel9.SuspendLayout();
-            this.panel10.SuspendLayout();
-            this.panel11.SuspendLayout();
-            this.panel12.SuspendLayout();
-            this.panel13.SuspendLayout();
-            this.panel14.SuspendLayout();
-            this.panel15.SuspendLayout();
-            this.panel16.SuspendLayout();
-            this.panel17.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).BeginInit();
             this.SuspendLayout();
-            // 
-            // gvMx1eHid
-            // 
-            this.gvMx1eHid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1eHid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1eHid.Caption = "ERP鍗曟嵁琛ㄥごid ";
-            this.gvMx1eHid.FieldName = "eHid";
-            this.gvMx1eHid.MinWidth = 50;
-            this.gvMx1eHid.Name = "gvMx1eHid";
-            this.gvMx1eHid.Tag = "query_a.e_hid";
-            this.gvMx1eHid.Visible = true;
-            this.gvMx1eHid.VisibleIndex = 40;
-            this.gvMx1eHid.Width = 94;
-            // 
-            // gvMx1settleOrgIds
-            // 
-            this.gvMx1settleOrgIds.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1settleOrgIds.AppearanceCell.Options.UseFont = true;
-            this.gvMx1settleOrgIds.Caption = "缁撶畻缁勭粐 ";
-            this.gvMx1settleOrgIds.FieldName = "settleOrgIds";
-            this.gvMx1settleOrgIds.MinWidth = 50;
-            this.gvMx1settleOrgIds.Name = "gvMx1settleOrgIds";
-            this.gvMx1settleOrgIds.Tag = "query_a.SETTLE_ORG_IDS";
-            this.gvMx1settleOrgIds.Visible = true;
-            this.gvMx1settleOrgIds.VisibleIndex = 39;
-            this.gvMx1settleOrgIds.Width = 94;
-            // 
-            // gvMx1stockOrgId
-            // 
-            this.gvMx1stockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1stockOrgId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1stockOrgId.Caption = "搴撳瓨缁勭粐 ";
-            this.gvMx1stockOrgId.FieldName = "stockOrgId";
-            this.gvMx1stockOrgId.MinWidth = 50;
-            this.gvMx1stockOrgId.Name = "gvMx1stockOrgId";
-            this.gvMx1stockOrgId.Tag = "query_a.STOCK_ORG_ID";
-            this.gvMx1stockOrgId.Visible = true;
-            this.gvMx1stockOrgId.VisibleIndex = 38;
-            this.gvMx1stockOrgId.Width = 94;
-            // 
-            // gvMx1supplyOrgId
-            // 
-            this.gvMx1supplyOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1supplyOrgId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1supplyOrgId.Caption = "渚涘簲缁勭粐 ";
-            this.gvMx1supplyOrgId.FieldName = "supplyOrgId";
-            this.gvMx1supplyOrgId.MinWidth = 50;
-            this.gvMx1supplyOrgId.Name = "gvMx1supplyOrgId";
-            this.gvMx1supplyOrgId.Tag = "query_a.SUPPLY_ORG_ID";
-            this.gvMx1supplyOrgId.Visible = true;
-            this.gvMx1supplyOrgId.VisibleIndex = 37;
-            this.gvMx1supplyOrgId.Width = 94;
-            // 
-            // gvMx1seq
-            // 
-            this.gvMx1seq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1seq.AppearanceCell.Options.UseFont = true;
-            this.gvMx1seq.Caption = "搴忓彿 ";
-            this.gvMx1seq.FieldName = "seq";
-            this.gvMx1seq.MinWidth = 50;
-            this.gvMx1seq.Name = "gvMx1seq";
-            this.gvMx1seq.Tag = "query_a.Seq";
-            this.gvMx1seq.Visible = true;
-            this.gvMx1seq.VisibleIndex = 36;
-            this.gvMx1seq.Width = 94;
-            // 
-            // gvMx1mapSpec
-            // 
-            this.gvMx1mapSpec.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1mapSpec.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mapSpec.Caption = "瀹㈡埛鐗╂枡瑙勬牸 ";
-            this.gvMx1mapSpec.FieldName = "mapSpec";
-            this.gvMx1mapSpec.MinWidth = 50;
-            this.gvMx1mapSpec.Name = "gvMx1mapSpec";
-            this.gvMx1mapSpec.Tag = "query_a.MAP_SPEC";
-            this.gvMx1mapSpec.Visible = true;
-            this.gvMx1mapSpec.VisibleIndex = 35;
-            this.gvMx1mapSpec.Width = 94;
-            // 
-            // gvMx1mapName
-            // 
-            this.gvMx1mapName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1mapName.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mapName.Caption = "瀹㈡埛鐗╂枡鍚嶇О ";
-            this.gvMx1mapName.FieldName = "mapName";
-            this.gvMx1mapName.MinWidth = 50;
-            this.gvMx1mapName.Name = "gvMx1mapName";
-            this.gvMx1mapName.Tag = "query_a.MAP_NAME";
-            this.gvMx1mapName.Visible = true;
-            this.gvMx1mapName.VisibleIndex = 34;
-            this.gvMx1mapName.Width = 94;
-            // 
-            // gvMx1mapId
-            // 
-            this.gvMx1mapId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1mapId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mapId.Caption = "瀹㈡埛鐗╂枡缂栫爜 ";
-            this.gvMx1mapId.FieldName = "mapId";
-            this.gvMx1mapId.MinWidth = 50;
-            this.gvMx1mapId.Name = "gvMx1mapId";
-            this.gvMx1mapId.Tag = "query_a.MAP_ID";
-            this.gvMx1mapId.Visible = true;
-            this.gvMx1mapId.VisibleIndex = 33;
-            this.gvMx1mapId.Width = 94;
-            // 
-            // gvMx1custImd
-            // 
-            this.gvMx1custImd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1custImd.AppearanceCell.Options.UseFont = true;
-            this.gvMx1custImd.Caption = "瀹㈡埛鐗╂枡瑙勬牸 ";
-            this.gvMx1custImd.FieldName = "custImd";
-            this.gvMx1custImd.MinWidth = 50;
-            this.gvMx1custImd.Name = "gvMx1custImd";
-            this.gvMx1custImd.Tag = "query_a.cust_imd";
-            this.gvMx1custImd.Visible = true;
-            this.gvMx1custImd.VisibleIndex = 32;
-            this.gvMx1custImd.Width = 94;
-            // 
-            // gvMx1custInm
-            // 
-            this.gvMx1custInm.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1custInm.AppearanceCell.Options.UseFont = true;
-            this.gvMx1custInm.Caption = "瀹㈡埛鐗╂枡鍚嶇О ";
-            this.gvMx1custInm.FieldName = "custInm";
-            this.gvMx1custInm.MinWidth = 50;
-            this.gvMx1custInm.Name = "gvMx1custInm";
-            this.gvMx1custInm.Tag = "query_a.cust_inm";
-            this.gvMx1custInm.Visible = true;
-            this.gvMx1custInm.VisibleIndex = 31;
-            this.gvMx1custInm.Width = 94;
-            // 
-            // gvMx1custIno
-            // 
-            this.gvMx1custIno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1custIno.AppearanceCell.Options.UseFont = true;
-            this.gvMx1custIno.Caption = "瀹㈡埛鐗╂枡缂栫爜 ";
-            this.gvMx1custIno.FieldName = "custIno";
-            this.gvMx1custIno.MinWidth = 50;
-            this.gvMx1custIno.Name = "gvMx1custIno";
-            this.gvMx1custIno.Tag = "query_a.cust_ino";
-            this.gvMx1custIno.Visible = true;
-            this.gvMx1custIno.VisibleIndex = 30;
-            this.gvMx1custIno.Width = 94;
-            // 
-            // gvMx1basearqty
-            // 
-            this.gvMx1basearqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1basearqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1basearqty.Caption = "绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級 ";
-            this.gvMx1basearqty.FieldName = "basearqty";
-            this.gvMx1basearqty.MinWidth = 50;
-            this.gvMx1basearqty.Name = "gvMx1basearqty";
-            this.gvMx1basearqty.Tag = "query_a.basearqty";
-            this.gvMx1basearqty.Visible = true;
-            this.gvMx1basearqty.VisibleIndex = 29;
-            this.gvMx1basearqty.Width = 94;
-            // 
-            // gvMx1baseRemainOutQty
-            // 
-            this.gvMx1baseRemainOutQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1baseRemainOutQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseRemainOutQty.Caption = "鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級 ";
-            this.gvMx1baseRemainOutQty.FieldName = "baseRemainOutQty";
-            this.gvMx1baseRemainOutQty.MinWidth = 50;
-            this.gvMx1baseRemainOutQty.Name = "gvMx1baseRemainOutQty";
-            this.gvMx1baseRemainOutQty.Tag = "query_a.base_remain_out_qty";
-            this.gvMx1baseRemainOutQty.Visible = true;
-            this.gvMx1baseRemainOutQty.VisibleIndex = 28;
-            this.gvMx1baseRemainOutQty.Width = 94;
-            // 
-            // gvMx1baseReturnQty
-            // 
-            this.gvMx1baseReturnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1baseReturnQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲忥紙閿�鍞熀鏈級 ";
-            this.gvMx1baseReturnQty.FieldName = "baseReturnQty";
-            this.gvMx1baseReturnQty.MinWidth = 50;
-            this.gvMx1baseReturnQty.Name = "gvMx1baseReturnQty";
-            this.gvMx1baseReturnQty.Tag = "query_a.base_return_qty";
-            this.gvMx1baseReturnQty.Visible = true;
-            this.gvMx1baseReturnQty.VisibleIndex = 27;
-            this.gvMx1baseReturnQty.Width = 94;
-            // 
-            // gvMx1baseRetNoticeQty
-            // 
-            this.gvMx1baseRetNoticeQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1baseRetNoticeQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseRetNoticeQty.Caption = "绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級 ";
-            this.gvMx1baseRetNoticeQty.FieldName = "baseRetNoticeQty";
-            this.gvMx1baseRetNoticeQty.MinWidth = 50;
-            this.gvMx1baseRetNoticeQty.Name = "gvMx1baseRetNoticeQty";
-            this.gvMx1baseRetNoticeQty.Tag = "query_a.base_ret_notice_qty";
-            this.gvMx1baseRetNoticeQty.Visible = true;
-            this.gvMx1baseRetNoticeQty.VisibleIndex = 26;
-            this.gvMx1baseRetNoticeQty.Width = 94;
-            // 
-            // gvMx1stockOutQty
-            // 
-            this.gvMx1stockOutQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1stockOutQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1stockOutQty.Caption = "绱鍑哄簱鏁伴噺 ";
-            this.gvMx1stockOutQty.FieldName = "stockOutQty";
-            this.gvMx1stockOutQty.MinWidth = 50;
-            this.gvMx1stockOutQty.Name = "gvMx1stockOutQty";
-            this.gvMx1stockOutQty.Tag = "query_a.stock_out_qty";
-            this.gvMx1stockOutQty.Visible = true;
-            this.gvMx1stockOutQty.VisibleIndex = 25;
-            this.gvMx1stockOutQty.Width = 94;
-            // 
-            // gvMx1deliQty
-            // 
-            this.gvMx1deliQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1deliQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1deliQty.Caption = "绱鍙戣揣閫氱煡鏁伴噺 ";
-            this.gvMx1deliQty.FieldName = "deliQty";
-            this.gvMx1deliQty.MinWidth = 50;
-            this.gvMx1deliQty.Name = "gvMx1deliQty";
-            this.gvMx1deliQty.Tag = "query_a.deli_qty";
-            this.gvMx1deliQty.Visible = true;
-            this.gvMx1deliQty.VisibleIndex = 24;
-            this.gvMx1deliQty.Width = 94;
-            // 
-            // gvMx1srcBillNo
-            // 
-            this.gvMx1srcBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1srcBillNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1srcBillNo.Caption = "婧愬崟鍗曞彿 ";
-            this.gvMx1srcBillNo.FieldName = "srcBillNo";
-            this.gvMx1srcBillNo.MinWidth = 50;
-            this.gvMx1srcBillNo.Name = "gvMx1srcBillNo";
-            this.gvMx1srcBillNo.Tag = "query_a.src_bill_no";
-            this.gvMx1srcBillNo.Visible = true;
-            this.gvMx1srcBillNo.VisibleIndex = 23;
-            this.gvMx1srcBillNo.Width = 94;
-            // 
-            // gvMx1srcType
-            // 
-            this.gvMx1srcType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1srcType.AppearanceCell.Options.UseFont = true;
-            this.gvMx1srcType.Caption = "婧愬崟绫诲瀷 ";
-            this.gvMx1srcType.FieldName = "srcType";
-            this.gvMx1srcType.MinWidth = 50;
-            this.gvMx1srcType.Name = "gvMx1srcType";
-            this.gvMx1srcType.Tag = "query_a.src_type";
-            this.gvMx1srcType.Visible = true;
-            this.gvMx1srcType.VisibleIndex = 22;
-            this.gvMx1srcType.Width = 94;
-            // 
-            // gvMx1terminaterId
-            // 
-            this.gvMx1terminaterId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1terminaterId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1terminaterId.Caption = "缁堟浜� ";
-            this.gvMx1terminaterId.FieldName = "terminaterId";
-            this.gvMx1terminaterId.MinWidth = 50;
-            this.gvMx1terminaterId.Name = "gvMx1terminaterId";
-            this.gvMx1terminaterId.Tag = "query_a.terminater_id";
-            this.gvMx1terminaterId.Visible = true;
-            this.gvMx1terminaterId.VisibleIndex = 21;
-            this.gvMx1terminaterId.Width = 94;
-            // 
-            // gvMx1terminateDate
-            // 
-            this.gvMx1terminateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1terminateDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1terminateDate.Caption = "缁堟鏃ユ湡 ";
-            this.gvMx1terminateDate.FieldName = "terminateDate";
-            this.gvMx1terminateDate.MinWidth = 50;
-            this.gvMx1terminateDate.Name = "gvMx1terminateDate";
-            this.gvMx1terminateDate.Tag = "query_a.terminate_date";
-            this.gvMx1terminateDate.Visible = true;
-            this.gvMx1terminateDate.VisibleIndex = 20;
-            this.gvMx1terminateDate.Width = 94;
-            // 
-            // gvMx1mrpTerminateStatus
-            // 
-            this.gvMx1mrpTerminateStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1mrpTerminateStatus.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mrpTerminateStatus.Caption = "涓氬姟缁堟 ";
-            this.gvMx1mrpTerminateStatus.FieldName = "mrpTerminateStatus";
-            this.gvMx1mrpTerminateStatus.MinWidth = 50;
-            this.gvMx1mrpTerminateStatus.Name = "gvMx1mrpTerminateStatus";
-            this.gvMx1mrpTerminateStatus.Tag = "query_a.mrp_terminate_status";
-            this.gvMx1mrpTerminateStatus.Visible = true;
-            this.gvMx1mrpTerminateStatus.VisibleIndex = 19;
-            this.gvMx1mrpTerminateStatus.Width = 94;
-            // 
-            // gvMx1mrpCloseStatus
-            // 
-            this.gvMx1mrpCloseStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1mrpCloseStatus.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mrpCloseStatus.Caption = "涓氬姟鍏抽棴 ";
-            this.gvMx1mrpCloseStatus.FieldName = "mrpCloseStatus";
-            this.gvMx1mrpCloseStatus.MinWidth = 50;
-            this.gvMx1mrpCloseStatus.Name = "gvMx1mrpCloseStatus";
-            this.gvMx1mrpCloseStatus.Tag = "query_a.mrp_close_status";
-            this.gvMx1mrpCloseStatus.Visible = true;
-            this.gvMx1mrpCloseStatus.VisibleIndex = 18;
-            this.gvMx1mrpCloseStatus.Width = 94;
-            // 
-            // gvMx1outLmtUnitId
-            // 
-            this.gvMx1outLmtUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1outLmtUnitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1outLmtUnitId.Caption = "瓒呭彂鎺у埗鍗曚綅 ";
-            this.gvMx1outLmtUnitId.FieldName = "outLmtUnitId";
-            this.gvMx1outLmtUnitId.MinWidth = 50;
-            this.gvMx1outLmtUnitId.Name = "gvMx1outLmtUnitId";
-            this.gvMx1outLmtUnitId.Tag = "query_a.out_lmt_unit_id";
-            this.gvMx1outLmtUnitId.Visible = true;
-            this.gvMx1outLmtUnitId.VisibleIndex = 17;
-            this.gvMx1outLmtUnitId.Width = 94;
-            // 
-            // gvMx1deliveryMinQty
-            // 
-            this.gvMx1deliveryMinQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1deliveryMinQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1deliveryMinQty.Caption = "鍙戣揣涓嬮檺 ";
-            this.gvMx1deliveryMinQty.FieldName = "deliveryMinQty";
-            this.gvMx1deliveryMinQty.MinWidth = 50;
-            this.gvMx1deliveryMinQty.Name = "gvMx1deliveryMinQty";
-            this.gvMx1deliveryMinQty.Tag = "query_a.delivery_min_qty";
-            this.gvMx1deliveryMinQty.Visible = true;
-            this.gvMx1deliveryMinQty.VisibleIndex = 16;
-            this.gvMx1deliveryMinQty.Width = 94;
-            // 
-            // gvMx1deliveryMaxQty
-            // 
-            this.gvMx1deliveryMaxQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1deliveryMaxQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1deliveryMaxQty.Caption = "鍙戣揣涓婇檺 ";
-            this.gvMx1deliveryMaxQty.FieldName = "deliveryMaxQty";
-            this.gvMx1deliveryMaxQty.MinWidth = 50;
-            this.gvMx1deliveryMaxQty.Name = "gvMx1deliveryMaxQty";
-            this.gvMx1deliveryMaxQty.Tag = "query_a.delivery_max_qty";
-            this.gvMx1deliveryMaxQty.Visible = true;
-            this.gvMx1deliveryMaxQty.VisibleIndex = 15;
-            this.gvMx1deliveryMaxQty.Width = 94;
-            // 
-            // gvMx1lot
-            // 
-            this.gvMx1lot.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1lot.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lot.Caption = "鎵瑰彿 ";
-            this.gvMx1lot.FieldName = "lot";
-            this.gvMx1lot.MinWidth = 50;
-            this.gvMx1lot.Name = "gvMx1lot";
-            this.gvMx1lot.Tag = "query_a.lot";
-            this.gvMx1lot.Visible = true;
-            this.gvMx1lot.VisibleIndex = 14;
-            this.gvMx1lot.Width = 94;
-            // 
-            // gvMx1mtoNo
-            // 
-            this.gvMx1mtoNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1mtoNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mtoNo.Caption = "璁″垝璺熻釜鍙� ";
-            this.gvMx1mtoNo.FieldName = "mtoNo";
-            this.gvMx1mtoNo.MinWidth = 50;
-            this.gvMx1mtoNo.Name = "gvMx1mtoNo";
-            this.gvMx1mtoNo.Tag = "query_a.mto_no";
-            this.gvMx1mtoNo.Visible = true;
-            this.gvMx1mtoNo.VisibleIndex = 13;
-            this.gvMx1mtoNo.Width = 94;
-            // 
-            // gvMx1entryNote
-            // 
-            this.gvMx1entryNote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1entryNote.AppearanceCell.Options.UseFont = true;
-            this.gvMx1entryNote.Caption = "澶囨敞 ";
-            this.gvMx1entryNote.FieldName = "entryNote";
-            this.gvMx1entryNote.MinWidth = 50;
-            this.gvMx1entryNote.Name = "gvMx1entryNote";
-            this.gvMx1entryNote.Tag = "query_a.entry_note";
-            this.gvMx1entryNote.Visible = true;
-            this.gvMx1entryNote.VisibleIndex = 12;
-            this.gvMx1entryNote.Width = 94;
-            // 
-            // gvMx1ownerId
-            // 
-            this.gvMx1ownerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ownerId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ownerId.Caption = "璐т富 ";
-            this.gvMx1ownerId.FieldName = "ownerId";
-            this.gvMx1ownerId.MinWidth = 50;
-            this.gvMx1ownerId.Name = "gvMx1ownerId";
-            this.gvMx1ownerId.Tag = "query_a.owner_id";
-            this.gvMx1ownerId.Visible = true;
-            this.gvMx1ownerId.VisibleIndex = 11;
-            this.gvMx1ownerId.Width = 94;
-            // 
-            // gvMx1ownerTypeId
-            // 
-            this.gvMx1ownerTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ownerTypeId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ownerTypeId.Caption = "璐т富绫诲瀷 ";
-            this.gvMx1ownerTypeId.FieldName = "ownerTypeId";
-            this.gvMx1ownerTypeId.MinWidth = 50;
-            this.gvMx1ownerTypeId.Name = "gvMx1ownerTypeId";
-            this.gvMx1ownerTypeId.Tag = "query_a.owner_type_id";
-            this.gvMx1ownerTypeId.Visible = true;
-            this.gvMx1ownerTypeId.VisibleIndex = 10;
-            this.gvMx1ownerTypeId.Width = 94;
-            // 
-            // gvMx1isFree
-            // 
-            this.gvMx1isFree.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
-            this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
-            this.gvMx1isFree.FieldName = "isFree";
-            this.gvMx1isFree.MinWidth = 50;
-            this.gvMx1isFree.Name = "gvMx1isFree";
-            this.gvMx1isFree.Tag = "query_a.is_free";
-            this.gvMx1isFree.Visible = true;
-            this.gvMx1isFree.VisibleIndex = 9;
-            this.gvMx1isFree.Width = 94;
-            // 
-            // gvMx1deliveryDate
-            // 
-            this.gvMx1deliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1deliveryDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1deliveryDate.Caption = "瑕佽揣鏃ユ湡 ";
-            this.gvMx1deliveryDate.FieldName = "deliveryDate";
-            this.gvMx1deliveryDate.MinWidth = 50;
-            this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
-            this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
-            this.gvMx1deliveryDate.Visible = true;
-            this.gvMx1deliveryDate.VisibleIndex = 8;
-            this.gvMx1deliveryDate.Width = 94;
-            // 
-            // gvMx1priceUnitQty
-            // 
-            this.gvMx1priceUnitQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1priceUnitQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1priceUnitQty.Caption = "璁′环鏁伴噺 ";
-            this.gvMx1priceUnitQty.FieldName = "priceUnitQty";
-            this.gvMx1priceUnitQty.MinWidth = 50;
-            this.gvMx1priceUnitQty.Name = "gvMx1priceUnitQty";
-            this.gvMx1priceUnitQty.Tag = "query_a.price_unit_qty";
-            this.gvMx1priceUnitQty.Visible = true;
-            this.gvMx1priceUnitQty.VisibleIndex = 7;
-            this.gvMx1priceUnitQty.Width = 94;
-            // 
-            // gvMx1priceUnitId
-            // 
-            this.gvMx1priceUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1priceUnitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1priceUnitId.Caption = "璁′环鍗曚綅 ";
-            this.gvMx1priceUnitId.FieldName = "priceUnitId";
-            this.gvMx1priceUnitId.MinWidth = 50;
-            this.gvMx1priceUnitId.Name = "gvMx1priceUnitId";
-            this.gvMx1priceUnitId.Tag = "query_a.price_unit_id";
-            this.gvMx1priceUnitId.Visible = true;
-            this.gvMx1priceUnitId.VisibleIndex = 6;
-            this.gvMx1priceUnitId.Width = 94;
-            // 
-            // gvMx1qty
-            // 
-            this.gvMx1qty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1qty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1qty.Caption = "閿�鍞暟閲� ";
-            this.gvMx1qty.FieldName = "qty";
-            this.gvMx1qty.MinWidth = 50;
-            this.gvMx1qty.Name = "gvMx1qty";
-            this.gvMx1qty.Tag = "query_a.qty";
-            this.gvMx1qty.Visible = true;
-            this.gvMx1qty.VisibleIndex = 5;
-            this.gvMx1qty.Width = 94;
-            // 
-            // gvMx1unitId
-            // 
-            this.gvMx1unitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1unitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1unitId.Caption = "閿�鍞崟浣� ";
-            this.gvMx1unitId.FieldName = "unitId";
-            this.gvMx1unitId.MinWidth = 50;
-            this.gvMx1unitId.Name = "gvMx1unitId";
-            this.gvMx1unitId.Tag = "query_a.unit_id";
-            this.gvMx1unitId.Visible = true;
-            this.gvMx1unitId.VisibleIndex = 4;
-            this.gvMx1unitId.Width = 94;
-            // 
-            // gvMx1materialId
-            // 
-            this.gvMx1materialId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1materialId.Caption = "鐗╂枡缂栫爜 ";
-            this.gvMx1materialId.FieldName = "materialId";
-            this.gvMx1materialId.MinWidth = 50;
-            this.gvMx1materialId.Name = "gvMx1materialId";
-            this.gvMx1materialId.Tag = "query_a.material_id";
-            this.gvMx1materialId.Visible = true;
-            this.gvMx1materialId.VisibleIndex = 3;
-            this.gvMx1materialId.Width = 94;
-            // 
-            // gvMx1erpId
-            // 
-            this.gvMx1erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1erpId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1erpId.Caption = "erp_id ";
-            this.gvMx1erpId.FieldName = "erpId";
-            this.gvMx1erpId.MinWidth = 50;
-            this.gvMx1erpId.Name = "gvMx1erpId";
-            this.gvMx1erpId.Tag = "query_a.erp_id";
-            this.gvMx1erpId.Visible = true;
-            this.gvMx1erpId.VisibleIndex = 2;
-            this.gvMx1erpId.Width = 94;
-            // 
-            // gvMx1pid
-            // 
-            this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid ";
-            this.gvMx1pid.FieldName = "pid";
-            this.gvMx1pid.MinWidth = 50;
-            this.gvMx1pid.Name = "gvMx1pid";
-            this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Visible = true;
-            this.gvMx1pid.VisibleIndex = 1;
-            this.gvMx1pid.Width = 94;
-            // 
-            // gvMx1id
-            // 
-            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "id ";
-            this.gvMx1id.FieldName = "id";
-            this.gvMx1id.MinWidth = 50;
-            this.gvMx1id.Name = "gvMx1id";
-            this.gvMx1id.Tag = "query_a.id";
-            this.gvMx1id.Visible = true;
-            this.gvMx1id.VisibleIndex = 0;
-            this.gvMx1id.Width = 94;
-            // 
-            // tabMxPage1
-            // 
-            this.tabMxPage1.Controls.Add(this.gcMx1);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 191);
-            this.tabMxPage1.Text = "鏄庣粏1";
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 191);
-            this.gcMx1.TabIndex = 0;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1id,
-            this.gvMx1pid,
-            this.gvMx1erpId,
-            this.gvMx1materialId,
-            this.gvMx1unitId,
-            this.gvMx1qty,
-            this.gvMx1priceUnitId,
-            this.gvMx1priceUnitQty,
-            this.gvMx1deliveryDate,
-            this.gvMx1isFree,
-            this.gvMx1ownerTypeId,
-            this.gvMx1ownerId,
-            this.gvMx1entryNote,
-            this.gvMx1mtoNo,
-            this.gvMx1lot,
-            this.gvMx1deliveryMaxQty,
-            this.gvMx1deliveryMinQty,
-            this.gvMx1outLmtUnitId,
-            this.gvMx1mrpCloseStatus,
-            this.gvMx1mrpTerminateStatus,
-            this.gvMx1terminateDate,
-            this.gvMx1terminaterId,
-            this.gvMx1srcType,
-            this.gvMx1srcBillNo,
-            this.gvMx1deliQty,
-            this.gvMx1stockOutQty,
-            this.gvMx1baseRetNoticeQty,
-            this.gvMx1baseReturnQty,
-            this.gvMx1baseRemainOutQty,
-            this.gvMx1basearqty,
-            this.gvMx1custIno,
-            this.gvMx1custInm,
-            this.gvMx1custImd,
-            this.gvMx1mapId,
-            this.gvMx1mapName,
-            this.gvMx1mapSpec,
-            this.gvMx1seq,
-            this.gvMx1supplyOrgId,
-            this.gvMx1stockOrgId,
-            this.gvMx1settleOrgIds,
-            this.gvMx1eHid});
-            this.gvMx1.GridControl = this.gcMx1;
-            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;
-            // 
-            // lb_receiveContact
-            // 
-            this.lb_receiveContact.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_receiveContact.Appearance.Options.UseFont = true;
-            this.lb_receiveContact.Location = new System.Drawing.Point(20, 308);
-            this.lb_receiveContact.Name = "lb_receiveContact";
-            this.lb_receiveContact.Size = new System.Drawing.Size(107, 21);
-            this.lb_receiveContact.TabIndex = 417;
-            this.lb_receiveContact.Text = "鏀惰揣鏂硅仈绯讳汉 ";
-            // 
-            // txt_receiveContact
-            // 
-            this.txt_receiveContact.Location = new System.Drawing.Point(80, 308);
-            this.txt_receiveContact.Name = "txt_receiveContact";
-            this.txt_receiveContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiveContact.Size = new System.Drawing.Size(150, 28);
-            this.txt_receiveContact.TabIndex = 417;
             // 
             // gv_receiveContact
             // 
@@ -937,25 +344,6 @@
             this.gv_receiveContact.VisibleIndex = 36;
             this.gv_receiveContact.Width = 94;
             // 
-            // lb_receiveId
-            // 
-            this.lb_receiveId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_receiveId.Appearance.Options.UseFont = true;
-            this.lb_receiveId.Location = new System.Drawing.Point(770, 276);
-            this.lb_receiveId.Name = "lb_receiveId";
-            this.lb_receiveId.Size = new System.Drawing.Size(56, 21);
-            this.lb_receiveId.TabIndex = 408;
-            this.lb_receiveId.Text = "鏀惰揣鏂� ";
-            // 
-            // txt_receiveId
-            // 
-            this.txt_receiveId.Location = new System.Drawing.Point(830, 276);
-            this.txt_receiveId.Name = "txt_receiveId";
-            this.txt_receiveId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiveId.Size = new System.Drawing.Size(150, 28);
-            this.txt_receiveId.TabIndex = 408;
-            // 
             // gv_receiveId
             // 
             this.gv_receiveId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -969,25 +357,6 @@
             this.gv_receiveId.Visible = true;
             this.gv_receiveId.VisibleIndex = 35;
             this.gv_receiveId.Width = 94;
-            // 
-            // lb_saleOrgId
-            // 
-            this.lb_saleOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_saleOrgId.Appearance.Options.UseFont = true;
-            this.lb_saleOrgId.Location = new System.Drawing.Point(520, 276);
-            this.lb_saleOrgId.Name = "lb_saleOrgId";
-            this.lb_saleOrgId.Size = new System.Drawing.Size(91, 21);
-            this.lb_saleOrgId.TabIndex = 397;
-            this.lb_saleOrgId.Text = "閿�鍞粍缁嘔D ";
-            // 
-            // txt_saleOrgId
-            // 
-            this.txt_saleOrgId.Location = new System.Drawing.Point(580, 276);
-            this.txt_saleOrgId.Name = "txt_saleOrgId";
-            this.txt_saleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_saleOrgId.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrgId.Size = new System.Drawing.Size(150, 28);
-            this.txt_saleOrgId.TabIndex = 397;
             // 
             // gv_saleOrgId
             // 
@@ -1003,25 +372,6 @@
             this.gv_saleOrgId.VisibleIndex = 34;
             this.gv_saleOrgId.Width = 94;
             // 
-            // lb_fbilltype
-            // 
-            this.lb_fbilltype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fbilltype.Appearance.Options.UseFont = true;
-            this.lb_fbilltype.Location = new System.Drawing.Point(270, 276);
-            this.lb_fbilltype.Name = "lb_fbilltype";
-            this.lb_fbilltype.Size = new System.Drawing.Size(63, 21);
-            this.lb_fbilltype.TabIndex = 387;
-            this.lb_fbilltype.Text = "fbilltype ";
-            // 
-            // txt_fbilltype
-            // 
-            this.txt_fbilltype.Location = new System.Drawing.Point(330, 276);
-            this.txt_fbilltype.Name = "txt_fbilltype";
-            this.txt_fbilltype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fbilltype.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbilltype.Size = new System.Drawing.Size(150, 28);
-            this.txt_fbilltype.TabIndex = 387;
-            // 
             // gv_fbilltype
             // 
             this.gv_fbilltype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1035,25 +385,6 @@
             this.gv_fbilltype.Visible = true;
             this.gv_fbilltype.VisibleIndex = 33;
             this.gv_fbilltype.Width = 94;
-            // 
-            // lb_entryNote
-            // 
-            this.lb_entryNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_entryNote.Appearance.Options.UseFont = true;
-            this.lb_entryNote.Location = new System.Drawing.Point(20, 276);
-            this.lb_entryNote.Name = "lb_entryNote";
-            this.lb_entryNote.Size = new System.Drawing.Size(39, 21);
-            this.lb_entryNote.TabIndex = 378;
-            this.lb_entryNote.Text = "澶囨敞 ";
-            // 
-            // txt_entryNote
-            // 
-            this.txt_entryNote.Location = new System.Drawing.Point(80, 276);
-            this.txt_entryNote.Name = "txt_entryNote";
-            this.txt_entryNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_entryNote.Properties.Appearance.Options.UseFont = true;
-            this.txt_entryNote.Size = new System.Drawing.Size(150, 28);
-            this.txt_entryNote.TabIndex = 378;
             // 
             // gv_entryNote
             // 
@@ -1069,25 +400,6 @@
             this.gv_entryNote.VisibleIndex = 32;
             this.gv_entryNote.Width = 94;
             // 
-            // lb_changerId
-            // 
-            this.lb_changerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_changerId.Appearance.Options.UseFont = true;
-            this.lb_changerId.Location = new System.Drawing.Point(770, 244);
-            this.lb_changerId.Name = "lb_changerId";
-            this.lb_changerId.Size = new System.Drawing.Size(56, 21);
-            this.lb_changerId.TabIndex = 370;
-            this.lb_changerId.Text = "鍙樻洿浜� ";
-            // 
-            // txt_changerId
-            // 
-            this.txt_changerId.Location = new System.Drawing.Point(830, 244);
-            this.txt_changerId.Name = "txt_changerId";
-            this.txt_changerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_changerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_changerId.Size = new System.Drawing.Size(150, 28);
-            this.txt_changerId.TabIndex = 370;
-            // 
             // gv_changerId
             // 
             this.gv_changerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1101,25 +413,6 @@
             this.gv_changerId.Visible = true;
             this.gv_changerId.VisibleIndex = 31;
             this.gv_changerId.Width = 94;
-            // 
-            // lb_versionNo
-            // 
-            this.lb_versionNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_versionNo.Appearance.Options.UseFont = true;
-            this.lb_versionNo.Location = new System.Drawing.Point(520, 244);
-            this.lb_versionNo.Name = "lb_versionNo";
-            this.lb_versionNo.Size = new System.Drawing.Size(56, 21);
-            this.lb_versionNo.TabIndex = 360;
-            this.lb_versionNo.Text = "鐗堟湰鍙� ";
-            // 
-            // txt_versionNo
-            // 
-            this.txt_versionNo.Location = new System.Drawing.Point(580, 244);
-            this.txt_versionNo.Name = "txt_versionNo";
-            this.txt_versionNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_versionNo.Size = new System.Drawing.Size(150, 28);
-            this.txt_versionNo.TabIndex = 360;
             // 
             // gv_versionNo
             // 
@@ -1135,25 +428,6 @@
             this.gv_versionNo.VisibleIndex = 30;
             this.gv_versionNo.Width = 94;
             // 
-            // lb_cancellerId
-            // 
-            this.lb_cancellerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancellerId.Appearance.Options.UseFont = true;
-            this.lb_cancellerId.Location = new System.Drawing.Point(270, 244);
-            this.lb_cancellerId.Name = "lb_cancellerId";
-            this.lb_cancellerId.Size = new System.Drawing.Size(56, 21);
-            this.lb_cancellerId.TabIndex = 351;
-            this.lb_cancellerId.Text = "浣滃簾浜� ";
-            // 
-            // txt_cancellerId
-            // 
-            this.txt_cancellerId.Location = new System.Drawing.Point(330, 244);
-            this.txt_cancellerId.Name = "txt_cancellerId";
-            this.txt_cancellerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancellerId.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancellerId.TabIndex = 351;
-            // 
             // gv_cancellerId
             // 
             this.gv_cancellerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1167,25 +441,6 @@
             this.gv_cancellerId.Visible = true;
             this.gv_cancellerId.VisibleIndex = 29;
             this.gv_cancellerId.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(20, 244);
-            this.lb_cancelStatus.Name = "lb_cancelStatus";
-            this.lb_cancelStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancelStatus.TabIndex = 343;
-            this.lb_cancelStatus.Text = "浣滃簾鐘舵�� ";
-            // 
-            // txt_cancelStatus
-            // 
-            this.txt_cancelStatus.Location = new System.Drawing.Point(80, 244);
-            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 = 343;
             // 
             // gv_cancelStatus
             // 
@@ -1201,25 +456,6 @@
             this.gv_cancelStatus.VisibleIndex = 28;
             this.gv_cancelStatus.Width = 94;
             // 
-            // lb_changeDate
-            // 
-            this.lb_changeDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_changeDate.Appearance.Options.UseFont = true;
-            this.lb_changeDate.Location = new System.Drawing.Point(770, 212);
-            this.lb_changeDate.Name = "lb_changeDate";
-            this.lb_changeDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_changeDate.TabIndex = 336;
-            this.lb_changeDate.Text = "鍙樻洿鏃ユ湡 ";
-            // 
-            // txt_changeDate
-            // 
-            this.txt_changeDate.Location = new System.Drawing.Point(830, 212);
-            this.txt_changeDate.Name = "txt_changeDate";
-            this.txt_changeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_changeDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_changeDate.TabIndex = 336;
-            // 
             // gv_changeDate
             // 
             this.gv_changeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1233,25 +469,6 @@
             this.gv_changeDate.Visible = true;
             this.gv_changeDate.VisibleIndex = 27;
             this.gv_changeDate.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, 212);
-            this.lb_closeDate.Name = "lb_closeDate";
-            this.lb_closeDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeDate.TabIndex = 327;
-            this.lb_closeDate.Text = "鍏抽棴鏃ユ湡 ";
-            // 
-            // txt_closeDate
-            // 
-            this.txt_closeDate.Location = new System.Drawing.Point(580, 212);
-            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 = 327;
             // 
             // gv_closeDate
             // 
@@ -1267,25 +484,6 @@
             this.gv_closeDate.VisibleIndex = 26;
             this.gv_closeDate.Width = 94;
             // 
-            // lb_closerId
-            // 
-            this.lb_closerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closerId.Appearance.Options.UseFont = true;
-            this.lb_closerId.Location = new System.Drawing.Point(270, 212);
-            this.lb_closerId.Name = "lb_closerId";
-            this.lb_closerId.Size = new System.Drawing.Size(56, 21);
-            this.lb_closerId.TabIndex = 319;
-            this.lb_closerId.Text = "鍏抽棴浜� ";
-            // 
-            // txt_closerId
-            // 
-            this.txt_closerId.Location = new System.Drawing.Point(330, 212);
-            this.txt_closerId.Name = "txt_closerId";
-            this.txt_closerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_closerId.Size = new System.Drawing.Size(150, 28);
-            this.txt_closerId.TabIndex = 319;
-            // 
             // gv_closerId
             // 
             this.gv_closerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1299,25 +497,6 @@
             this.gv_closerId.Visible = true;
             this.gv_closerId.VisibleIndex = 25;
             this.gv_closerId.Width = 94;
-            // 
-            // lb_approveDate
-            // 
-            this.lb_approveDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_approveDate.Appearance.Options.UseFont = true;
-            this.lb_approveDate.Location = new System.Drawing.Point(20, 212);
-            this.lb_approveDate.Name = "lb_approveDate";
-            this.lb_approveDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_approveDate.TabIndex = 312;
-            this.lb_approveDate.Text = "瀹℃牳鏃ユ湡 ";
-            // 
-            // txt_approveDate
-            // 
-            this.txt_approveDate.Location = new System.Drawing.Point(80, 212);
-            this.txt_approveDate.Name = "txt_approveDate";
-            this.txt_approveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_approveDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_approveDate.TabIndex = 312;
             // 
             // gv_approveDate
             // 
@@ -1333,25 +512,6 @@
             this.gv_approveDate.VisibleIndex = 24;
             this.gv_approveDate.Width = 94;
             // 
-            // lb_modifyDate
-            // 
-            this.lb_modifyDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_modifyDate.Appearance.Options.UseFont = true;
-            this.lb_modifyDate.Location = new System.Drawing.Point(770, 180);
-            this.lb_modifyDate.Name = "lb_modifyDate";
-            this.lb_modifyDate.Size = new System.Drawing.Size(107, 21);
-            this.lb_modifyDate.TabIndex = 306;
-            this.lb_modifyDate.Text = "鏈�鍚庝慨鏀规棩鏈� ";
-            // 
-            // txt_modifyDate
-            // 
-            this.txt_modifyDate.Location = new System.Drawing.Point(830, 180);
-            this.txt_modifyDate.Name = "txt_modifyDate";
-            this.txt_modifyDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifyDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_modifyDate.TabIndex = 306;
-            // 
             // gv_modifyDate
             // 
             this.gv_modifyDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1365,25 +525,6 @@
             this.gv_modifyDate.Visible = true;
             this.gv_modifyDate.VisibleIndex = 23;
             this.gv_modifyDate.Width = 94;
-            // 
-            // lb_modifierId
-            // 
-            this.lb_modifierId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_modifierId.Appearance.Options.UseFont = true;
-            this.lb_modifierId.Location = new System.Drawing.Point(520, 180);
-            this.lb_modifierId.Name = "lb_modifierId";
-            this.lb_modifierId.Size = new System.Drawing.Size(90, 21);
-            this.lb_modifierId.TabIndex = 298;
-            this.lb_modifierId.Text = "鏈�鍚庝慨鏀逛汉 ";
-            // 
-            // txt_modifierId
-            // 
-            this.txt_modifierId.Location = new System.Drawing.Point(580, 180);
-            this.txt_modifierId.Name = "txt_modifierId";
-            this.txt_modifierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifierId.Size = new System.Drawing.Size(150, 28);
-            this.txt_modifierId.TabIndex = 298;
             // 
             // gv_modifierId
             // 
@@ -1399,25 +540,6 @@
             this.gv_modifierId.VisibleIndex = 22;
             this.gv_modifierId.Width = 94;
             // 
-            // lb_createDate
-            // 
-            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(270, 180);
-            this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_createDate.TabIndex = 291;
-            this.lb_createDate.Text = "鍒涘缓鏃ユ湡 ";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(330, 180);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_createDate.TabIndex = 291;
-            // 
             // gv_createDate
             // 
             this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1431,25 +553,6 @@
             this.gv_createDate.Visible = true;
             this.gv_createDate.VisibleIndex = 21;
             this.gv_createDate.Width = 94;
-            // 
-            // lb_creatorId
-            // 
-            this.lb_creatorId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_creatorId.Appearance.Options.UseFont = true;
-            this.lb_creatorId.Location = new System.Drawing.Point(20, 180);
-            this.lb_creatorId.Name = "lb_creatorId";
-            this.lb_creatorId.Size = new System.Drawing.Size(56, 21);
-            this.lb_creatorId.TabIndex = 285;
-            this.lb_creatorId.Text = "鍒涘缓浜� ";
-            // 
-            // txt_creatorId
-            // 
-            this.txt_creatorId.Location = new System.Drawing.Point(80, 180);
-            this.txt_creatorId.Name = "txt_creatorId";
-            this.txt_creatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_creatorId.Size = new System.Drawing.Size(150, 28);
-            this.txt_creatorId.TabIndex = 285;
             // 
             // gv_creatorId
             // 
@@ -1465,25 +568,6 @@
             this.gv_creatorId.VisibleIndex = 20;
             this.gv_creatorId.Width = 94;
             // 
-            // lb_linkPhone
-            // 
-            this.lb_linkPhone.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_linkPhone.Appearance.Options.UseFont = true;
-            this.lb_linkPhone.Location = new System.Drawing.Point(770, 148);
-            this.lb_linkPhone.Name = "lb_linkPhone";
-            this.lb_linkPhone.Size = new System.Drawing.Size(73, 21);
-            this.lb_linkPhone.TabIndex = 280;
-            this.lb_linkPhone.Text = "鑱旂郴鐢佃瘽 ";
-            // 
-            // txt_linkPhone
-            // 
-            this.txt_linkPhone.Location = new System.Drawing.Point(830, 148);
-            this.txt_linkPhone.Name = "txt_linkPhone";
-            this.txt_linkPhone.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
-            this.txt_linkPhone.Size = new System.Drawing.Size(150, 28);
-            this.txt_linkPhone.TabIndex = 280;
-            // 
             // gv_linkPhone
             // 
             this.gv_linkPhone.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1497,25 +581,6 @@
             this.gv_linkPhone.Visible = true;
             this.gv_linkPhone.VisibleIndex = 19;
             this.gv_linkPhone.Width = 94;
-            // 
-            // lb_chargeId
-            // 
-            this.lb_chargeId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_chargeId.Appearance.Options.UseFont = true;
-            this.lb_chargeId.Location = new System.Drawing.Point(520, 148);
-            this.lb_chargeId.Name = "lb_chargeId";
-            this.lb_chargeId.Size = new System.Drawing.Size(56, 21);
-            this.lb_chargeId.TabIndex = 273;
-            this.lb_chargeId.Text = "浠樻鏂� ";
-            // 
-            // txt_chargeId
-            // 
-            this.txt_chargeId.Location = new System.Drawing.Point(580, 148);
-            this.txt_chargeId.Name = "txt_chargeId";
-            this.txt_chargeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
-            this.txt_chargeId.Size = new System.Drawing.Size(150, 28);
-            this.txt_chargeId.TabIndex = 273;
             // 
             // gv_chargeId
             // 
@@ -1531,25 +596,6 @@
             this.gv_chargeId.VisibleIndex = 18;
             this.gv_chargeId.Width = 94;
             // 
-            // lb_linkMan
-            // 
-            this.lb_linkMan.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_linkMan.Appearance.Options.UseFont = true;
-            this.lb_linkMan.Location = new System.Drawing.Point(270, 148);
-            this.lb_linkMan.Name = "lb_linkMan";
-            this.lb_linkMan.Size = new System.Drawing.Size(90, 21);
-            this.lb_linkMan.TabIndex = 267;
-            this.lb_linkMan.Text = "鏀惰揣浜哄鍚� ";
-            // 
-            // txt_linkMan
-            // 
-            this.txt_linkMan.Location = new System.Drawing.Point(330, 148);
-            this.txt_linkMan.Name = "txt_linkMan";
-            this.txt_linkMan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
-            this.txt_linkMan.Size = new System.Drawing.Size(150, 28);
-            this.txt_linkMan.TabIndex = 267;
-            // 
             // gv_linkMan
             // 
             this.gv_linkMan.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1563,25 +609,6 @@
             this.gv_linkMan.Visible = true;
             this.gv_linkMan.VisibleIndex = 17;
             this.gv_linkMan.Width = 94;
-            // 
-            // lb_approverId
-            // 
-            this.lb_approverId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_approverId.Appearance.Options.UseFont = true;
-            this.lb_approverId.Location = new System.Drawing.Point(20, 148);
-            this.lb_approverId.Name = "lb_approverId";
-            this.lb_approverId.Size = new System.Drawing.Size(56, 21);
-            this.lb_approverId.TabIndex = 262;
-            this.lb_approverId.Text = "瀹℃牳浜� ";
-            // 
-            // txt_approverId
-            // 
-            this.txt_approverId.Location = new System.Drawing.Point(80, 148);
-            this.txt_approverId.Name = "txt_approverId";
-            this.txt_approverId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_approverId.Properties.Appearance.Options.UseFont = true;
-            this.txt_approverId.Size = new System.Drawing.Size(150, 28);
-            this.txt_approverId.TabIndex = 262;
             // 
             // gv_approverId
             // 
@@ -1597,25 +624,6 @@
             this.gv_approverId.VisibleIndex = 16;
             this.gv_approverId.Width = 94;
             // 
-            // lb_settleId
-            // 
-            this.lb_settleId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_settleId.Appearance.Options.UseFont = true;
-            this.lb_settleId.Location = new System.Drawing.Point(770, 116);
-            this.lb_settleId.Name = "lb_settleId";
-            this.lb_settleId.Size = new System.Drawing.Size(56, 21);
-            this.lb_settleId.TabIndex = 258;
-            this.lb_settleId.Text = "缁撶畻鏂� ";
-            // 
-            // txt_settleId
-            // 
-            this.txt_settleId.Location = new System.Drawing.Point(830, 116);
-            this.txt_settleId.Name = "txt_settleId";
-            this.txt_settleId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_settleId.Properties.Appearance.Options.UseFont = true;
-            this.txt_settleId.Size = new System.Drawing.Size(150, 28);
-            this.txt_settleId.TabIndex = 258;
-            // 
             // gv_settleId
             // 
             this.gv_settleId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1629,25 +637,6 @@
             this.gv_settleId.Visible = true;
             this.gv_settleId.VisibleIndex = 15;
             this.gv_settleId.Width = 94;
-            // 
-            // lb_note
-            // 
-            this.lb_note.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_note.Appearance.Options.UseFont = true;
-            this.lb_note.Location = new System.Drawing.Point(520, 116);
-            this.lb_note.Name = "lb_note";
-            this.lb_note.Size = new System.Drawing.Size(39, 21);
-            this.lb_note.TabIndex = 252;
-            this.lb_note.Text = "澶囨敞 ";
-            // 
-            // txt_note
-            // 
-            this.txt_note.Location = new System.Drawing.Point(580, 116);
-            this.txt_note.Name = "txt_note";
-            this.txt_note.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_note.Properties.Appearance.Options.UseFont = true;
-            this.txt_note.Size = new System.Drawing.Size(150, 28);
-            this.txt_note.TabIndex = 252;
             // 
             // gv_note
             // 
@@ -1663,25 +652,6 @@
             this.gv_note.VisibleIndex = 14;
             this.gv_note.Width = 94;
             // 
-            // lb_changeReason
-            // 
-            this.lb_changeReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_changeReason.Appearance.Options.UseFont = true;
-            this.lb_changeReason.Location = new System.Drawing.Point(270, 116);
-            this.lb_changeReason.Name = "lb_changeReason";
-            this.lb_changeReason.Size = new System.Drawing.Size(73, 21);
-            this.lb_changeReason.TabIndex = 247;
-            this.lb_changeReason.Text = "鍙樻洿鍘熷洜 ";
-            // 
-            // txt_changeReason
-            // 
-            this.txt_changeReason.Location = new System.Drawing.Point(330, 116);
-            this.txt_changeReason.Name = "txt_changeReason";
-            this.txt_changeReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_changeReason.Size = new System.Drawing.Size(150, 28);
-            this.txt_changeReason.TabIndex = 247;
-            // 
             // gv_changeReason
             // 
             this.gv_changeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1695,25 +665,6 @@
             this.gv_changeReason.Visible = true;
             this.gv_changeReason.VisibleIndex = 13;
             this.gv_changeReason.Width = 94;
-            // 
-            // lb_salerId
-            // 
-            this.lb_salerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_salerId.Appearance.Options.UseFont = true;
-            this.lb_salerId.Location = new System.Drawing.Point(20, 116);
-            this.lb_salerId.Name = "lb_salerId";
-            this.lb_salerId.Size = new System.Drawing.Size(56, 21);
-            this.lb_salerId.TabIndex = 243;
-            this.lb_salerId.Text = "閿�鍞憳 ";
-            // 
-            // txt_salerId
-            // 
-            this.txt_salerId.Location = new System.Drawing.Point(80, 116);
-            this.txt_salerId.Name = "txt_salerId";
-            this.txt_salerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_salerId.Size = new System.Drawing.Size(150, 28);
-            this.txt_salerId.TabIndex = 243;
             // 
             // gv_salerId
             // 
@@ -1986,8 +937,7 @@
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2,
-            this.xtraTabPage3});
+            this.xtraTabPage2});
             // 
             // xtraTabPage1
             // 
@@ -2011,108 +961,10 @@
             // 
             // xtraTabPage2
             // 
-            this.xtraTabPage2.Controls.Add(this.tabMx);
-            this.xtraTabPage2.Controls.Add(this.panel1);
+            this.xtraTabPage2.Controls.Add(this.splitContainerControl1);
             this.xtraTabPage2.Name = "xtraTabPage2";
             this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
-            // 
-            // tabMx
-            // 
-            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 347);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 223);
-            this.tabMx.TabIndex = 2;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1});
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_receiveContact);
-            this.panel1.Controls.Add(this.txt_receiveContact);
-            this.panel1.Controls.Add(this.lb_receiveId);
-            this.panel1.Controls.Add(this.txt_receiveId);
-            this.panel1.Controls.Add(this.lb_saleOrgId);
-            this.panel1.Controls.Add(this.txt_saleOrgId);
-            this.panel1.Controls.Add(this.lb_fbilltype);
-            this.panel1.Controls.Add(this.txt_fbilltype);
-            this.panel1.Controls.Add(this.lb_entryNote);
-            this.panel1.Controls.Add(this.txt_entryNote);
-            this.panel1.Controls.Add(this.lb_changerId);
-            this.panel1.Controls.Add(this.txt_changerId);
-            this.panel1.Controls.Add(this.lb_versionNo);
-            this.panel1.Controls.Add(this.txt_versionNo);
-            this.panel1.Controls.Add(this.lb_cancellerId);
-            this.panel1.Controls.Add(this.txt_cancellerId);
-            this.panel1.Controls.Add(this.lb_cancelStatus);
-            this.panel1.Controls.Add(this.txt_cancelStatus);
-            this.panel1.Controls.Add(this.lb_changeDate);
-            this.panel1.Controls.Add(this.txt_changeDate);
-            this.panel1.Controls.Add(this.lb_closeDate);
-            this.panel1.Controls.Add(this.txt_closeDate);
-            this.panel1.Controls.Add(this.lb_closerId);
-            this.panel1.Controls.Add(this.txt_closerId);
-            this.panel1.Controls.Add(this.lb_approveDate);
-            this.panel1.Controls.Add(this.txt_approveDate);
-            this.panel1.Controls.Add(this.lb_modifyDate);
-            this.panel1.Controls.Add(this.txt_modifyDate);
-            this.panel1.Controls.Add(this.lb_modifierId);
-            this.panel1.Controls.Add(this.txt_modifierId);
-            this.panel1.Controls.Add(this.lb_createDate);
-            this.panel1.Controls.Add(this.txt_createDate);
-            this.panel1.Controls.Add(this.lb_creatorId);
-            this.panel1.Controls.Add(this.txt_creatorId);
-            this.panel1.Controls.Add(this.lb_linkPhone);
-            this.panel1.Controls.Add(this.txt_linkPhone);
-            this.panel1.Controls.Add(this.lb_chargeId);
-            this.panel1.Controls.Add(this.txt_chargeId);
-            this.panel1.Controls.Add(this.lb_linkMan);
-            this.panel1.Controls.Add(this.txt_linkMan);
-            this.panel1.Controls.Add(this.lb_approverId);
-            this.panel1.Controls.Add(this.txt_approverId);
-            this.panel1.Controls.Add(this.lb_settleId);
-            this.panel1.Controls.Add(this.txt_settleId);
-            this.panel1.Controls.Add(this.lb_note);
-            this.panel1.Controls.Add(this.txt_note);
-            this.panel1.Controls.Add(this.lb_changeReason);
-            this.panel1.Controls.Add(this.txt_changeReason);
-            this.panel1.Controls.Add(this.lb_salerId);
-            this.panel1.Controls.Add(this.txt_salerId);
-            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, 347);
-            this.panel1.TabIndex = 1;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(1024, 52);
-            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);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(1075, 52);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            // 
-            // xtraTabPage3
-            // 
-            this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
-            this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage3.Text = "xtraTabPage3";
             // 
             // splitContainerControl1
             // 
@@ -2126,53 +978,1021 @@
             this.splitContainerControl1.Panel1.Appearance.BackColor = System.Drawing.Color.White;
             this.splitContainerControl1.Panel1.Appearance.Options.UseBackColor = true;
             this.splitContainerControl1.Panel1.AutoScroll = true;
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel14);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel15);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel16);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel17);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel10);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel11);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel12);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel13);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel9);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel8);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel7);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel6);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel4);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel5);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel3);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel2);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel1);
             this.splitContainerControl1.Panel1.Text = "Panel1";
             // 
             // splitContainerControl1.Panel2
             // 
+            this.splitContainerControl1.Panel2.Controls.Add(this.tabMx);
             this.splitContainerControl1.Panel2.Text = "Panel2";
             this.splitContainerControl1.Size = new System.Drawing.Size(1126, 570);
-            this.splitContainerControl1.SplitterPosition = 371;
-            this.splitContainerControl1.TabIndex = 3;
+            this.splitContainerControl1.SplitterPosition = 393;
+            this.splitContainerControl1.TabIndex = 4;
+            // 
+            // panel1
+            // 
+            this.panel1.AutoScroll = true;
+            this.panel1.Controls.Add(this.lbGuid);
+            this.panel1.Controls.Add(this.panel42);
+            this.panel1.Controls.Add(this.panel41);
+            this.panel1.Controls.Add(this.panel40);
+            this.panel1.Controls.Add(this.panel39);
+            this.panel1.Controls.Add(this.panel38);
+            this.panel1.Controls.Add(this.panel34);
+            this.panel1.Controls.Add(this.panel35);
+            this.panel1.Controls.Add(this.panel36);
+            this.panel1.Controls.Add(this.panel37);
+            this.panel1.Controls.Add(this.panel33);
+            this.panel1.Controls.Add(this.panel32);
+            this.panel1.Controls.Add(this.panel31);
+            this.panel1.Controls.Add(this.panel30);
+            this.panel1.Controls.Add(this.panel26);
+            this.panel1.Controls.Add(this.panel27);
+            this.panel1.Controls.Add(this.panel28);
+            this.panel1.Controls.Add(this.panel29);
+            this.panel1.Controls.Add(this.panel22);
+            this.panel1.Controls.Add(this.panel23);
+            this.panel1.Controls.Add(this.panel24);
+            this.panel1.Controls.Add(this.panel25);
+            this.panel1.Controls.Add(this.panel21);
+            this.panel1.Controls.Add(this.panel20);
+            this.panel1.Controls.Add(this.panel19);
+            this.panel1.Controls.Add(this.panel18);
+            this.panel1.Controls.Add(this.panel14);
+            this.panel1.Controls.Add(this.panel15);
+            this.panel1.Controls.Add(this.panel16);
+            this.panel1.Controls.Add(this.panel17);
+            this.panel1.Controls.Add(this.panel10);
+            this.panel1.Controls.Add(this.panel11);
+            this.panel1.Controls.Add(this.panel12);
+            this.panel1.Controls.Add(this.panel13);
+            this.panel1.Controls.Add(this.panel4);
+            this.panel1.Controls.Add(this.panel5);
+            this.panel1.Controls.Add(this.panel3);
+            this.panel1.Controls.Add(this.panel2);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1126, 393);
+            this.panel1.TabIndex = 1;
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(1045, 239);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(81, 18);
+            this.lbGuid.TabIndex = 466;
+            this.lbGuid.Text = "labelControl1";
+            this.lbGuid.Visible = false;
+            // 
+            // panel42
+            // 
+            this.panel42.Controls.Add(this.lb_receiveContact);
+            this.panel42.Controls.Add(this.txt_receiveContact);
+            this.panel42.Location = new System.Drawing.Point(9, 353);
+            this.panel42.Name = "panel42";
+            this.panel42.Size = new System.Drawing.Size(240, 34);
+            this.panel42.TabIndex = 465;
+            // 
+            // lb_receiveContact
+            // 
+            this.lb_receiveContact.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_receiveContact.Appearance.Options.UseFont = true;
+            this.lb_receiveContact.Location = new System.Drawing.Point(3, 7);
+            this.lb_receiveContact.Name = "lb_receiveContact";
+            this.lb_receiveContact.Size = new System.Drawing.Size(107, 21);
+            this.lb_receiveContact.TabIndex = 426;
+            this.lb_receiveContact.Text = "鏀惰揣鏂硅仈绯讳汉 ";
+            // 
+            // txt_receiveContact
+            // 
+            this.txt_receiveContact.Location = new System.Drawing.Point(82, 3);
+            this.txt_receiveContact.Name = "txt_receiveContact";
+            this.txt_receiveContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
+            this.txt_receiveContact.Size = new System.Drawing.Size(155, 28);
+            this.txt_receiveContact.TabIndex = 427;
+            // 
+            // panel41
+            // 
+            this.panel41.Controls.Add(this.lb_receiveId);
+            this.panel41.Controls.Add(this.txt_receiveId);
+            this.panel41.Location = new System.Drawing.Point(769, 315);
+            this.panel41.Name = "panel41";
+            this.panel41.Size = new System.Drawing.Size(240, 34);
+            this.panel41.TabIndex = 464;
+            // 
+            // lb_receiveId
+            // 
+            this.lb_receiveId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_receiveId.Appearance.Options.UseFont = true;
+            this.lb_receiveId.Location = new System.Drawing.Point(3, 7);
+            this.lb_receiveId.Name = "lb_receiveId";
+            this.lb_receiveId.Size = new System.Drawing.Size(56, 21);
+            this.lb_receiveId.TabIndex = 424;
+            this.lb_receiveId.Text = "鏀惰揣鏂� ";
+            // 
+            // txt_receiveId
+            // 
+            this.txt_receiveId.Location = new System.Drawing.Point(82, 3);
+            this.txt_receiveId.Name = "txt_receiveId";
+            this.txt_receiveId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
+            this.txt_receiveId.Size = new System.Drawing.Size(155, 28);
+            this.txt_receiveId.TabIndex = 425;
+            // 
+            // panel40
+            // 
+            this.panel40.Controls.Add(this.lb_saleOrgId);
+            this.panel40.Controls.Add(this.txt_saleOrgId);
+            this.panel40.Location = new System.Drawing.Point(512, 316);
+            this.panel40.Name = "panel40";
+            this.panel40.Size = new System.Drawing.Size(240, 34);
+            this.panel40.TabIndex = 463;
+            // 
+            // lb_saleOrgId
+            // 
+            this.lb_saleOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_saleOrgId.Appearance.Options.UseFont = true;
+            this.lb_saleOrgId.Location = new System.Drawing.Point(5, 7);
+            this.lb_saleOrgId.Name = "lb_saleOrgId";
+            this.lb_saleOrgId.Size = new System.Drawing.Size(91, 21);
+            this.lb_saleOrgId.TabIndex = 422;
+            this.lb_saleOrgId.Text = "閿�鍞粍缁嘔D ";
+            // 
+            // txt_saleOrgId
+            // 
+            this.txt_saleOrgId.Location = new System.Drawing.Point(81, 3);
+            this.txt_saleOrgId.Name = "txt_saleOrgId";
+            this.txt_saleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_saleOrgId.Properties.Appearance.Options.UseFont = true;
+            this.txt_saleOrgId.Size = new System.Drawing.Size(155, 28);
+            this.txt_saleOrgId.TabIndex = 423;
+            // 
+            // panel39
+            // 
+            this.panel39.Controls.Add(this.lb_fbilltype);
+            this.panel39.Controls.Add(this.txt_fbilltype);
+            this.panel39.Location = new System.Drawing.Point(259, 316);
+            this.panel39.Name = "panel39";
+            this.panel39.Size = new System.Drawing.Size(240, 34);
+            this.panel39.TabIndex = 462;
+            // 
+            // lb_fbilltype
+            // 
+            this.lb_fbilltype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_fbilltype.Appearance.Options.UseFont = true;
+            this.lb_fbilltype.Location = new System.Drawing.Point(6, 7);
+            this.lb_fbilltype.Name = "lb_fbilltype";
+            this.lb_fbilltype.Size = new System.Drawing.Size(63, 21);
+            this.lb_fbilltype.TabIndex = 420;
+            this.lb_fbilltype.Text = "fbilltype ";
+            // 
+            // txt_fbilltype
+            // 
+            this.txt_fbilltype.Location = new System.Drawing.Point(81, 3);
+            this.txt_fbilltype.Name = "txt_fbilltype";
+            this.txt_fbilltype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fbilltype.Properties.Appearance.Options.UseFont = true;
+            this.txt_fbilltype.Size = new System.Drawing.Size(155, 28);
+            this.txt_fbilltype.TabIndex = 421;
+            // 
+            // panel38
+            // 
+            this.panel38.Controls.Add(this.lb_entryNote);
+            this.panel38.Controls.Add(this.txt_entryNote);
+            this.panel38.Location = new System.Drawing.Point(8, 316);
+            this.panel38.Name = "panel38";
+            this.panel38.Size = new System.Drawing.Size(240, 34);
+            this.panel38.TabIndex = 461;
+            // 
+            // lb_entryNote
+            // 
+            this.lb_entryNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_entryNote.Appearance.Options.UseFont = true;
+            this.lb_entryNote.Location = new System.Drawing.Point(3, 7);
+            this.lb_entryNote.Name = "lb_entryNote";
+            this.lb_entryNote.Size = new System.Drawing.Size(39, 21);
+            this.lb_entryNote.TabIndex = 418;
+            this.lb_entryNote.Text = "澶囨敞 ";
+            // 
+            // txt_entryNote
+            // 
+            this.txt_entryNote.Location = new System.Drawing.Point(82, 3);
+            this.txt_entryNote.Name = "txt_entryNote";
+            this.txt_entryNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_entryNote.Properties.Appearance.Options.UseFont = true;
+            this.txt_entryNote.Size = new System.Drawing.Size(155, 28);
+            this.txt_entryNote.TabIndex = 419;
+            // 
+            // panel34
+            // 
+            this.panel34.Controls.Add(this.lb_changerId);
+            this.panel34.Controls.Add(this.txt_changerId);
+            this.panel34.Location = new System.Drawing.Point(769, 278);
+            this.panel34.Name = "panel34";
+            this.panel34.Size = new System.Drawing.Size(240, 34);
+            this.panel34.TabIndex = 460;
+            // 
+            // lb_changerId
+            // 
+            this.lb_changerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_changerId.Appearance.Options.UseFont = true;
+            this.lb_changerId.Location = new System.Drawing.Point(3, 7);
+            this.lb_changerId.Name = "lb_changerId";
+            this.lb_changerId.Size = new System.Drawing.Size(56, 21);
+            this.lb_changerId.TabIndex = 377;
+            this.lb_changerId.Text = "鍙樻洿浜� ";
+            // 
+            // txt_changerId
+            // 
+            this.txt_changerId.Location = new System.Drawing.Point(82, 3);
+            this.txt_changerId.Name = "txt_changerId";
+            this.txt_changerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_changerId.Properties.Appearance.Options.UseFont = true;
+            this.txt_changerId.Size = new System.Drawing.Size(155, 28);
+            this.txt_changerId.TabIndex = 378;
+            // 
+            // panel35
+            // 
+            this.panel35.Controls.Add(this.lb_versionNo);
+            this.panel35.Controls.Add(this.txt_versionNo);
+            this.panel35.Location = new System.Drawing.Point(512, 278);
+            this.panel35.Name = "panel35";
+            this.panel35.Size = new System.Drawing.Size(240, 34);
+            this.panel35.TabIndex = 459;
+            // 
+            // lb_versionNo
+            // 
+            this.lb_versionNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_versionNo.Appearance.Options.UseFont = true;
+            this.lb_versionNo.Location = new System.Drawing.Point(5, 7);
+            this.lb_versionNo.Name = "lb_versionNo";
+            this.lb_versionNo.Size = new System.Drawing.Size(56, 21);
+            this.lb_versionNo.TabIndex = 375;
+            this.lb_versionNo.Text = "鐗堟湰鍙� ";
+            // 
+            // txt_versionNo
+            // 
+            this.txt_versionNo.Location = new System.Drawing.Point(81, 3);
+            this.txt_versionNo.Name = "txt_versionNo";
+            this.txt_versionNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_versionNo.Size = new System.Drawing.Size(155, 28);
+            this.txt_versionNo.TabIndex = 376;
+            // 
+            // panel36
+            // 
+            this.panel36.Controls.Add(this.lb_cancellerId);
+            this.panel36.Controls.Add(this.txt_cancellerId);
+            this.panel36.Location = new System.Drawing.Point(263, 278);
+            this.panel36.Name = "panel36";
+            this.panel36.Size = new System.Drawing.Size(240, 34);
+            this.panel36.TabIndex = 458;
+            // 
+            // lb_cancellerId
+            // 
+            this.lb_cancellerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_cancellerId.Appearance.Options.UseFont = true;
+            this.lb_cancellerId.Location = new System.Drawing.Point(6, 7);
+            this.lb_cancellerId.Name = "lb_cancellerId";
+            this.lb_cancellerId.Size = new System.Drawing.Size(56, 21);
+            this.lb_cancellerId.TabIndex = 373;
+            this.lb_cancellerId.Text = "浣滃簾浜� ";
+            // 
+            // txt_cancellerId
+            // 
+            this.txt_cancellerId.Location = new System.Drawing.Point(81, 3);
+            this.txt_cancellerId.Name = "txt_cancellerId";
+            this.txt_cancellerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
+            this.txt_cancellerId.Size = new System.Drawing.Size(155, 28);
+            this.txt_cancellerId.TabIndex = 374;
+            // 
+            // panel37
+            // 
+            this.panel37.Controls.Add(this.lb_cancelStatus);
+            this.panel37.Controls.Add(this.txt_cancelStatus);
+            this.panel37.Location = new System.Drawing.Point(8, 278);
+            this.panel37.Name = "panel37";
+            this.panel37.Size = new System.Drawing.Size(240, 34);
+            this.panel37.TabIndex = 457;
+            // 
+            // 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(3, 7);
+            this.lb_cancelStatus.Name = "lb_cancelStatus";
+            this.lb_cancelStatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_cancelStatus.TabIndex = 371;
+            this.lb_cancelStatus.Text = "浣滃簾鐘舵�� ";
+            // 
+            // txt_cancelStatus
+            // 
+            this.txt_cancelStatus.Location = new System.Drawing.Point(82, 3);
+            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(155, 28);
+            this.txt_cancelStatus.TabIndex = 372;
+            // 
+            // panel33
+            // 
+            this.panel33.Controls.Add(this.lb_changeDate);
+            this.panel33.Controls.Add(this.txt_changeDate);
+            this.panel33.Location = new System.Drawing.Point(769, 239);
+            this.panel33.Name = "panel33";
+            this.panel33.Size = new System.Drawing.Size(240, 34);
+            this.panel33.TabIndex = 456;
+            // 
+            // lb_changeDate
+            // 
+            this.lb_changeDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_changeDate.Appearance.Options.UseFont = true;
+            this.lb_changeDate.Location = new System.Drawing.Point(3, 7);
+            this.lb_changeDate.Name = "lb_changeDate";
+            this.lb_changeDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_changeDate.TabIndex = 343;
+            this.lb_changeDate.Text = "鍙樻洿鏃ユ湡 ";
+            // 
+            // txt_changeDate
+            // 
+            this.txt_changeDate.Location = new System.Drawing.Point(82, 3);
+            this.txt_changeDate.Name = "txt_changeDate";
+            this.txt_changeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_changeDate.Size = new System.Drawing.Size(155, 28);
+            this.txt_changeDate.TabIndex = 344;
+            // 
+            // panel32
+            // 
+            this.panel32.Controls.Add(this.lb_closeDate);
+            this.panel32.Controls.Add(this.txt_closeDate);
+            this.panel32.Location = new System.Drawing.Point(512, 239);
+            this.panel32.Name = "panel32";
+            this.panel32.Size = new System.Drawing.Size(240, 34);
+            this.panel32.TabIndex = 455;
+            // 
+            // 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(5, 7);
+            this.lb_closeDate.Name = "lb_closeDate";
+            this.lb_closeDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_closeDate.TabIndex = 341;
+            this.lb_closeDate.Text = "鍏抽棴鏃ユ湡 ";
+            // 
+            // txt_closeDate
+            // 
+            this.txt_closeDate.Location = new System.Drawing.Point(81, 3);
+            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(155, 28);
+            this.txt_closeDate.TabIndex = 342;
+            // 
+            // panel31
+            // 
+            this.panel31.Controls.Add(this.lb_closerId);
+            this.panel31.Controls.Add(this.txt_closerId);
+            this.panel31.Location = new System.Drawing.Point(263, 239);
+            this.panel31.Name = "panel31";
+            this.panel31.Size = new System.Drawing.Size(240, 34);
+            this.panel31.TabIndex = 454;
+            // 
+            // lb_closerId
+            // 
+            this.lb_closerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_closerId.Appearance.Options.UseFont = true;
+            this.lb_closerId.Location = new System.Drawing.Point(6, 7);
+            this.lb_closerId.Name = "lb_closerId";
+            this.lb_closerId.Size = new System.Drawing.Size(56, 21);
+            this.lb_closerId.TabIndex = 339;
+            this.lb_closerId.Text = "鍏抽棴浜� ";
+            // 
+            // txt_closerId
+            // 
+            this.txt_closerId.Location = new System.Drawing.Point(81, 3);
+            this.txt_closerId.Name = "txt_closerId";
+            this.txt_closerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_closerId.Properties.Appearance.Options.UseFont = true;
+            this.txt_closerId.Size = new System.Drawing.Size(155, 28);
+            this.txt_closerId.TabIndex = 340;
+            // 
+            // panel30
+            // 
+            this.panel30.Controls.Add(this.lb_approveDate);
+            this.panel30.Controls.Add(this.txt_approveDate);
+            this.panel30.Location = new System.Drawing.Point(8, 239);
+            this.panel30.Name = "panel30";
+            this.panel30.Size = new System.Drawing.Size(240, 34);
+            this.panel30.TabIndex = 453;
+            // 
+            // lb_approveDate
+            // 
+            this.lb_approveDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_approveDate.Appearance.Options.UseFont = true;
+            this.lb_approveDate.Location = new System.Drawing.Point(3, 7);
+            this.lb_approveDate.Name = "lb_approveDate";
+            this.lb_approveDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_approveDate.TabIndex = 337;
+            this.lb_approveDate.Text = "瀹℃牳鏃ユ湡 ";
+            // 
+            // txt_approveDate
+            // 
+            this.txt_approveDate.Location = new System.Drawing.Point(82, 3);
+            this.txt_approveDate.Name = "txt_approveDate";
+            this.txt_approveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_approveDate.Size = new System.Drawing.Size(155, 28);
+            this.txt_approveDate.TabIndex = 338;
+            // 
+            // panel26
+            // 
+            this.panel26.Controls.Add(this.lb_modifyDate);
+            this.panel26.Controls.Add(this.txt_modifyDate);
+            this.panel26.Location = new System.Drawing.Point(769, 201);
+            this.panel26.Name = "panel26";
+            this.panel26.Size = new System.Drawing.Size(240, 34);
+            this.panel26.TabIndex = 450;
+            // 
+            // lb_modifyDate
+            // 
+            this.lb_modifyDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_modifyDate.Appearance.Options.UseFont = true;
+            this.lb_modifyDate.Location = new System.Drawing.Point(3, 7);
+            this.lb_modifyDate.Name = "lb_modifyDate";
+            this.lb_modifyDate.Size = new System.Drawing.Size(107, 21);
+            this.lb_modifyDate.TabIndex = 313;
+            this.lb_modifyDate.Text = "鏈�鍚庝慨鏀规棩鏈� ";
+            // 
+            // txt_modifyDate
+            // 
+            this.txt_modifyDate.Location = new System.Drawing.Point(82, 3);
+            this.txt_modifyDate.Name = "txt_modifyDate";
+            this.txt_modifyDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_modifyDate.Size = new System.Drawing.Size(155, 28);
+            this.txt_modifyDate.TabIndex = 314;
+            // 
+            // panel27
+            // 
+            this.panel27.Controls.Add(this.lb_modifierId);
+            this.panel27.Controls.Add(this.txt_modifierId);
+            this.panel27.Location = new System.Drawing.Point(512, 201);
+            this.panel27.Name = "panel27";
+            this.panel27.Size = new System.Drawing.Size(240, 34);
+            this.panel27.TabIndex = 452;
+            // 
+            // lb_modifierId
+            // 
+            this.lb_modifierId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_modifierId.Appearance.Options.UseFont = true;
+            this.lb_modifierId.Location = new System.Drawing.Point(5, 7);
+            this.lb_modifierId.Name = "lb_modifierId";
+            this.lb_modifierId.Size = new System.Drawing.Size(90, 21);
+            this.lb_modifierId.TabIndex = 311;
+            this.lb_modifierId.Text = "鏈�鍚庝慨鏀逛汉 ";
+            // 
+            // txt_modifierId
+            // 
+            this.txt_modifierId.Location = new System.Drawing.Point(81, 3);
+            this.txt_modifierId.Name = "txt_modifierId";
+            this.txt_modifierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
+            this.txt_modifierId.Size = new System.Drawing.Size(155, 28);
+            this.txt_modifierId.TabIndex = 312;
+            // 
+            // panel28
+            // 
+            this.panel28.Controls.Add(this.lb_createDate);
+            this.panel28.Controls.Add(this.txt_createDate);
+            this.panel28.Location = new System.Drawing.Point(263, 201);
+            this.panel28.Name = "panel28";
+            this.panel28.Size = new System.Drawing.Size(240, 34);
+            this.panel28.TabIndex = 451;
+            // 
+            // lb_createDate
+            // 
+            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_createDate.Appearance.Options.UseFont = true;
+            this.lb_createDate.Location = new System.Drawing.Point(6, 7);
+            this.lb_createDate.Name = "lb_createDate";
+            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_createDate.TabIndex = 309;
+            this.lb_createDate.Text = "鍒涘缓鏃ユ湡 ";
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(81, 3);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(155, 28);
+            this.txt_createDate.TabIndex = 310;
+            // 
+            // panel29
+            // 
+            this.panel29.Controls.Add(this.lb_creatorId);
+            this.panel29.Controls.Add(this.txt_creatorId);
+            this.panel29.Location = new System.Drawing.Point(8, 201);
+            this.panel29.Name = "panel29";
+            this.panel29.Size = new System.Drawing.Size(240, 34);
+            this.panel29.TabIndex = 449;
+            // 
+            // lb_creatorId
+            // 
+            this.lb_creatorId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_creatorId.Appearance.Options.UseFont = true;
+            this.lb_creatorId.Location = new System.Drawing.Point(3, 7);
+            this.lb_creatorId.Name = "lb_creatorId";
+            this.lb_creatorId.Size = new System.Drawing.Size(56, 21);
+            this.lb_creatorId.TabIndex = 307;
+            this.lb_creatorId.Text = "鍒涘缓浜� ";
+            // 
+            // txt_creatorId
+            // 
+            this.txt_creatorId.Location = new System.Drawing.Point(82, 3);
+            this.txt_creatorId.Name = "txt_creatorId";
+            this.txt_creatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
+            this.txt_creatorId.Size = new System.Drawing.Size(155, 28);
+            this.txt_creatorId.TabIndex = 308;
+            // 
+            // panel22
+            // 
+            this.panel22.Controls.Add(this.lb_linkPhone);
+            this.panel22.Controls.Add(this.txt_linkPhone);
+            this.panel22.Location = new System.Drawing.Point(769, 161);
+            this.panel22.Name = "panel22";
+            this.panel22.Size = new System.Drawing.Size(240, 34);
+            this.panel22.TabIndex = 446;
+            // 
+            // lb_linkPhone
+            // 
+            this.lb_linkPhone.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_linkPhone.Appearance.Options.UseFont = true;
+            this.lb_linkPhone.Location = new System.Drawing.Point(3, 7);
+            this.lb_linkPhone.Name = "lb_linkPhone";
+            this.lb_linkPhone.Size = new System.Drawing.Size(73, 21);
+            this.lb_linkPhone.TabIndex = 287;
+            this.lb_linkPhone.Text = "鑱旂郴鐢佃瘽 ";
+            // 
+            // txt_linkPhone
+            // 
+            this.txt_linkPhone.Location = new System.Drawing.Point(82, 3);
+            this.txt_linkPhone.Name = "txt_linkPhone";
+            this.txt_linkPhone.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
+            this.txt_linkPhone.Size = new System.Drawing.Size(155, 28);
+            this.txt_linkPhone.TabIndex = 288;
+            // 
+            // panel23
+            // 
+            this.panel23.Controls.Add(this.lb_chargeId);
+            this.panel23.Controls.Add(this.txt_chargeId);
+            this.panel23.Location = new System.Drawing.Point(512, 161);
+            this.panel23.Name = "panel23";
+            this.panel23.Size = new System.Drawing.Size(240, 34);
+            this.panel23.TabIndex = 448;
+            // 
+            // lb_chargeId
+            // 
+            this.lb_chargeId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_chargeId.Appearance.Options.UseFont = true;
+            this.lb_chargeId.Location = new System.Drawing.Point(5, 7);
+            this.lb_chargeId.Name = "lb_chargeId";
+            this.lb_chargeId.Size = new System.Drawing.Size(56, 21);
+            this.lb_chargeId.TabIndex = 285;
+            this.lb_chargeId.Text = "浠樻鏂� ";
+            // 
+            // txt_chargeId
+            // 
+            this.txt_chargeId.Location = new System.Drawing.Point(81, 3);
+            this.txt_chargeId.Name = "txt_chargeId";
+            this.txt_chargeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
+            this.txt_chargeId.Size = new System.Drawing.Size(155, 28);
+            this.txt_chargeId.TabIndex = 286;
+            // 
+            // panel24
+            // 
+            this.panel24.Controls.Add(this.lb_linkMan);
+            this.panel24.Controls.Add(this.txt_linkMan);
+            this.panel24.Location = new System.Drawing.Point(263, 161);
+            this.panel24.Name = "panel24";
+            this.panel24.Size = new System.Drawing.Size(240, 34);
+            this.panel24.TabIndex = 447;
+            // 
+            // lb_linkMan
+            // 
+            this.lb_linkMan.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_linkMan.Appearance.Options.UseFont = true;
+            this.lb_linkMan.Location = new System.Drawing.Point(6, 7);
+            this.lb_linkMan.Name = "lb_linkMan";
+            this.lb_linkMan.Size = new System.Drawing.Size(90, 21);
+            this.lb_linkMan.TabIndex = 283;
+            this.lb_linkMan.Text = "鏀惰揣浜哄鍚� ";
+            // 
+            // txt_linkMan
+            // 
+            this.txt_linkMan.Location = new System.Drawing.Point(81, 3);
+            this.txt_linkMan.Name = "txt_linkMan";
+            this.txt_linkMan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
+            this.txt_linkMan.Size = new System.Drawing.Size(155, 28);
+            this.txt_linkMan.TabIndex = 284;
+            // 
+            // panel25
+            // 
+            this.panel25.Controls.Add(this.lb_approverId);
+            this.panel25.Controls.Add(this.txt_approverId);
+            this.panel25.Location = new System.Drawing.Point(8, 161);
+            this.panel25.Name = "panel25";
+            this.panel25.Size = new System.Drawing.Size(240, 34);
+            this.panel25.TabIndex = 445;
+            // 
+            // lb_approverId
+            // 
+            this.lb_approverId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_approverId.Appearance.Options.UseFont = true;
+            this.lb_approverId.Location = new System.Drawing.Point(3, 7);
+            this.lb_approverId.Name = "lb_approverId";
+            this.lb_approverId.Size = new System.Drawing.Size(56, 21);
+            this.lb_approverId.TabIndex = 281;
+            this.lb_approverId.Text = "瀹℃牳浜� ";
+            // 
+            // txt_approverId
+            // 
+            this.txt_approverId.Location = new System.Drawing.Point(82, 3);
+            this.txt_approverId.Name = "txt_approverId";
+            this.txt_approverId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_approverId.Properties.Appearance.Options.UseFont = true;
+            this.txt_approverId.Size = new System.Drawing.Size(155, 28);
+            this.txt_approverId.TabIndex = 282;
+            // 
+            // panel21
+            // 
+            this.panel21.Controls.Add(this.lb_settleId);
+            this.panel21.Controls.Add(this.txt_settleId);
+            this.panel21.Location = new System.Drawing.Point(769, 121);
+            this.panel21.Name = "panel21";
+            this.panel21.Size = new System.Drawing.Size(240, 34);
+            this.panel21.TabIndex = 443;
+            // 
+            // lb_settleId
+            // 
+            this.lb_settleId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_settleId.Appearance.Options.UseFont = true;
+            this.lb_settleId.Location = new System.Drawing.Point(3, 7);
+            this.lb_settleId.Name = "lb_settleId";
+            this.lb_settleId.Size = new System.Drawing.Size(56, 21);
+            this.lb_settleId.TabIndex = 263;
+            this.lb_settleId.Text = "缁撶畻鏂� ";
+            // 
+            // txt_settleId
+            // 
+            this.txt_settleId.Location = new System.Drawing.Point(82, 3);
+            this.txt_settleId.Name = "txt_settleId";
+            this.txt_settleId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_settleId.Properties.Appearance.Options.UseFont = true;
+            this.txt_settleId.Size = new System.Drawing.Size(155, 28);
+            this.txt_settleId.TabIndex = 264;
+            // 
+            // panel20
+            // 
+            this.panel20.Controls.Add(this.txt_note);
+            this.panel20.Controls.Add(this.lb_note);
+            this.panel20.Location = new System.Drawing.Point(512, 121);
+            this.panel20.Name = "panel20";
+            this.panel20.Size = new System.Drawing.Size(240, 34);
+            this.panel20.TabIndex = 444;
+            // 
+            // txt_note
+            // 
+            this.txt_note.Location = new System.Drawing.Point(81, 3);
+            this.txt_note.Name = "txt_note";
+            this.txt_note.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_note.Properties.Appearance.Options.UseFont = true;
+            this.txt_note.Size = new System.Drawing.Size(155, 28);
+            this.txt_note.TabIndex = 262;
+            // 
+            // lb_note
+            // 
+            this.lb_note.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_note.Appearance.Options.UseFont = true;
+            this.lb_note.Location = new System.Drawing.Point(5, 7);
+            this.lb_note.Name = "lb_note";
+            this.lb_note.Size = new System.Drawing.Size(39, 21);
+            this.lb_note.TabIndex = 261;
+            this.lb_note.Text = "澶囨敞 ";
+            // 
+            // panel19
+            // 
+            this.panel19.Controls.Add(this.lb_changeReason);
+            this.panel19.Controls.Add(this.txt_changeReason);
+            this.panel19.Location = new System.Drawing.Point(263, 121);
+            this.panel19.Name = "panel19";
+            this.panel19.Size = new System.Drawing.Size(240, 34);
+            this.panel19.TabIndex = 442;
+            // 
+            // lb_changeReason
+            // 
+            this.lb_changeReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_changeReason.Appearance.Options.UseFont = true;
+            this.lb_changeReason.Location = new System.Drawing.Point(6, 7);
+            this.lb_changeReason.Name = "lb_changeReason";
+            this.lb_changeReason.Size = new System.Drawing.Size(73, 21);
+            this.lb_changeReason.TabIndex = 259;
+            this.lb_changeReason.Text = "鍙樻洿鍘熷洜 ";
+            // 
+            // txt_changeReason
+            // 
+            this.txt_changeReason.Location = new System.Drawing.Point(81, 3);
+            this.txt_changeReason.Name = "txt_changeReason";
+            this.txt_changeReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
+            this.txt_changeReason.Size = new System.Drawing.Size(155, 28);
+            this.txt_changeReason.TabIndex = 260;
+            // 
+            // panel18
+            // 
+            this.panel18.Controls.Add(this.lb_salerId);
+            this.panel18.Controls.Add(this.txt_salerId);
+            this.panel18.Location = new System.Drawing.Point(8, 121);
+            this.panel18.Name = "panel18";
+            this.panel18.Size = new System.Drawing.Size(240, 34);
+            this.panel18.TabIndex = 441;
+            // 
+            // lb_salerId
+            // 
+            this.lb_salerId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_salerId.Appearance.Options.UseFont = true;
+            this.lb_salerId.Location = new System.Drawing.Point(3, 7);
+            this.lb_salerId.Name = "lb_salerId";
+            this.lb_salerId.Size = new System.Drawing.Size(56, 21);
+            this.lb_salerId.TabIndex = 244;
+            this.lb_salerId.Text = "閿�鍞憳 ";
+            // 
+            // txt_salerId
+            // 
+            this.txt_salerId.Location = new System.Drawing.Point(82, 3);
+            this.txt_salerId.Name = "txt_salerId";
+            this.txt_salerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_salerId.Properties.Appearance.Options.UseFont = true;
+            this.txt_salerId.Size = new System.Drawing.Size(155, 28);
+            this.txt_salerId.TabIndex = 245;
+            // 
+            // panel14
+            // 
+            this.panel14.Controls.Add(this.lb_custId);
+            this.panel14.Controls.Add(this.txt_custId);
+            this.panel14.Location = new System.Drawing.Point(263, 84);
+            this.panel14.Name = "panel14";
+            this.panel14.Size = new System.Drawing.Size(240, 34);
+            this.panel14.TabIndex = 440;
+            // 
+            // lb_custId
+            // 
+            this.lb_custId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_custId.Appearance.Options.UseFont = true;
+            this.lb_custId.Location = new System.Drawing.Point(6, 7);
+            this.lb_custId.Name = "lb_custId";
+            this.lb_custId.Size = new System.Drawing.Size(39, 21);
+            this.lb_custId.TabIndex = 243;
+            this.lb_custId.Text = "瀹㈡埛 ";
+            // 
+            // txt_custId
+            // 
+            this.txt_custId.Location = new System.Drawing.Point(81, 3);
+            this.txt_custId.Name = "txt_custId";
+            this.txt_custId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_custId.Properties.Appearance.Options.UseFont = true;
+            this.txt_custId.Size = new System.Drawing.Size(155, 28);
+            this.txt_custId.TabIndex = 244;
+            // 
+            // panel15
+            // 
+            this.panel15.Controls.Add(this.lb_saleDeptId);
+            this.panel15.Controls.Add(this.txt_saleDeptId);
+            this.panel15.Location = new System.Drawing.Point(769, 84);
+            this.panel15.Name = "panel15";
+            this.panel15.Size = new System.Drawing.Size(240, 34);
+            this.panel15.TabIndex = 438;
+            // 
+            // lb_saleDeptId
+            // 
+            this.lb_saleDeptId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_saleDeptId.Appearance.Options.UseFont = true;
+            this.lb_saleDeptId.Location = new System.Drawing.Point(3, 7);
+            this.lb_saleDeptId.Name = "lb_saleDeptId";
+            this.lb_saleDeptId.Size = new System.Drawing.Size(73, 21);
+            this.lb_saleDeptId.TabIndex = 247;
+            this.lb_saleDeptId.Text = "閿�鍞儴闂� ";
+            // 
+            // txt_saleDeptId
+            // 
+            this.txt_saleDeptId.Location = new System.Drawing.Point(82, 3);
+            this.txt_saleDeptId.Name = "txt_saleDeptId";
+            this.txt_saleDeptId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_saleDeptId.Properties.Appearance.Options.UseFont = true;
+            this.txt_saleDeptId.Size = new System.Drawing.Size(155, 28);
+            this.txt_saleDeptId.TabIndex = 248;
+            // 
+            // panel16
+            // 
+            this.panel16.Controls.Add(this.lb_closeStatus);
+            this.panel16.Controls.Add(this.txt_closeStatus);
+            this.panel16.Location = new System.Drawing.Point(512, 84);
+            this.panel16.Name = "panel16";
+            this.panel16.Size = new System.Drawing.Size(240, 34);
+            this.panel16.TabIndex = 439;
+            // 
+            // 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(5, 7);
+            this.lb_closeStatus.Name = "lb_closeStatus";
+            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_closeStatus.TabIndex = 245;
+            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
+            // 
+            // txt_closeStatus
+            // 
+            this.txt_closeStatus.Location = new System.Drawing.Point(81, 3);
+            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(155, 28);
+            this.txt_closeStatus.TabIndex = 246;
+            // 
+            // panel17
+            // 
+            this.panel17.Controls.Add(this.lb_headLocId);
+            this.panel17.Controls.Add(this.txt_headLocId);
+            this.panel17.Location = new System.Drawing.Point(8, 84);
+            this.panel17.Name = "panel17";
+            this.panel17.Size = new System.Drawing.Size(240, 34);
+            this.panel17.TabIndex = 437;
+            // 
+            // lb_headLocId
+            // 
+            this.lb_headLocId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_headLocId.Appearance.Options.UseFont = true;
+            this.lb_headLocId.Location = new System.Drawing.Point(3, 7);
+            this.lb_headLocId.Name = "lb_headLocId";
+            this.lb_headLocId.Size = new System.Drawing.Size(73, 21);
+            this.lb_headLocId.TabIndex = 241;
+            this.lb_headLocId.Text = "浜よ揣鍦扮偣 ";
+            // 
+            // txt_headLocId
+            // 
+            this.txt_headLocId.Location = new System.Drawing.Point(82, 3);
+            this.txt_headLocId.Name = "txt_headLocId";
+            this.txt_headLocId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
+            this.txt_headLocId.Size = new System.Drawing.Size(155, 28);
+            this.txt_headLocId.TabIndex = 242;
+            // 
+            // panel10
+            // 
+            this.panel10.Controls.Add(this.lb_fDate);
+            this.panel10.Controls.Add(this.txt_fDate);
+            this.panel10.Location = new System.Drawing.Point(263, 47);
+            this.panel10.Name = "panel10";
+            this.panel10.Size = new System.Drawing.Size(240, 34);
+            this.panel10.TabIndex = 436;
+            // 
+            // lb_fDate
+            // 
+            this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_fDate.Appearance.Options.UseFont = true;
+            this.lb_fDate.Location = new System.Drawing.Point(6, 7);
+            this.lb_fDate.Name = "lb_fDate";
+            this.lb_fDate.Size = new System.Drawing.Size(39, 21);
+            this.lb_fDate.TabIndex = 229;
+            this.lb_fDate.Text = "鏃ユ湡 ";
+            // 
+            // txt_fDate
+            // 
+            this.txt_fDate.Location = new System.Drawing.Point(81, 3);
+            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;
+            this.txt_fDate.Size = new System.Drawing.Size(155, 28);
+            this.txt_fDate.TabIndex = 230;
+            // 
+            // panel11
+            // 
+            this.panel11.Controls.Add(this.lb_headDeliveryWay);
+            this.panel11.Controls.Add(this.txt_headDeliveryWay);
+            this.panel11.Location = new System.Drawing.Point(769, 47);
+            this.panel11.Name = "panel11";
+            this.panel11.Size = new System.Drawing.Size(240, 34);
+            this.panel11.TabIndex = 434;
+            // 
+            // lb_headDeliveryWay
+            // 
+            this.lb_headDeliveryWay.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_headDeliveryWay.Appearance.Options.UseFont = true;
+            this.lb_headDeliveryWay.Location = new System.Drawing.Point(3, 7);
+            this.lb_headDeliveryWay.Name = "lb_headDeliveryWay";
+            this.lb_headDeliveryWay.Size = new System.Drawing.Size(73, 21);
+            this.lb_headDeliveryWay.TabIndex = 233;
+            this.lb_headDeliveryWay.Text = "浜よ揣鏂瑰紡 ";
+            // 
+            // txt_headDeliveryWay
+            // 
+            this.txt_headDeliveryWay.Location = new System.Drawing.Point(82, 3);
+            this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
+            this.txt_headDeliveryWay.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
+            this.txt_headDeliveryWay.Size = new System.Drawing.Size(155, 28);
+            this.txt_headDeliveryWay.TabIndex = 234;
+            // 
+            // panel12
+            // 
+            this.panel12.Controls.Add(this.lb_businessType);
+            this.panel12.Controls.Add(this.txt_businessType);
+            this.panel12.Location = new System.Drawing.Point(512, 47);
+            this.panel12.Name = "panel12";
+            this.panel12.Size = new System.Drawing.Size(240, 34);
+            this.panel12.TabIndex = 435;
+            // 
+            // lb_businessType
+            // 
+            this.lb_businessType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_businessType.Appearance.Options.UseFont = true;
+            this.lb_businessType.Location = new System.Drawing.Point(5, 7);
+            this.lb_businessType.Name = "lb_businessType";
+            this.lb_businessType.Size = new System.Drawing.Size(73, 21);
+            this.lb_businessType.TabIndex = 231;
+            this.lb_businessType.Text = "涓氬姟绫诲瀷 ";
+            // 
+            // txt_businessType
+            // 
+            this.txt_businessType.Location = new System.Drawing.Point(81, 3);
+            this.txt_businessType.Name = "txt_businessType";
+            this.txt_businessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_businessType.Properties.Appearance.Options.UseFont = true;
+            this.txt_businessType.Size = new System.Drawing.Size(155, 28);
+            this.txt_businessType.TabIndex = 232;
+            // 
+            // panel13
+            // 
+            this.panel13.Controls.Add(this.lb_documentStatus);
+            this.panel13.Controls.Add(this.txt_documentStatus);
+            this.panel13.Location = new System.Drawing.Point(8, 47);
+            this.panel13.Name = "panel13";
+            this.panel13.Size = new System.Drawing.Size(240, 34);
+            this.panel13.TabIndex = 433;
+            // 
+            // lb_documentStatus
+            // 
+            this.lb_documentStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_documentStatus.Appearance.Options.UseFont = true;
+            this.lb_documentStatus.Location = new System.Drawing.Point(3, 7);
+            this.lb_documentStatus.Name = "lb_documentStatus";
+            this.lb_documentStatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_documentStatus.TabIndex = 227;
+            this.lb_documentStatus.Text = "鍗曟嵁鐘舵�� ";
+            // 
+            // txt_documentStatus
+            // 
+            this.txt_documentStatus.Location = new System.Drawing.Point(82, 3);
+            this.txt_documentStatus.Name = "txt_documentStatus";
+            this.txt_documentStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_documentStatus.Properties.Appearance.Options.UseFont = true;
+            this.txt_documentStatus.Size = new System.Drawing.Size(155, 28);
+            this.txt_documentStatus.TabIndex = 228;
             // 
             // panel4
             // 
             this.panel4.Controls.Add(this.lb_id);
             this.panel4.Controls.Add(this.txt_id);
-            this.panel4.Location = new System.Drawing.Point(11, 13);
+            this.panel4.Location = new System.Drawing.Point(8, 11);
+            this.panel4.Margin = new System.Windows.Forms.Padding(0);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(240, 40);
-            this.panel4.TabIndex = 3;
+            this.panel4.Size = new System.Drawing.Size(240, 34);
+            this.panel4.TabIndex = 430;
             // 
             // lb_id
             // 
             this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_id.Appearance.Options.UseFont = true;
-            this.lb_id.Location = new System.Drawing.Point(15, 10);
+            this.lb_id.Location = new System.Drawing.Point(3, 7);
             this.lb_id.Name = "lb_id";
-            this.lb_id.Size = new System.Drawing.Size(18, 21);
+            this.lb_id.Size = new System.Drawing.Size(74, 21);
             this.lb_id.TabIndex = 211;
-            this.lb_id.Text = "id ";
+            this.lb_id.Text = "涓婚敭GUID";
             // 
             // txt_id
             // 
-            this.txt_id.Location = new System.Drawing.Point(75, 6);
+            this.txt_id.Location = new System.Drawing.Point(82, 3);
+            this.txt_id.Margin = new System.Windows.Forms.Padding(0);
             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;
@@ -2183,24 +2003,24 @@
             // 
             this.panel5.Controls.Add(this.lb_erpId);
             this.panel5.Controls.Add(this.txt_erpId);
-            this.panel5.Location = new System.Drawing.Point(267, 13);
+            this.panel5.Location = new System.Drawing.Point(263, 11);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(240, 40);
-            this.panel5.TabIndex = 3;
+            this.panel5.Size = new System.Drawing.Size(240, 34);
+            this.panel5.TabIndex = 432;
             // 
             // 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(15, 10);
+            this.lb_erpId.Location = new System.Drawing.Point(6, 7);
             this.lb_erpId.Name = "lb_erpId";
-            this.lb_erpId.Size = new System.Drawing.Size(51, 21);
+            this.lb_erpId.Size = new System.Drawing.Size(48, 21);
             this.lb_erpId.TabIndex = 212;
-            this.lb_erpId.Text = "erp_id ";
+            this.lb_erpId.Text = "ERPID";
             // 
             // txt_erpId
             // 
-            this.txt_erpId.Location = new System.Drawing.Point(81, 6);
+            this.txt_erpId.Location = new System.Drawing.Point(81, 3);
             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;
@@ -2211,16 +2031,16 @@
             // 
             this.panel3.Controls.Add(this.lb_billTypeId);
             this.panel3.Controls.Add(this.txt_billTypeId);
-            this.panel3.Location = new System.Drawing.Point(767, 13);
+            this.panel3.Location = new System.Drawing.Point(769, 11);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(240, 40);
-            this.panel3.TabIndex = 3;
+            this.panel3.Size = new System.Drawing.Size(240, 34);
+            this.panel3.TabIndex = 431;
             // 
             // lb_billTypeId
             // 
             this.lb_billTypeId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billTypeId.Appearance.Options.UseFont = true;
-            this.lb_billTypeId.Location = new System.Drawing.Point(3, 10);
+            this.lb_billTypeId.Location = new System.Drawing.Point(3, 7);
             this.lb_billTypeId.Name = "lb_billTypeId";
             this.lb_billTypeId.Size = new System.Drawing.Size(73, 21);
             this.lb_billTypeId.TabIndex = 217;
@@ -2228,7 +2048,7 @@
             // 
             // txt_billTypeId
             // 
-            this.txt_billTypeId.Location = new System.Drawing.Point(82, 6);
+            this.txt_billTypeId.Location = new System.Drawing.Point(82, 3);
             this.txt_billTypeId.Name = "txt_billTypeId";
             this.txt_billTypeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
@@ -2239,16 +2059,16 @@
             // 
             this.panel2.Controls.Add(this.lb_billNo);
             this.panel2.Controls.Add(this.txt_billNo);
-            this.panel2.Location = new System.Drawing.Point(517, 13);
+            this.panel2.Location = new System.Drawing.Point(512, 11);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(240, 40);
-            this.panel2.TabIndex = 2;
+            this.panel2.Size = new System.Drawing.Size(240, 34);
+            this.panel2.TabIndex = 429;
             // 
             // lb_billNo
             // 
             this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(8, 10);
+            this.lb_billNo.Location = new System.Drawing.Point(5, 7);
             this.lb_billNo.Name = "lb_billNo";
             this.lb_billNo.Size = new System.Drawing.Size(73, 21);
             this.lb_billNo.TabIndex = 214;
@@ -2256,12 +2076,625 @@
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(81, 6);
+            this.txt_billNo.Location = new System.Drawing.Point(81, 3);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
             this.txt_billNo.Size = new System.Drawing.Size(155, 28);
             this.txt_billNo.TabIndex = 215;
+            // 
+            // tabMx
+            // 
+            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(1126, 165);
+            this.tabMx.TabIndex = 3;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage1});
+            // 
+            // tabMxPage1
+            // 
+            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Name = "tabMxPage1";
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 133);
+            this.tabMxPage1.Text = "閿�鍞槑缁�";
+            // 
+            // gcMx1
+            // 
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.Size = new System.Drawing.Size(1124, 133);
+            this.gcMx1.TabIndex = 0;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1id,
+            this.gvMx1pid,
+            this.gvMx1erpId,
+            this.gvMx1materialId,
+            this.gvMx1unitId,
+            this.gvMx1qty,
+            this.gvMx1priceUnitId,
+            this.gvMx1priceUnitQty,
+            this.gvMx1deliveryDate,
+            this.gvMx1isFree,
+            this.gvMx1ownerTypeId,
+            this.gvMx1ownerId,
+            this.gvMx1entryNote,
+            this.gvMx1mtoNo,
+            this.gvMx1lot,
+            this.gvMx1deliveryMaxQty,
+            this.gvMx1deliveryMinQty,
+            this.gvMx1outLmtUnitId,
+            this.gvMx1mrpCloseStatus,
+            this.gvMx1mrpTerminateStatus,
+            this.gvMx1terminateDate,
+            this.gvMx1terminaterId,
+            this.gvMx1srcType,
+            this.gvMx1srcBillNo,
+            this.gvMx1deliQty,
+            this.gvMx1stockOutQty,
+            this.gvMx1baseRetNoticeQty,
+            this.gvMx1baseReturnQty,
+            this.gvMx1baseRemainOutQty,
+            this.gvMx1basearqty,
+            this.gvMx1custIno,
+            this.gvMx1custInm,
+            this.gvMx1custImd,
+            this.gvMx1mapId,
+            this.gvMx1mapName,
+            this.gvMx1mapSpec,
+            this.gvMx1seq,
+            this.gvMx1supplyOrgId,
+            this.gvMx1stockOrgId,
+            this.gvMx1settleOrgIds,
+            this.gvMx1eHid});
+            this.gvMx1.GridControl = this.gcMx1;
+            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;
+            // 
+            // gvMx1id
+            // 
+            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1id.AppearanceCell.Options.UseFont = true;
+            this.gvMx1id.Caption = "id ";
+            this.gvMx1id.FieldName = "id";
+            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.Name = "gvMx1id";
+            this.gvMx1id.Tag = "query_a.id";
+            this.gvMx1id.Visible = true;
+            this.gvMx1id.VisibleIndex = 0;
+            this.gvMx1id.Width = 94;
+            // 
+            // gvMx1pid
+            // 
+            this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1pid.Caption = "pid ";
+            this.gvMx1pid.FieldName = "pid";
+            this.gvMx1pid.MinWidth = 50;
+            this.gvMx1pid.Name = "gvMx1pid";
+            this.gvMx1pid.Tag = "query_a.pid";
+            this.gvMx1pid.Visible = true;
+            this.gvMx1pid.VisibleIndex = 1;
+            this.gvMx1pid.Width = 94;
+            // 
+            // gvMx1erpId
+            // 
+            this.gvMx1erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1erpId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1erpId.Caption = "erp_id ";
+            this.gvMx1erpId.FieldName = "erpId";
+            this.gvMx1erpId.MinWidth = 50;
+            this.gvMx1erpId.Name = "gvMx1erpId";
+            this.gvMx1erpId.Tag = "query_a.erp_id";
+            this.gvMx1erpId.Visible = true;
+            this.gvMx1erpId.VisibleIndex = 2;
+            this.gvMx1erpId.Width = 94;
+            // 
+            // gvMx1materialId
+            // 
+            this.gvMx1materialId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1materialId.Caption = "鐗╂枡缂栫爜 ";
+            this.gvMx1materialId.FieldName = "materialId";
+            this.gvMx1materialId.MinWidth = 50;
+            this.gvMx1materialId.Name = "gvMx1materialId";
+            this.gvMx1materialId.Tag = "query_a.material_id";
+            this.gvMx1materialId.Visible = true;
+            this.gvMx1materialId.VisibleIndex = 3;
+            this.gvMx1materialId.Width = 94;
+            // 
+            // gvMx1unitId
+            // 
+            this.gvMx1unitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1unitId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1unitId.Caption = "閿�鍞崟浣� ";
+            this.gvMx1unitId.FieldName = "unitId";
+            this.gvMx1unitId.MinWidth = 50;
+            this.gvMx1unitId.Name = "gvMx1unitId";
+            this.gvMx1unitId.Tag = "query_a.unit_id";
+            this.gvMx1unitId.Visible = true;
+            this.gvMx1unitId.VisibleIndex = 4;
+            this.gvMx1unitId.Width = 94;
+            // 
+            // gvMx1qty
+            // 
+            this.gvMx1qty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1qty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1qty.Caption = "閿�鍞暟閲� ";
+            this.gvMx1qty.FieldName = "qty";
+            this.gvMx1qty.MinWidth = 50;
+            this.gvMx1qty.Name = "gvMx1qty";
+            this.gvMx1qty.Tag = "query_a.qty";
+            this.gvMx1qty.Visible = true;
+            this.gvMx1qty.VisibleIndex = 5;
+            this.gvMx1qty.Width = 94;
+            // 
+            // gvMx1priceUnitId
+            // 
+            this.gvMx1priceUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1priceUnitId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1priceUnitId.Caption = "璁′环鍗曚綅 ";
+            this.gvMx1priceUnitId.FieldName = "priceUnitId";
+            this.gvMx1priceUnitId.MinWidth = 50;
+            this.gvMx1priceUnitId.Name = "gvMx1priceUnitId";
+            this.gvMx1priceUnitId.Tag = "query_a.price_unit_id";
+            this.gvMx1priceUnitId.Visible = true;
+            this.gvMx1priceUnitId.VisibleIndex = 6;
+            this.gvMx1priceUnitId.Width = 94;
+            // 
+            // gvMx1priceUnitQty
+            // 
+            this.gvMx1priceUnitQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1priceUnitQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1priceUnitQty.Caption = "璁′环鏁伴噺 ";
+            this.gvMx1priceUnitQty.FieldName = "priceUnitQty";
+            this.gvMx1priceUnitQty.MinWidth = 50;
+            this.gvMx1priceUnitQty.Name = "gvMx1priceUnitQty";
+            this.gvMx1priceUnitQty.Tag = "query_a.price_unit_qty";
+            this.gvMx1priceUnitQty.Visible = true;
+            this.gvMx1priceUnitQty.VisibleIndex = 7;
+            this.gvMx1priceUnitQty.Width = 94;
+            // 
+            // gvMx1deliveryDate
+            // 
+            this.gvMx1deliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1deliveryDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1deliveryDate.Caption = "瑕佽揣鏃ユ湡 ";
+            this.gvMx1deliveryDate.FieldName = "deliveryDate";
+            this.gvMx1deliveryDate.MinWidth = 50;
+            this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
+            this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
+            this.gvMx1deliveryDate.Visible = true;
+            this.gvMx1deliveryDate.VisibleIndex = 8;
+            this.gvMx1deliveryDate.Width = 94;
+            // 
+            // gvMx1isFree
+            // 
+            this.gvMx1isFree.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
+            this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
+            this.gvMx1isFree.FieldName = "isFree";
+            this.gvMx1isFree.MinWidth = 50;
+            this.gvMx1isFree.Name = "gvMx1isFree";
+            this.gvMx1isFree.Tag = "query_a.is_free";
+            this.gvMx1isFree.Visible = true;
+            this.gvMx1isFree.VisibleIndex = 9;
+            this.gvMx1isFree.Width = 94;
+            // 
+            // gvMx1ownerTypeId
+            // 
+            this.gvMx1ownerTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1ownerTypeId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1ownerTypeId.Caption = "璐т富绫诲瀷 ";
+            this.gvMx1ownerTypeId.FieldName = "ownerTypeId";
+            this.gvMx1ownerTypeId.MinWidth = 50;
+            this.gvMx1ownerTypeId.Name = "gvMx1ownerTypeId";
+            this.gvMx1ownerTypeId.Tag = "query_a.owner_type_id";
+            this.gvMx1ownerTypeId.Visible = true;
+            this.gvMx1ownerTypeId.VisibleIndex = 10;
+            this.gvMx1ownerTypeId.Width = 94;
+            // 
+            // gvMx1ownerId
+            // 
+            this.gvMx1ownerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1ownerId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1ownerId.Caption = "璐т富 ";
+            this.gvMx1ownerId.FieldName = "ownerId";
+            this.gvMx1ownerId.MinWidth = 50;
+            this.gvMx1ownerId.Name = "gvMx1ownerId";
+            this.gvMx1ownerId.Tag = "query_a.owner_id";
+            this.gvMx1ownerId.Visible = true;
+            this.gvMx1ownerId.VisibleIndex = 11;
+            this.gvMx1ownerId.Width = 94;
+            // 
+            // gvMx1entryNote
+            // 
+            this.gvMx1entryNote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1entryNote.AppearanceCell.Options.UseFont = true;
+            this.gvMx1entryNote.Caption = "澶囨敞 ";
+            this.gvMx1entryNote.FieldName = "entryNote";
+            this.gvMx1entryNote.MinWidth = 50;
+            this.gvMx1entryNote.Name = "gvMx1entryNote";
+            this.gvMx1entryNote.Tag = "query_a.entry_note";
+            this.gvMx1entryNote.Visible = true;
+            this.gvMx1entryNote.VisibleIndex = 12;
+            this.gvMx1entryNote.Width = 94;
+            // 
+            // gvMx1mtoNo
+            // 
+            this.gvMx1mtoNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mtoNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mtoNo.Caption = "璁″垝璺熻釜鍙� ";
+            this.gvMx1mtoNo.FieldName = "mtoNo";
+            this.gvMx1mtoNo.MinWidth = 50;
+            this.gvMx1mtoNo.Name = "gvMx1mtoNo";
+            this.gvMx1mtoNo.Tag = "query_a.mto_no";
+            this.gvMx1mtoNo.Visible = true;
+            this.gvMx1mtoNo.VisibleIndex = 13;
+            this.gvMx1mtoNo.Width = 94;
+            // 
+            // gvMx1lot
+            // 
+            this.gvMx1lot.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1lot.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lot.Caption = "鎵瑰彿 ";
+            this.gvMx1lot.FieldName = "lot";
+            this.gvMx1lot.MinWidth = 50;
+            this.gvMx1lot.Name = "gvMx1lot";
+            this.gvMx1lot.Tag = "query_a.lot";
+            this.gvMx1lot.Visible = true;
+            this.gvMx1lot.VisibleIndex = 14;
+            this.gvMx1lot.Width = 94;
+            // 
+            // gvMx1deliveryMaxQty
+            // 
+            this.gvMx1deliveryMaxQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1deliveryMaxQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1deliveryMaxQty.Caption = "鍙戣揣涓婇檺 ";
+            this.gvMx1deliveryMaxQty.FieldName = "deliveryMaxQty";
+            this.gvMx1deliveryMaxQty.MinWidth = 50;
+            this.gvMx1deliveryMaxQty.Name = "gvMx1deliveryMaxQty";
+            this.gvMx1deliveryMaxQty.Tag = "query_a.delivery_max_qty";
+            this.gvMx1deliveryMaxQty.Visible = true;
+            this.gvMx1deliveryMaxQty.VisibleIndex = 15;
+            this.gvMx1deliveryMaxQty.Width = 94;
+            // 
+            // gvMx1deliveryMinQty
+            // 
+            this.gvMx1deliveryMinQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1deliveryMinQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1deliveryMinQty.Caption = "鍙戣揣涓嬮檺 ";
+            this.gvMx1deliveryMinQty.FieldName = "deliveryMinQty";
+            this.gvMx1deliveryMinQty.MinWidth = 50;
+            this.gvMx1deliveryMinQty.Name = "gvMx1deliveryMinQty";
+            this.gvMx1deliveryMinQty.Tag = "query_a.delivery_min_qty";
+            this.gvMx1deliveryMinQty.Visible = true;
+            this.gvMx1deliveryMinQty.VisibleIndex = 16;
+            this.gvMx1deliveryMinQty.Width = 94;
+            // 
+            // gvMx1outLmtUnitId
+            // 
+            this.gvMx1outLmtUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1outLmtUnitId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1outLmtUnitId.Caption = "瓒呭彂鎺у埗鍗曚綅 ";
+            this.gvMx1outLmtUnitId.FieldName = "outLmtUnitId";
+            this.gvMx1outLmtUnitId.MinWidth = 50;
+            this.gvMx1outLmtUnitId.Name = "gvMx1outLmtUnitId";
+            this.gvMx1outLmtUnitId.Tag = "query_a.out_lmt_unit_id";
+            this.gvMx1outLmtUnitId.Visible = true;
+            this.gvMx1outLmtUnitId.VisibleIndex = 17;
+            this.gvMx1outLmtUnitId.Width = 94;
+            // 
+            // gvMx1mrpCloseStatus
+            // 
+            this.gvMx1mrpCloseStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mrpCloseStatus.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mrpCloseStatus.Caption = "涓氬姟鍏抽棴 ";
+            this.gvMx1mrpCloseStatus.FieldName = "mrpCloseStatus";
+            this.gvMx1mrpCloseStatus.MinWidth = 50;
+            this.gvMx1mrpCloseStatus.Name = "gvMx1mrpCloseStatus";
+            this.gvMx1mrpCloseStatus.Tag = "query_a.mrp_close_status";
+            this.gvMx1mrpCloseStatus.Visible = true;
+            this.gvMx1mrpCloseStatus.VisibleIndex = 18;
+            this.gvMx1mrpCloseStatus.Width = 94;
+            // 
+            // gvMx1mrpTerminateStatus
+            // 
+            this.gvMx1mrpTerminateStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mrpTerminateStatus.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mrpTerminateStatus.Caption = "涓氬姟缁堟 ";
+            this.gvMx1mrpTerminateStatus.FieldName = "mrpTerminateStatus";
+            this.gvMx1mrpTerminateStatus.MinWidth = 50;
+            this.gvMx1mrpTerminateStatus.Name = "gvMx1mrpTerminateStatus";
+            this.gvMx1mrpTerminateStatus.Tag = "query_a.mrp_terminate_status";
+            this.gvMx1mrpTerminateStatus.Visible = true;
+            this.gvMx1mrpTerminateStatus.VisibleIndex = 19;
+            this.gvMx1mrpTerminateStatus.Width = 94;
+            // 
+            // gvMx1terminateDate
+            // 
+            this.gvMx1terminateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1terminateDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1terminateDate.Caption = "缁堟鏃ユ湡 ";
+            this.gvMx1terminateDate.FieldName = "terminateDate";
+            this.gvMx1terminateDate.MinWidth = 50;
+            this.gvMx1terminateDate.Name = "gvMx1terminateDate";
+            this.gvMx1terminateDate.Tag = "query_a.terminate_date";
+            this.gvMx1terminateDate.Visible = true;
+            this.gvMx1terminateDate.VisibleIndex = 20;
+            this.gvMx1terminateDate.Width = 94;
+            // 
+            // gvMx1terminaterId
+            // 
+            this.gvMx1terminaterId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1terminaterId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1terminaterId.Caption = "缁堟浜� ";
+            this.gvMx1terminaterId.FieldName = "terminaterId";
+            this.gvMx1terminaterId.MinWidth = 50;
+            this.gvMx1terminaterId.Name = "gvMx1terminaterId";
+            this.gvMx1terminaterId.Tag = "query_a.terminater_id";
+            this.gvMx1terminaterId.Visible = true;
+            this.gvMx1terminaterId.VisibleIndex = 21;
+            this.gvMx1terminaterId.Width = 94;
+            // 
+            // gvMx1srcType
+            // 
+            this.gvMx1srcType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1srcType.AppearanceCell.Options.UseFont = true;
+            this.gvMx1srcType.Caption = "婧愬崟绫诲瀷 ";
+            this.gvMx1srcType.FieldName = "srcType";
+            this.gvMx1srcType.MinWidth = 50;
+            this.gvMx1srcType.Name = "gvMx1srcType";
+            this.gvMx1srcType.Tag = "query_a.src_type";
+            this.gvMx1srcType.Visible = true;
+            this.gvMx1srcType.VisibleIndex = 22;
+            this.gvMx1srcType.Width = 94;
+            // 
+            // gvMx1srcBillNo
+            // 
+            this.gvMx1srcBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1srcBillNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1srcBillNo.Caption = "婧愬崟鍗曞彿 ";
+            this.gvMx1srcBillNo.FieldName = "srcBillNo";
+            this.gvMx1srcBillNo.MinWidth = 50;
+            this.gvMx1srcBillNo.Name = "gvMx1srcBillNo";
+            this.gvMx1srcBillNo.Tag = "query_a.src_bill_no";
+            this.gvMx1srcBillNo.Visible = true;
+            this.gvMx1srcBillNo.VisibleIndex = 23;
+            this.gvMx1srcBillNo.Width = 94;
+            // 
+            // gvMx1deliQty
+            // 
+            this.gvMx1deliQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1deliQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1deliQty.Caption = "绱鍙戣揣閫氱煡鏁伴噺 ";
+            this.gvMx1deliQty.FieldName = "deliQty";
+            this.gvMx1deliQty.MinWidth = 50;
+            this.gvMx1deliQty.Name = "gvMx1deliQty";
+            this.gvMx1deliQty.Tag = "query_a.deli_qty";
+            this.gvMx1deliQty.Visible = true;
+            this.gvMx1deliQty.VisibleIndex = 24;
+            this.gvMx1deliQty.Width = 94;
+            // 
+            // gvMx1stockOutQty
+            // 
+            this.gvMx1stockOutQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1stockOutQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1stockOutQty.Caption = "绱鍑哄簱鏁伴噺 ";
+            this.gvMx1stockOutQty.FieldName = "stockOutQty";
+            this.gvMx1stockOutQty.MinWidth = 50;
+            this.gvMx1stockOutQty.Name = "gvMx1stockOutQty";
+            this.gvMx1stockOutQty.Tag = "query_a.stock_out_qty";
+            this.gvMx1stockOutQty.Visible = true;
+            this.gvMx1stockOutQty.VisibleIndex = 25;
+            this.gvMx1stockOutQty.Width = 94;
+            // 
+            // gvMx1baseRetNoticeQty
+            // 
+            this.gvMx1baseRetNoticeQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1baseRetNoticeQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1baseRetNoticeQty.Caption = "绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級 ";
+            this.gvMx1baseRetNoticeQty.FieldName = "baseRetNoticeQty";
+            this.gvMx1baseRetNoticeQty.MinWidth = 50;
+            this.gvMx1baseRetNoticeQty.Name = "gvMx1baseRetNoticeQty";
+            this.gvMx1baseRetNoticeQty.Tag = "query_a.base_ret_notice_qty";
+            this.gvMx1baseRetNoticeQty.Visible = true;
+            this.gvMx1baseRetNoticeQty.VisibleIndex = 26;
+            this.gvMx1baseRetNoticeQty.Width = 94;
+            // 
+            // gvMx1baseReturnQty
+            // 
+            this.gvMx1baseReturnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1baseReturnQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲忥紙閿�鍞熀鏈級 ";
+            this.gvMx1baseReturnQty.FieldName = "baseReturnQty";
+            this.gvMx1baseReturnQty.MinWidth = 50;
+            this.gvMx1baseReturnQty.Name = "gvMx1baseReturnQty";
+            this.gvMx1baseReturnQty.Tag = "query_a.base_return_qty";
+            this.gvMx1baseReturnQty.Visible = true;
+            this.gvMx1baseReturnQty.VisibleIndex = 27;
+            this.gvMx1baseReturnQty.Width = 94;
+            // 
+            // gvMx1baseRemainOutQty
+            // 
+            this.gvMx1baseRemainOutQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1baseRemainOutQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1baseRemainOutQty.Caption = "鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級 ";
+            this.gvMx1baseRemainOutQty.FieldName = "baseRemainOutQty";
+            this.gvMx1baseRemainOutQty.MinWidth = 50;
+            this.gvMx1baseRemainOutQty.Name = "gvMx1baseRemainOutQty";
+            this.gvMx1baseRemainOutQty.Tag = "query_a.base_remain_out_qty";
+            this.gvMx1baseRemainOutQty.Visible = true;
+            this.gvMx1baseRemainOutQty.VisibleIndex = 28;
+            this.gvMx1baseRemainOutQty.Width = 94;
+            // 
+            // gvMx1basearqty
+            // 
+            this.gvMx1basearqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1basearqty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1basearqty.Caption = "绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級 ";
+            this.gvMx1basearqty.FieldName = "basearqty";
+            this.gvMx1basearqty.MinWidth = 50;
+            this.gvMx1basearqty.Name = "gvMx1basearqty";
+            this.gvMx1basearqty.Tag = "query_a.basearqty";
+            this.gvMx1basearqty.Visible = true;
+            this.gvMx1basearqty.VisibleIndex = 29;
+            this.gvMx1basearqty.Width = 94;
+            // 
+            // gvMx1custIno
+            // 
+            this.gvMx1custIno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1custIno.AppearanceCell.Options.UseFont = true;
+            this.gvMx1custIno.Caption = "瀹㈡埛鐗╂枡缂栫爜 ";
+            this.gvMx1custIno.FieldName = "custIno";
+            this.gvMx1custIno.MinWidth = 50;
+            this.gvMx1custIno.Name = "gvMx1custIno";
+            this.gvMx1custIno.Tag = "query_a.cust_ino";
+            this.gvMx1custIno.Visible = true;
+            this.gvMx1custIno.VisibleIndex = 30;
+            this.gvMx1custIno.Width = 94;
+            // 
+            // gvMx1custInm
+            // 
+            this.gvMx1custInm.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1custInm.AppearanceCell.Options.UseFont = true;
+            this.gvMx1custInm.Caption = "瀹㈡埛鐗╂枡鍚嶇О ";
+            this.gvMx1custInm.FieldName = "custInm";
+            this.gvMx1custInm.MinWidth = 50;
+            this.gvMx1custInm.Name = "gvMx1custInm";
+            this.gvMx1custInm.Tag = "query_a.cust_inm";
+            this.gvMx1custInm.Visible = true;
+            this.gvMx1custInm.VisibleIndex = 31;
+            this.gvMx1custInm.Width = 94;
+            // 
+            // gvMx1custImd
+            // 
+            this.gvMx1custImd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1custImd.AppearanceCell.Options.UseFont = true;
+            this.gvMx1custImd.Caption = "瀹㈡埛鐗╂枡瑙勬牸 ";
+            this.gvMx1custImd.FieldName = "custImd";
+            this.gvMx1custImd.MinWidth = 50;
+            this.gvMx1custImd.Name = "gvMx1custImd";
+            this.gvMx1custImd.Tag = "query_a.cust_imd";
+            this.gvMx1custImd.Visible = true;
+            this.gvMx1custImd.VisibleIndex = 32;
+            this.gvMx1custImd.Width = 94;
+            // 
+            // gvMx1mapId
+            // 
+            this.gvMx1mapId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mapId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mapId.Caption = "瀹㈡埛鐗╂枡缂栫爜 ";
+            this.gvMx1mapId.FieldName = "mapId";
+            this.gvMx1mapId.MinWidth = 50;
+            this.gvMx1mapId.Name = "gvMx1mapId";
+            this.gvMx1mapId.Tag = "query_a.MAP_ID";
+            this.gvMx1mapId.Visible = true;
+            this.gvMx1mapId.VisibleIndex = 33;
+            this.gvMx1mapId.Width = 94;
+            // 
+            // gvMx1mapName
+            // 
+            this.gvMx1mapName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mapName.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mapName.Caption = "瀹㈡埛鐗╂枡鍚嶇О ";
+            this.gvMx1mapName.FieldName = "mapName";
+            this.gvMx1mapName.MinWidth = 50;
+            this.gvMx1mapName.Name = "gvMx1mapName";
+            this.gvMx1mapName.Tag = "query_a.MAP_NAME";
+            this.gvMx1mapName.Visible = true;
+            this.gvMx1mapName.VisibleIndex = 34;
+            this.gvMx1mapName.Width = 94;
+            // 
+            // gvMx1mapSpec
+            // 
+            this.gvMx1mapSpec.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mapSpec.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mapSpec.Caption = "瀹㈡埛鐗╂枡瑙勬牸 ";
+            this.gvMx1mapSpec.FieldName = "mapSpec";
+            this.gvMx1mapSpec.MinWidth = 50;
+            this.gvMx1mapSpec.Name = "gvMx1mapSpec";
+            this.gvMx1mapSpec.Tag = "query_a.MAP_SPEC";
+            this.gvMx1mapSpec.Visible = true;
+            this.gvMx1mapSpec.VisibleIndex = 35;
+            this.gvMx1mapSpec.Width = 94;
+            // 
+            // gvMx1seq
+            // 
+            this.gvMx1seq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1seq.AppearanceCell.Options.UseFont = true;
+            this.gvMx1seq.Caption = "搴忓彿 ";
+            this.gvMx1seq.FieldName = "seq";
+            this.gvMx1seq.MinWidth = 50;
+            this.gvMx1seq.Name = "gvMx1seq";
+            this.gvMx1seq.Tag = "query_a.Seq";
+            this.gvMx1seq.Visible = true;
+            this.gvMx1seq.VisibleIndex = 36;
+            this.gvMx1seq.Width = 94;
+            // 
+            // gvMx1supplyOrgId
+            // 
+            this.gvMx1supplyOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1supplyOrgId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1supplyOrgId.Caption = "渚涘簲缁勭粐 ";
+            this.gvMx1supplyOrgId.FieldName = "supplyOrgId";
+            this.gvMx1supplyOrgId.MinWidth = 50;
+            this.gvMx1supplyOrgId.Name = "gvMx1supplyOrgId";
+            this.gvMx1supplyOrgId.Tag = "query_a.SUPPLY_ORG_ID";
+            this.gvMx1supplyOrgId.Visible = true;
+            this.gvMx1supplyOrgId.VisibleIndex = 37;
+            this.gvMx1supplyOrgId.Width = 94;
+            // 
+            // gvMx1stockOrgId
+            // 
+            this.gvMx1stockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1stockOrgId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1stockOrgId.Caption = "搴撳瓨缁勭粐 ";
+            this.gvMx1stockOrgId.FieldName = "stockOrgId";
+            this.gvMx1stockOrgId.MinWidth = 50;
+            this.gvMx1stockOrgId.Name = "gvMx1stockOrgId";
+            this.gvMx1stockOrgId.Tag = "query_a.STOCK_ORG_ID";
+            this.gvMx1stockOrgId.Visible = true;
+            this.gvMx1stockOrgId.VisibleIndex = 38;
+            this.gvMx1stockOrgId.Width = 94;
+            // 
+            // gvMx1settleOrgIds
+            // 
+            this.gvMx1settleOrgIds.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1settleOrgIds.AppearanceCell.Options.UseFont = true;
+            this.gvMx1settleOrgIds.Caption = "缁撶畻缁勭粐 ";
+            this.gvMx1settleOrgIds.FieldName = "settleOrgIds";
+            this.gvMx1settleOrgIds.MinWidth = 50;
+            this.gvMx1settleOrgIds.Name = "gvMx1settleOrgIds";
+            this.gvMx1settleOrgIds.Tag = "query_a.SETTLE_ORG_IDS";
+            this.gvMx1settleOrgIds.Visible = true;
+            this.gvMx1settleOrgIds.VisibleIndex = 39;
+            this.gvMx1settleOrgIds.Width = 94;
+            // 
+            // gvMx1eHid
+            // 
+            this.gvMx1eHid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1eHid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1eHid.Caption = "ERP鍗曟嵁琛ㄥごid ";
+            this.gvMx1eHid.FieldName = "eHid";
+            this.gvMx1eHid.MinWidth = 50;
+            this.gvMx1eHid.Name = "gvMx1eHid";
+            this.gvMx1eHid.Tag = "query_a.e_hid";
+            this.gvMx1eHid.Visible = true;
+            this.gvMx1eHid.VisibleIndex = 40;
+            this.gvMx1eHid.Width = 94;
             // 
             // picCheckBox
             // 
@@ -2274,342 +2707,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // panel6
-            // 
-            this.panel6.Controls.Add(this.labelControl4);
-            this.panel6.Controls.Add(this.textEdit4);
-            this.panel6.Location = new System.Drawing.Point(11, 59);
-            this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(240, 40);
-            this.panel6.TabIndex = 4;
-            // 
-            // panel7
-            // 
-            this.panel7.Controls.Add(this.labelControl2);
-            this.panel7.Controls.Add(this.textEdit2);
-            this.panel7.Location = new System.Drawing.Point(517, 59);
-            this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(240, 40);
-            this.panel7.TabIndex = 5;
-            // 
-            // panel8
-            // 
-            this.panel8.Controls.Add(this.labelControl1);
-            this.panel8.Controls.Add(this.textEdit1);
-            this.panel8.Location = new System.Drawing.Point(767, 59);
-            this.panel8.Name = "panel8";
-            this.panel8.Size = new System.Drawing.Size(240, 40);
-            this.panel8.TabIndex = 5;
-            // 
-            // panel9
-            // 
-            this.panel9.Controls.Add(this.labelControl3);
-            this.panel9.Controls.Add(this.textEdit3);
-            this.panel9.Location = new System.Drawing.Point(267, 59);
-            this.panel9.Name = "panel9";
-            this.panel9.Size = new System.Drawing.Size(240, 40);
-            this.panel9.TabIndex = 6;
-            // 
-            // panel10
-            // 
-            this.panel10.Controls.Add(this.lb_fDate);
-            this.panel10.Controls.Add(this.txt_fDate);
-            this.panel10.Location = new System.Drawing.Point(267, 105);
-            this.panel10.Name = "panel10";
-            this.panel10.Size = new System.Drawing.Size(240, 40);
-            this.panel10.TabIndex = 10;
-            // 
-            // panel11
-            // 
-            this.panel11.Controls.Add(this.lb_headDeliveryWay);
-            this.panel11.Controls.Add(this.txt_headDeliveryWay);
-            this.panel11.Location = new System.Drawing.Point(767, 105);
-            this.panel11.Name = "panel11";
-            this.panel11.Size = new System.Drawing.Size(240, 40);
-            this.panel11.TabIndex = 8;
-            // 
-            // panel12
-            // 
-            this.panel12.Controls.Add(this.lb_businessType);
-            this.panel12.Controls.Add(this.txt_businessType);
-            this.panel12.Location = new System.Drawing.Point(517, 105);
-            this.panel12.Name = "panel12";
-            this.panel12.Size = new System.Drawing.Size(240, 40);
-            this.panel12.TabIndex = 9;
-            // 
-            // panel13
-            // 
-            this.panel13.Controls.Add(this.lb_documentStatus);
-            this.panel13.Controls.Add(this.txt_documentStatus);
-            this.panel13.Location = new System.Drawing.Point(11, 105);
-            this.panel13.Name = "panel13";
-            this.panel13.Size = new System.Drawing.Size(240, 40);
-            this.panel13.TabIndex = 7;
-            // 
-            // panel14
-            // 
-            this.panel14.Controls.Add(this.lb_custId);
-            this.panel14.Controls.Add(this.txt_custId);
-            this.panel14.Location = new System.Drawing.Point(267, 153);
-            this.panel14.Name = "panel14";
-            this.panel14.Size = new System.Drawing.Size(240, 40);
-            this.panel14.TabIndex = 14;
-            // 
-            // panel15
-            // 
-            this.panel15.Controls.Add(this.lb_saleDeptId);
-            this.panel15.Controls.Add(this.txt_saleDeptId);
-            this.panel15.Location = new System.Drawing.Point(767, 153);
-            this.panel15.Name = "panel15";
-            this.panel15.Size = new System.Drawing.Size(240, 40);
-            this.panel15.TabIndex = 12;
-            // 
-            // panel16
-            // 
-            this.panel16.Controls.Add(this.lb_closeStatus);
-            this.panel16.Controls.Add(this.txt_closeStatus);
-            this.panel16.Location = new System.Drawing.Point(517, 153);
-            this.panel16.Name = "panel16";
-            this.panel16.Size = new System.Drawing.Size(240, 40);
-            this.panel16.TabIndex = 13;
-            // 
-            // panel17
-            // 
-            this.panel17.Controls.Add(this.lb_headLocId);
-            this.panel17.Controls.Add(this.txt_headLocId);
-            this.panel17.Location = new System.Drawing.Point(11, 153);
-            this.panel17.Name = "panel17";
-            this.panel17.Size = new System.Drawing.Size(240, 40);
-            this.panel17.TabIndex = 11;
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(12, 10);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(73, 21);
-            this.labelControl1.TabIndex = 233;
-            this.labelControl1.Text = "浜よ揣鏂瑰紡 ";
-            // 
-            // textEdit1
-            // 
-            this.textEdit1.Location = new System.Drawing.Point(72, 10);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(150, 28);
-            this.textEdit1.TabIndex = 234;
-            // 
-            // labelControl2
-            // 
-            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(25, 6);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(73, 21);
-            this.labelControl2.TabIndex = 231;
-            this.labelControl2.Text = "涓氬姟绫诲瀷 ";
-            // 
-            // textEdit2
-            // 
-            this.textEdit2.Location = new System.Drawing.Point(85, 6);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit2.Properties.Appearance.Options.UseFont = true;
-            this.textEdit2.Size = new System.Drawing.Size(150, 28);
-            this.textEdit2.TabIndex = 232;
-            // 
-            // labelControl3
-            // 
-            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(15, 10);
-            this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(39, 21);
-            this.labelControl3.TabIndex = 229;
-            this.labelControl3.Text = "鏃ユ湡 ";
-            // 
-            // textEdit3
-            // 
-            this.textEdit3.Location = new System.Drawing.Point(75, 10);
-            this.textEdit3.Name = "textEdit3";
-            this.textEdit3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit3.Properties.Appearance.Options.UseFont = true;
-            this.textEdit3.Size = new System.Drawing.Size(150, 28);
-            this.textEdit3.TabIndex = 230;
-            // 
-            // labelControl4
-            // 
-            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(15, 3);
-            this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(73, 21);
-            this.labelControl4.TabIndex = 227;
-            this.labelControl4.Text = "鍗曟嵁鐘舵�� ";
-            // 
-            // textEdit4
-            // 
-            this.textEdit4.Location = new System.Drawing.Point(75, 3);
-            this.textEdit4.Name = "textEdit4";
-            this.textEdit4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit4.Properties.Appearance.Options.UseFont = true;
-            this.textEdit4.Size = new System.Drawing.Size(150, 28);
-            this.textEdit4.TabIndex = 228;
-            // 
-            // lb_headDeliveryWay
-            // 
-            this.lb_headDeliveryWay.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_headDeliveryWay.Appearance.Options.UseFont = true;
-            this.lb_headDeliveryWay.Location = new System.Drawing.Point(12, 10);
-            this.lb_headDeliveryWay.Name = "lb_headDeliveryWay";
-            this.lb_headDeliveryWay.Size = new System.Drawing.Size(73, 21);
-            this.lb_headDeliveryWay.TabIndex = 233;
-            this.lb_headDeliveryWay.Text = "浜よ揣鏂瑰紡 ";
-            // 
-            // txt_headDeliveryWay
-            // 
-            this.txt_headDeliveryWay.Location = new System.Drawing.Point(72, 10);
-            this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
-            this.txt_headDeliveryWay.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
-            this.txt_headDeliveryWay.Size = new System.Drawing.Size(150, 28);
-            this.txt_headDeliveryWay.TabIndex = 234;
-            // 
-            // lb_businessType
-            // 
-            this.lb_businessType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_businessType.Appearance.Options.UseFont = true;
-            this.lb_businessType.Location = new System.Drawing.Point(25, 13);
-            this.lb_businessType.Name = "lb_businessType";
-            this.lb_businessType.Size = new System.Drawing.Size(73, 21);
-            this.lb_businessType.TabIndex = 231;
-            this.lb_businessType.Text = "涓氬姟绫诲瀷 ";
-            // 
-            // txt_businessType
-            // 
-            this.txt_businessType.Location = new System.Drawing.Point(87, 3);
-            this.txt_businessType.Name = "txt_businessType";
-            this.txt_businessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_businessType.Properties.Appearance.Options.UseFont = true;
-            this.txt_businessType.Size = new System.Drawing.Size(150, 28);
-            this.txt_businessType.TabIndex = 232;
-            // 
-            // lb_fDate
-            // 
-            this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fDate.Appearance.Options.UseFont = true;
-            this.lb_fDate.Location = new System.Drawing.Point(27, 10);
-            this.lb_fDate.Name = "lb_fDate";
-            this.lb_fDate.Size = new System.Drawing.Size(39, 21);
-            this.lb_fDate.TabIndex = 229;
-            this.lb_fDate.Text = "鏃ユ湡 ";
-            // 
-            // txt_fDate
-            // 
-            this.txt_fDate.Location = new System.Drawing.Point(87, 10);
-            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;
-            this.txt_fDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_fDate.TabIndex = 230;
-            // 
-            // lb_documentStatus
-            // 
-            this.lb_documentStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_documentStatus.Appearance.Options.UseFont = true;
-            this.lb_documentStatus.Location = new System.Drawing.Point(15, 3);
-            this.lb_documentStatus.Name = "lb_documentStatus";
-            this.lb_documentStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_documentStatus.TabIndex = 227;
-            this.lb_documentStatus.Text = "鍗曟嵁鐘舵�� ";
-            // 
-            // txt_documentStatus
-            // 
-            this.txt_documentStatus.Location = new System.Drawing.Point(75, 3);
-            this.txt_documentStatus.Name = "txt_documentStatus";
-            this.txt_documentStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_documentStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_documentStatus.TabIndex = 228;
-            // 
-            // lb_saleDeptId
-            // 
-            this.lb_saleDeptId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_saleDeptId.Appearance.Options.UseFont = true;
-            this.lb_saleDeptId.Location = new System.Drawing.Point(24, 6);
-            this.lb_saleDeptId.Name = "lb_saleDeptId";
-            this.lb_saleDeptId.Size = new System.Drawing.Size(73, 21);
-            this.lb_saleDeptId.TabIndex = 247;
-            this.lb_saleDeptId.Text = "閿�鍞儴闂� ";
-            // 
-            // txt_saleDeptId
-            // 
-            this.txt_saleDeptId.Location = new System.Drawing.Point(84, 6);
-            this.txt_saleDeptId.Name = "txt_saleDeptId";
-            this.txt_saleDeptId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_saleDeptId.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleDeptId.Size = new System.Drawing.Size(150, 28);
-            this.txt_saleDeptId.TabIndex = 248;
-            // 
-            // 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(25, 9);
-            this.lb_closeStatus.Name = "lb_closeStatus";
-            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeStatus.TabIndex = 245;
-            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
-            // 
-            // txt_closeStatus
-            // 
-            this.txt_closeStatus.Location = new System.Drawing.Point(85, 9);
-            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 = 246;
-            // 
-            // lb_custId
-            // 
-            this.lb_custId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_custId.Appearance.Options.UseFont = true;
-            this.lb_custId.Location = new System.Drawing.Point(27, 6);
-            this.lb_custId.Name = "lb_custId";
-            this.lb_custId.Size = new System.Drawing.Size(39, 21);
-            this.lb_custId.TabIndex = 243;
-            this.lb_custId.Text = "瀹㈡埛 ";
-            // 
-            // txt_custId
-            // 
-            this.txt_custId.Location = new System.Drawing.Point(87, 6);
-            this.txt_custId.Name = "txt_custId";
-            this.txt_custId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_custId.Properties.Appearance.Options.UseFont = true;
-            this.txt_custId.Size = new System.Drawing.Size(150, 28);
-            this.txt_custId.TabIndex = 244;
-            // 
-            // lb_headLocId
-            // 
-            this.lb_headLocId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_headLocId.Appearance.Options.UseFont = true;
-            this.lb_headLocId.Location = new System.Drawing.Point(15, 3);
-            this.lb_headLocId.Name = "lb_headLocId";
-            this.lb_headLocId.Size = new System.Drawing.Size(73, 21);
-            this.lb_headLocId.TabIndex = 241;
-            this.lb_headLocId.Text = "浜よ揣鍦扮偣 ";
-            // 
-            // txt_headLocId
-            // 
-            this.txt_headLocId.Location = new System.Drawing.Point(75, 3);
-            this.txt_headLocId.Name = "txt_headLocId";
-            this.txt_headLocId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
-            this.txt_headLocId.Size = new System.Drawing.Size(150, 28);
-            this.txt_headLocId.TabIndex = 242;
-            // 
             // Frm_SalesOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2619,50 +2716,119 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_SalesOrder";
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveContact.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrgId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbilltype.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_entryNote.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changerId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_versionNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellerId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changeDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closerId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approveDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifyDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifierId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_creatorId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_linkPhone.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_chargeId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_linkMan.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approverId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_settleId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_note.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changeReason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salerId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
             this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
-            this.tabMx.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.xtraTabPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
             this.splitContainerControl1.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+            this.splitContainerControl1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
             this.splitContainerControl1.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.panel42.ResumeLayout(false);
+            this.panel42.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveContact.Properties)).EndInit();
+            this.panel41.ResumeLayout(false);
+            this.panel41.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveId.Properties)).EndInit();
+            this.panel40.ResumeLayout(false);
+            this.panel40.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrgId.Properties)).EndInit();
+            this.panel39.ResumeLayout(false);
+            this.panel39.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fbilltype.Properties)).EndInit();
+            this.panel38.ResumeLayout(false);
+            this.panel38.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_entryNote.Properties)).EndInit();
+            this.panel34.ResumeLayout(false);
+            this.panel34.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_changerId.Properties)).EndInit();
+            this.panel35.ResumeLayout(false);
+            this.panel35.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_versionNo.Properties)).EndInit();
+            this.panel36.ResumeLayout(false);
+            this.panel36.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellerId.Properties)).EndInit();
+            this.panel37.ResumeLayout(false);
+            this.panel37.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).EndInit();
+            this.panel33.ResumeLayout(false);
+            this.panel33.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_changeDate.Properties)).EndInit();
+            this.panel32.ResumeLayout(false);
+            this.panel32.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).EndInit();
+            this.panel31.ResumeLayout(false);
+            this.panel31.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closerId.Properties)).EndInit();
+            this.panel30.ResumeLayout(false);
+            this.panel30.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approveDate.Properties)).EndInit();
+            this.panel26.ResumeLayout(false);
+            this.panel26.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifyDate.Properties)).EndInit();
+            this.panel27.ResumeLayout(false);
+            this.panel27.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifierId.Properties)).EndInit();
+            this.panel28.ResumeLayout(false);
+            this.panel28.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            this.panel29.ResumeLayout(false);
+            this.panel29.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_creatorId.Properties)).EndInit();
+            this.panel22.ResumeLayout(false);
+            this.panel22.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_linkPhone.Properties)).EndInit();
+            this.panel23.ResumeLayout(false);
+            this.panel23.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chargeId.Properties)).EndInit();
+            this.panel24.ResumeLayout(false);
+            this.panel24.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_linkMan.Properties)).EndInit();
+            this.panel25.ResumeLayout(false);
+            this.panel25.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approverId.Properties)).EndInit();
+            this.panel21.ResumeLayout(false);
+            this.panel21.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_settleId.Properties)).EndInit();
+            this.panel20.ResumeLayout(false);
+            this.panel20.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_note.Properties)).EndInit();
+            this.panel19.ResumeLayout(false);
+            this.panel19.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_changeReason.Properties)).EndInit();
+            this.panel18.ResumeLayout(false);
+            this.panel18.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerId.Properties)).EndInit();
+            this.panel14.ResumeLayout(false);
+            this.panel14.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).EndInit();
+            this.panel15.ResumeLayout(false);
+            this.panel15.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).EndInit();
+            this.panel16.ResumeLayout(false);
+            this.panel16.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
+            this.panel17.ResumeLayout(false);
+            this.panel17.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).EndInit();
+            this.panel10.ResumeLayout(false);
+            this.panel10.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
+            this.panel11.ResumeLayout(false);
+            this.panel11.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).EndInit();
+            this.panel12.ResumeLayout(false);
+            this.panel12.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).EndInit();
+            this.panel13.ResumeLayout(false);
+            this.panel13.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).EndInit();
             this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
@@ -2675,43 +2841,12 @@
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+            this.tabMx.ResumeLayout(false);
+            this.tabMxPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            this.panel6.ResumeLayout(false);
-            this.panel6.PerformLayout();
-            this.panel7.ResumeLayout(false);
-            this.panel7.PerformLayout();
-            this.panel8.ResumeLayout(false);
-            this.panel8.PerformLayout();
-            this.panel9.ResumeLayout(false);
-            this.panel9.PerformLayout();
-            this.panel10.ResumeLayout(false);
-            this.panel10.PerformLayout();
-            this.panel11.ResumeLayout(false);
-            this.panel11.PerformLayout();
-            this.panel12.ResumeLayout(false);
-            this.panel12.PerformLayout();
-            this.panel13.ResumeLayout(false);
-            this.panel13.PerformLayout();
-            this.panel14.ResumeLayout(false);
-            this.panel14.PerformLayout();
-            this.panel15.ResumeLayout(false);
-            this.panel15.PerformLayout();
-            this.panel16.ResumeLayout(false);
-            this.panel16.PerformLayout();
-            this.panel17.ResumeLayout(false);
-            this.panel17.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2721,156 +2856,31 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private UserControls.Data.UcPageBar pageBar1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
-        private DevExpress.XtraTab.XtraTabControl tabMx;
-
-        //BQCreateConrolObejct
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1eHid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1settleOrgIds;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOrgId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1supplyOrgId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1seq;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapSpec;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1custImd;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1custInm;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1custIno;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1basearqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRemainOutQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseReturnQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRetNoticeQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOutQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcType;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminaterId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminateDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mrpTerminateStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mrpCloseStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1outLmtUnitId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryMinQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryMaxQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtoNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1entryNote;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerTypeId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1priceUnitQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1priceUnitId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1qty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1unitId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraEditors.LabelControl lb_receiveContact;
-        private DevExpress.XtraEditors.TextEdit txt_receiveContact;
         private DevExpress.XtraGrid.Columns.GridColumn gv_receiveContact;
-
-        private DevExpress.XtraEditors.LabelControl lb_receiveId;
-        private DevExpress.XtraEditors.TextEdit txt_receiveId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_receiveId;
-
-        private DevExpress.XtraEditors.LabelControl lb_saleOrgId;
-        private DevExpress.XtraEditors.TextEdit txt_saleOrgId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrgId;
-
-        private DevExpress.XtraEditors.LabelControl lb_fbilltype;
-        private DevExpress.XtraEditors.TextEdit txt_fbilltype;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fbilltype;
-
-        private DevExpress.XtraEditors.LabelControl lb_entryNote;
-        private DevExpress.XtraEditors.TextEdit txt_entryNote;
         private DevExpress.XtraGrid.Columns.GridColumn gv_entryNote;
-
-        private DevExpress.XtraEditors.LabelControl lb_changerId;
-        private DevExpress.XtraEditors.TextEdit txt_changerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changerId;
-
-        private DevExpress.XtraEditors.LabelControl lb_versionNo;
-        private DevExpress.XtraEditors.TextEdit txt_versionNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_versionNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancellerId;
-        private DevExpress.XtraEditors.TextEdit txt_cancellerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancellerId;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelStatus;
-        private DevExpress.XtraEditors.TextEdit txt_cancelStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_changeDate;
-        private DevExpress.XtraEditors.TextEdit txt_changeDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changeDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeDate;
-        private DevExpress.XtraEditors.TextEdit txt_closeDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_closerId;
-        private DevExpress.XtraEditors.TextEdit txt_closerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closerId;
-
-        private DevExpress.XtraEditors.LabelControl lb_approveDate;
-        private DevExpress.XtraEditors.TextEdit txt_approveDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_approveDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_modifyDate;
-        private DevExpress.XtraEditors.TextEdit txt_modifyDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_modifyDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_modifierId;
-        private DevExpress.XtraEditors.TextEdit txt_modifierId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_modifierId;
-
-        private DevExpress.XtraEditors.LabelControl lb_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_creatorId;
-        private DevExpress.XtraEditors.TextEdit txt_creatorId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_creatorId;
-
-        private DevExpress.XtraEditors.LabelControl lb_linkPhone;
-        private DevExpress.XtraEditors.TextEdit txt_linkPhone;
         private DevExpress.XtraGrid.Columns.GridColumn gv_linkPhone;
-
-        private DevExpress.XtraEditors.LabelControl lb_chargeId;
-        private DevExpress.XtraEditors.TextEdit txt_chargeId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_chargeId;
-
-        private DevExpress.XtraEditors.LabelControl lb_linkMan;
-        private DevExpress.XtraEditors.TextEdit txt_linkMan;
         private DevExpress.XtraGrid.Columns.GridColumn gv_linkMan;
-
-        private DevExpress.XtraEditors.LabelControl lb_approverId;
-        private DevExpress.XtraEditors.TextEdit txt_approverId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_approverId;
-
-        private DevExpress.XtraEditors.LabelControl lb_settleId;
-        private DevExpress.XtraEditors.TextEdit txt_settleId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_settleId;
-
-        private DevExpress.XtraEditors.LabelControl lb_note;
-        private DevExpress.XtraEditors.TextEdit txt_note;
         private DevExpress.XtraGrid.Columns.GridColumn gv_note;
-
-        private DevExpress.XtraEditors.LabelControl lb_changeReason;
-        private DevExpress.XtraEditors.TextEdit txt_changeReason;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changeReason;
-
-        private DevExpress.XtraEditors.LabelControl lb_salerId;
-        private DevExpress.XtraEditors.TextEdit txt_salerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_salerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_saleDeptId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
@@ -2885,9 +2895,153 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_id;
         private System.Windows.Forms.PictureBox picCheckBox;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
-        private System.Windows.Forms.Panel panel2;
+        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 gvMx1id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1unitId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1qty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1priceUnitId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1priceUnitQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerTypeId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1entryNote;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtoNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryMaxQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryMinQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1outLmtUnitId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mrpCloseStatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mrpTerminateStatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminateDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminaterId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcType;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcBillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOutQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRetNoticeQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseReturnQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRemainOutQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1basearqty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1custIno;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1custInm;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1custImd;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapName;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapSpec;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1seq;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1supplyOrgId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOrgId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1settleOrgIds;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1eHid;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel42;
+        private DevExpress.XtraEditors.LabelControl lb_receiveContact;
+        private DevExpress.XtraEditors.TextEdit txt_receiveContact;
+        private System.Windows.Forms.Panel panel41;
+        private DevExpress.XtraEditors.LabelControl lb_receiveId;
+        private DevExpress.XtraEditors.TextEdit txt_receiveId;
+        private System.Windows.Forms.Panel panel40;
+        private DevExpress.XtraEditors.LabelControl lb_saleOrgId;
+        private DevExpress.XtraEditors.TextEdit txt_saleOrgId;
+        private System.Windows.Forms.Panel panel39;
+        private DevExpress.XtraEditors.LabelControl lb_fbilltype;
+        private DevExpress.XtraEditors.TextEdit txt_fbilltype;
+        private System.Windows.Forms.Panel panel38;
+        private DevExpress.XtraEditors.LabelControl lb_entryNote;
+        private DevExpress.XtraEditors.TextEdit txt_entryNote;
+        private System.Windows.Forms.Panel panel34;
+        private DevExpress.XtraEditors.LabelControl lb_changerId;
+        private DevExpress.XtraEditors.TextEdit txt_changerId;
+        private System.Windows.Forms.Panel panel35;
+        private DevExpress.XtraEditors.LabelControl lb_versionNo;
+        private DevExpress.XtraEditors.TextEdit txt_versionNo;
+        private System.Windows.Forms.Panel panel36;
+        private DevExpress.XtraEditors.LabelControl lb_cancellerId;
+        private DevExpress.XtraEditors.TextEdit txt_cancellerId;
+        private System.Windows.Forms.Panel panel37;
+        private DevExpress.XtraEditors.LabelControl lb_cancelStatus;
+        private DevExpress.XtraEditors.TextEdit txt_cancelStatus;
+        private System.Windows.Forms.Panel panel33;
+        private DevExpress.XtraEditors.LabelControl lb_changeDate;
+        private DevExpress.XtraEditors.TextEdit txt_changeDate;
+        private System.Windows.Forms.Panel panel32;
+        private DevExpress.XtraEditors.LabelControl lb_closeDate;
+        private DevExpress.XtraEditors.TextEdit txt_closeDate;
+        private System.Windows.Forms.Panel panel31;
+        private DevExpress.XtraEditors.LabelControl lb_closerId;
+        private DevExpress.XtraEditors.TextEdit txt_closerId;
+        private System.Windows.Forms.Panel panel30;
+        private DevExpress.XtraEditors.LabelControl lb_approveDate;
+        private DevExpress.XtraEditors.TextEdit txt_approveDate;
+        private System.Windows.Forms.Panel panel26;
+        private DevExpress.XtraEditors.LabelControl lb_modifyDate;
+        private DevExpress.XtraEditors.TextEdit txt_modifyDate;
+        private System.Windows.Forms.Panel panel27;
+        private DevExpress.XtraEditors.LabelControl lb_modifierId;
+        private DevExpress.XtraEditors.TextEdit txt_modifierId;
+        private System.Windows.Forms.Panel panel28;
+        private DevExpress.XtraEditors.LabelControl lb_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private System.Windows.Forms.Panel panel29;
+        private DevExpress.XtraEditors.LabelControl lb_creatorId;
+        private DevExpress.XtraEditors.TextEdit txt_creatorId;
+        private System.Windows.Forms.Panel panel22;
+        private DevExpress.XtraEditors.LabelControl lb_linkPhone;
+        private DevExpress.XtraEditors.TextEdit txt_linkPhone;
+        private System.Windows.Forms.Panel panel23;
+        private DevExpress.XtraEditors.LabelControl lb_chargeId;
+        private DevExpress.XtraEditors.TextEdit txt_chargeId;
+        private System.Windows.Forms.Panel panel24;
+        private DevExpress.XtraEditors.LabelControl lb_linkMan;
+        private DevExpress.XtraEditors.TextEdit txt_linkMan;
+        private System.Windows.Forms.Panel panel25;
+        private DevExpress.XtraEditors.LabelControl lb_approverId;
+        private DevExpress.XtraEditors.TextEdit txt_approverId;
+        private System.Windows.Forms.Panel panel21;
+        private DevExpress.XtraEditors.LabelControl lb_settleId;
+        private DevExpress.XtraEditors.TextEdit txt_settleId;
+        private System.Windows.Forms.Panel panel20;
+        private DevExpress.XtraEditors.TextEdit txt_note;
+        private DevExpress.XtraEditors.LabelControl lb_note;
+        private System.Windows.Forms.Panel panel19;
+        private DevExpress.XtraEditors.LabelControl lb_changeReason;
+        private DevExpress.XtraEditors.TextEdit txt_changeReason;
+        private System.Windows.Forms.Panel panel18;
+        private DevExpress.XtraEditors.LabelControl lb_salerId;
+        private DevExpress.XtraEditors.TextEdit txt_salerId;
+        private System.Windows.Forms.Panel panel14;
+        private DevExpress.XtraEditors.LabelControl lb_custId;
+        private DevExpress.XtraEditors.TextEdit txt_custId;
+        private System.Windows.Forms.Panel panel15;
+        private DevExpress.XtraEditors.LabelControl lb_saleDeptId;
+        private DevExpress.XtraEditors.TextEdit txt_saleDeptId;
+        private System.Windows.Forms.Panel panel16;
+        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
+        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
+        private System.Windows.Forms.Panel panel17;
+        private DevExpress.XtraEditors.LabelControl lb_headLocId;
+        private DevExpress.XtraEditors.TextEdit txt_headLocId;
+        private System.Windows.Forms.Panel panel10;
+        private DevExpress.XtraEditors.LabelControl lb_fDate;
+        private DevExpress.XtraEditors.TextEdit txt_fDate;
+        private System.Windows.Forms.Panel panel11;
+        private DevExpress.XtraEditors.LabelControl lb_headDeliveryWay;
+        private DevExpress.XtraEditors.TextEdit txt_headDeliveryWay;
+        private System.Windows.Forms.Panel panel12;
+        private DevExpress.XtraEditors.LabelControl lb_businessType;
+        private DevExpress.XtraEditors.TextEdit txt_businessType;
+        private System.Windows.Forms.Panel panel13;
+        private DevExpress.XtraEditors.LabelControl lb_documentStatus;
+        private DevExpress.XtraEditors.TextEdit txt_documentStatus;
         private System.Windows.Forms.Panel panel4;
         private DevExpress.XtraEditors.LabelControl lb_id;
         private DevExpress.XtraEditors.TextEdit txt_id;
@@ -2897,43 +3051,9 @@
         private System.Windows.Forms.Panel panel3;
         private DevExpress.XtraEditors.LabelControl lb_billTypeId;
         private DevExpress.XtraEditors.TextEdit txt_billTypeId;
+        private System.Windows.Forms.Panel panel2;
         private DevExpress.XtraEditors.LabelControl lb_billNo;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
-        private System.Windows.Forms.Panel panel14;
-        private System.Windows.Forms.Panel panel15;
-        private System.Windows.Forms.Panel panel16;
-        private System.Windows.Forms.Panel panel17;
-        private System.Windows.Forms.Panel panel10;
-        private System.Windows.Forms.Panel panel11;
-        private System.Windows.Forms.Panel panel12;
-        private System.Windows.Forms.Panel panel13;
-        private System.Windows.Forms.Panel panel9;
-        private System.Windows.Forms.Panel panel8;
-        private System.Windows.Forms.Panel panel7;
-        private System.Windows.Forms.Panel panel6;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit textEdit3;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.TextEdit textEdit2;
-        private DevExpress.XtraEditors.LabelControl labelControl4;
-        private DevExpress.XtraEditors.TextEdit textEdit4;
-        private DevExpress.XtraEditors.LabelControl lb_fDate;
-        private DevExpress.XtraEditors.TextEdit txt_fDate;
-        private DevExpress.XtraEditors.LabelControl lb_headDeliveryWay;
-        private DevExpress.XtraEditors.TextEdit txt_headDeliveryWay;
-        private DevExpress.XtraEditors.LabelControl lb_businessType;
-        private DevExpress.XtraEditors.TextEdit txt_businessType;
-        private DevExpress.XtraEditors.LabelControl lb_documentStatus;
-        private DevExpress.XtraEditors.TextEdit txt_documentStatus;
-        private DevExpress.XtraEditors.LabelControl lb_custId;
-        private DevExpress.XtraEditors.TextEdit txt_custId;
-        private DevExpress.XtraEditors.LabelControl lb_saleDeptId;
-        private DevExpress.XtraEditors.TextEdit txt_saleDeptId;
-        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
-        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
-        private DevExpress.XtraEditors.LabelControl lb_headLocId;
-        private DevExpress.XtraEditors.TextEdit txt_headLocId;
+        private DevExpress.XtraEditors.LabelControl lbGuid;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index cfce570..cb73d38 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -24,7 +25,7 @@
         public Frm_SalesOrder()
         {
             InitializeComponent();
-            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1);
+            _drapHelp = new DragResizeHelp(this,panel1);
             this.xtraTabControl1.CustomHeaderButtonClick += (s, e) => { _drapHelp.Show(); };
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -201,5 +202,7 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+      
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
index 684151a..ddee06c 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -28,902 +28,63 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_billTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_headDeliveryWay = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_headLocId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_custId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_saleDeptId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_salerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_changeReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_note = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_settleId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_approverId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_linkMan = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_chargeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_linkPhone = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_creatorId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_modifierId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_modifyDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_approveDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_changeDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_cancellerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_versionNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_changerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fbilltype = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_saleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_receiveId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_receiveContact = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
-            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.panel1 = new System.Windows.Forms.Panel();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
-            this.splitContainerControl1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
-            this.splitContainerControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
-            this.panelControl2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
-            this.panelControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             this.SuspendLayout();
-            // 
-            // xtraTabControl1
-            // 
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
-            this.xtraTabControl1.CustomHeaderButtons.AddRange(new DevExpress.XtraTab.Buttons.CustomHeaderButton[] {
-            new DevExpress.XtraTab.Buttons.CustomHeaderButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, editorButtonImageOptions1, serializableAppearanceObject1, "", null, null)});
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1057, 660);
-            this.xtraTabControl1.TabIndex = 1;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.toolStrip1);
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1055, 628);
-            this.xtraTabPage1.Text = "xtraTabPage1";
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1055, 25);
-            this.toolStrip1.TabIndex = 7;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1055, 628);
-            this.gcMain.TabIndex = 6;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
-            this.gv_erpId,
-            this.gv_billNo,
-            this.gv_billTypeId,
-            this.gv_documentStatus,
-            this.gv_fDate,
-            this.gv_businessType,
-            this.gv_headDeliveryWay,
-            this.gv_headLocId,
-            this.gv_custId,
-            this.gv_closeStatus,
-            this.gv_saleDeptId,
-            this.gv_salerId,
-            this.gv_changeReason,
-            this.gv_note,
-            this.gv_settleId,
-            this.gv_approverId,
-            this.gv_linkMan,
-            this.gv_chargeId,
-            this.gv_linkPhone,
-            this.gv_creatorId,
-            this.gv_createDate,
-            this.gv_modifierId,
-            this.gv_modifyDate,
-            this.gv_approveDate,
-            this.gv_closerId,
-            this.gv_closeDate,
-            this.gv_changeDate,
-            this.gv_cancelStatus,
-            this.gv_cancellerId,
-            this.gv_versionNo,
-            this.gv_changerId,
-            this.gv_entryNote,
-            this.gv_fbilltype,
-            this.gv_saleOrgId,
-            this.gv_receiveId,
-            this.gv_receiveContact});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_id
-            // 
-            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "id ";
-            this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 50;
-            this.gv_id.Name = "gv_id";
-            this.gv_id.OptionsColumn.AllowEdit = false;
-            this.gv_id.Tag = "query_a.id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 0;
-            this.gv_id.Width = 94;
-            // 
-            // gv_erpId
-            // 
-            this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_erpId.AppearanceCell.Options.UseFont = true;
-            this.gv_erpId.Caption = "erp_id ";
-            this.gv_erpId.FieldName = "erpId";
-            this.gv_erpId.MinWidth = 50;
-            this.gv_erpId.Name = "gv_erpId";
-            this.gv_erpId.OptionsColumn.AllowEdit = false;
-            this.gv_erpId.Tag = "query_a.erp_id";
-            this.gv_erpId.Visible = true;
-            this.gv_erpId.VisibleIndex = 1;
-            this.gv_erpId.Width = 94;
-            // 
-            // gv_billNo
-            // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_billNo.AppearanceCell.Options.UseFont = true;
-            this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
-            this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 50;
-            this.gv_billNo.Name = "gv_billNo";
-            this.gv_billNo.OptionsColumn.AllowEdit = false;
-            this.gv_billNo.Tag = "query_a.bill_no";
-            this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 2;
-            this.gv_billNo.Width = 94;
-            // 
-            // gv_billTypeId
-            // 
-            this.gv_billTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_billTypeId.AppearanceCell.Options.UseFont = true;
-            this.gv_billTypeId.Caption = "鍗曟嵁绫诲瀷 ";
-            this.gv_billTypeId.FieldName = "billTypeId";
-            this.gv_billTypeId.MinWidth = 50;
-            this.gv_billTypeId.Name = "gv_billTypeId";
-            this.gv_billTypeId.OptionsColumn.AllowEdit = false;
-            this.gv_billTypeId.Tag = "query_a.bill_type_id";
-            this.gv_billTypeId.Visible = true;
-            this.gv_billTypeId.VisibleIndex = 3;
-            this.gv_billTypeId.Width = 94;
-            // 
-            // gv_documentStatus
-            // 
-            this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_documentStatus.Caption = "鍗曟嵁鐘舵�� ";
-            this.gv_documentStatus.FieldName = "documentStatus";
-            this.gv_documentStatus.MinWidth = 50;
-            this.gv_documentStatus.Name = "gv_documentStatus";
-            this.gv_documentStatus.OptionsColumn.AllowEdit = false;
-            this.gv_documentStatus.Tag = "query_a.document_status";
-            this.gv_documentStatus.Visible = true;
-            this.gv_documentStatus.VisibleIndex = 4;
-            this.gv_documentStatus.Width = 94;
-            // 
-            // gv_fDate
-            // 
-            this.gv_fDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fDate.AppearanceCell.Options.UseFont = true;
-            this.gv_fDate.Caption = "鏃ユ湡 ";
-            this.gv_fDate.FieldName = "fDate";
-            this.gv_fDate.MinWidth = 50;
-            this.gv_fDate.Name = "gv_fDate";
-            this.gv_fDate.OptionsColumn.AllowEdit = false;
-            this.gv_fDate.Tag = "query_a.f_date";
-            this.gv_fDate.Visible = true;
-            this.gv_fDate.VisibleIndex = 5;
-            this.gv_fDate.Width = 94;
-            // 
-            // gv_businessType
-            // 
-            this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_businessType.AppearanceCell.Options.UseFont = true;
-            this.gv_businessType.Caption = "涓氬姟绫诲瀷 ";
-            this.gv_businessType.FieldName = "businessType";
-            this.gv_businessType.MinWidth = 50;
-            this.gv_businessType.Name = "gv_businessType";
-            this.gv_businessType.OptionsColumn.AllowEdit = false;
-            this.gv_businessType.Tag = "query_a.business_type";
-            this.gv_businessType.Visible = true;
-            this.gv_businessType.VisibleIndex = 6;
-            this.gv_businessType.Width = 94;
-            // 
-            // gv_headDeliveryWay
-            // 
-            this.gv_headDeliveryWay.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_headDeliveryWay.AppearanceCell.Options.UseFont = true;
-            this.gv_headDeliveryWay.Caption = "浜よ揣鏂瑰紡 ";
-            this.gv_headDeliveryWay.FieldName = "headDeliveryWay";
-            this.gv_headDeliveryWay.MinWidth = 50;
-            this.gv_headDeliveryWay.Name = "gv_headDeliveryWay";
-            this.gv_headDeliveryWay.OptionsColumn.AllowEdit = false;
-            this.gv_headDeliveryWay.Tag = "query_a.head_delivery_way";
-            this.gv_headDeliveryWay.Visible = true;
-            this.gv_headDeliveryWay.VisibleIndex = 7;
-            this.gv_headDeliveryWay.Width = 94;
-            // 
-            // gv_headLocId
-            // 
-            this.gv_headLocId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_headLocId.AppearanceCell.Options.UseFont = true;
-            this.gv_headLocId.Caption = "浜よ揣鍦扮偣 ";
-            this.gv_headLocId.FieldName = "headLocId";
-            this.gv_headLocId.MinWidth = 50;
-            this.gv_headLocId.Name = "gv_headLocId";
-            this.gv_headLocId.OptionsColumn.AllowEdit = false;
-            this.gv_headLocId.Tag = "query_a.head_loc_id";
-            this.gv_headLocId.Visible = true;
-            this.gv_headLocId.VisibleIndex = 8;
-            this.gv_headLocId.Width = 94;
-            // 
-            // gv_custId
-            // 
-            this.gv_custId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_custId.AppearanceCell.Options.UseFont = true;
-            this.gv_custId.Caption = "瀹㈡埛 ";
-            this.gv_custId.FieldName = "custId";
-            this.gv_custId.MinWidth = 50;
-            this.gv_custId.Name = "gv_custId";
-            this.gv_custId.OptionsColumn.AllowEdit = false;
-            this.gv_custId.Tag = "query_a.cust_id";
-            this.gv_custId.Visible = true;
-            this.gv_custId.VisibleIndex = 9;
-            this.gv_custId.Width = 94;
-            // 
-            // gv_closeStatus
-            // 
-            this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_closeStatus.Caption = "鍏抽棴鐘舵�� ";
-            this.gv_closeStatus.FieldName = "closeStatus";
-            this.gv_closeStatus.MinWidth = 50;
-            this.gv_closeStatus.Name = "gv_closeStatus";
-            this.gv_closeStatus.OptionsColumn.AllowEdit = false;
-            this.gv_closeStatus.Tag = "query_a.close_status";
-            this.gv_closeStatus.Visible = true;
-            this.gv_closeStatus.VisibleIndex = 10;
-            this.gv_closeStatus.Width = 94;
-            // 
-            // gv_saleDeptId
-            // 
-            this.gv_saleDeptId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_saleDeptId.AppearanceCell.Options.UseFont = true;
-            this.gv_saleDeptId.Caption = "閿�鍞儴闂� ";
-            this.gv_saleDeptId.FieldName = "saleDeptId";
-            this.gv_saleDeptId.MinWidth = 50;
-            this.gv_saleDeptId.Name = "gv_saleDeptId";
-            this.gv_saleDeptId.OptionsColumn.AllowEdit = false;
-            this.gv_saleDeptId.Tag = "query_a.sale_dept_id";
-            this.gv_saleDeptId.Visible = true;
-            this.gv_saleDeptId.VisibleIndex = 11;
-            this.gv_saleDeptId.Width = 94;
-            // 
-            // gv_salerId
-            // 
-            this.gv_salerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_salerId.AppearanceCell.Options.UseFont = true;
-            this.gv_salerId.Caption = "閿�鍞憳 ";
-            this.gv_salerId.FieldName = "salerId";
-            this.gv_salerId.MinWidth = 50;
-            this.gv_salerId.Name = "gv_salerId";
-            this.gv_salerId.OptionsColumn.AllowEdit = false;
-            this.gv_salerId.Tag = "query_a.saler_id";
-            this.gv_salerId.Visible = true;
-            this.gv_salerId.VisibleIndex = 12;
-            this.gv_salerId.Width = 94;
-            // 
-            // gv_changeReason
-            // 
-            this.gv_changeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_changeReason.AppearanceCell.Options.UseFont = true;
-            this.gv_changeReason.Caption = "鍙樻洿鍘熷洜 ";
-            this.gv_changeReason.FieldName = "changeReason";
-            this.gv_changeReason.MinWidth = 50;
-            this.gv_changeReason.Name = "gv_changeReason";
-            this.gv_changeReason.OptionsColumn.AllowEdit = false;
-            this.gv_changeReason.Tag = "query_a.change_reason";
-            this.gv_changeReason.Visible = true;
-            this.gv_changeReason.VisibleIndex = 13;
-            this.gv_changeReason.Width = 94;
-            // 
-            // gv_note
-            // 
-            this.gv_note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_note.AppearanceCell.Options.UseFont = true;
-            this.gv_note.Caption = "澶囨敞 ";
-            this.gv_note.FieldName = "note";
-            this.gv_note.MinWidth = 50;
-            this.gv_note.Name = "gv_note";
-            this.gv_note.OptionsColumn.AllowEdit = false;
-            this.gv_note.Tag = "query_a.note";
-            this.gv_note.Visible = true;
-            this.gv_note.VisibleIndex = 14;
-            this.gv_note.Width = 94;
-            // 
-            // gv_settleId
-            // 
-            this.gv_settleId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_settleId.AppearanceCell.Options.UseFont = true;
-            this.gv_settleId.Caption = "缁撶畻鏂� ";
-            this.gv_settleId.FieldName = "settleId";
-            this.gv_settleId.MinWidth = 50;
-            this.gv_settleId.Name = "gv_settleId";
-            this.gv_settleId.OptionsColumn.AllowEdit = false;
-            this.gv_settleId.Tag = "query_a.settle_id";
-            this.gv_settleId.Visible = true;
-            this.gv_settleId.VisibleIndex = 15;
-            this.gv_settleId.Width = 94;
-            // 
-            // gv_approverId
-            // 
-            this.gv_approverId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_approverId.AppearanceCell.Options.UseFont = true;
-            this.gv_approverId.Caption = "瀹℃牳浜� ";
-            this.gv_approverId.FieldName = "approverId";
-            this.gv_approverId.MinWidth = 50;
-            this.gv_approverId.Name = "gv_approverId";
-            this.gv_approverId.OptionsColumn.AllowEdit = false;
-            this.gv_approverId.Tag = "query_a.approver_id";
-            this.gv_approverId.Visible = true;
-            this.gv_approverId.VisibleIndex = 16;
-            this.gv_approverId.Width = 94;
-            // 
-            // gv_linkMan
-            // 
-            this.gv_linkMan.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_linkMan.AppearanceCell.Options.UseFont = true;
-            this.gv_linkMan.Caption = "鏀惰揣浜哄鍚� ";
-            this.gv_linkMan.FieldName = "linkMan";
-            this.gv_linkMan.MinWidth = 50;
-            this.gv_linkMan.Name = "gv_linkMan";
-            this.gv_linkMan.OptionsColumn.AllowEdit = false;
-            this.gv_linkMan.Tag = "query_a.link_man";
-            this.gv_linkMan.Visible = true;
-            this.gv_linkMan.VisibleIndex = 17;
-            this.gv_linkMan.Width = 94;
-            // 
-            // gv_chargeId
-            // 
-            this.gv_chargeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_chargeId.AppearanceCell.Options.UseFont = true;
-            this.gv_chargeId.Caption = "浠樻鏂� ";
-            this.gv_chargeId.FieldName = "chargeId";
-            this.gv_chargeId.MinWidth = 50;
-            this.gv_chargeId.Name = "gv_chargeId";
-            this.gv_chargeId.OptionsColumn.AllowEdit = false;
-            this.gv_chargeId.Tag = "query_a.charge_id";
-            this.gv_chargeId.Visible = true;
-            this.gv_chargeId.VisibleIndex = 18;
-            this.gv_chargeId.Width = 94;
-            // 
-            // gv_linkPhone
-            // 
-            this.gv_linkPhone.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_linkPhone.AppearanceCell.Options.UseFont = true;
-            this.gv_linkPhone.Caption = "鑱旂郴鐢佃瘽 ";
-            this.gv_linkPhone.FieldName = "linkPhone";
-            this.gv_linkPhone.MinWidth = 50;
-            this.gv_linkPhone.Name = "gv_linkPhone";
-            this.gv_linkPhone.OptionsColumn.AllowEdit = false;
-            this.gv_linkPhone.Tag = "query_a.link_phone";
-            this.gv_linkPhone.Visible = true;
-            this.gv_linkPhone.VisibleIndex = 19;
-            this.gv_linkPhone.Width = 94;
-            // 
-            // gv_creatorId
-            // 
-            this.gv_creatorId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_creatorId.AppearanceCell.Options.UseFont = true;
-            this.gv_creatorId.Caption = "鍒涘缓浜� ";
-            this.gv_creatorId.FieldName = "creatorId";
-            this.gv_creatorId.MinWidth = 50;
-            this.gv_creatorId.Name = "gv_creatorId";
-            this.gv_creatorId.OptionsColumn.AllowEdit = false;
-            this.gv_creatorId.Tag = "query_a.creator_id";
-            this.gv_creatorId.Visible = true;
-            this.gv_creatorId.VisibleIndex = 20;
-            this.gv_creatorId.Width = 94;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃ユ湡 ";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.create_date";
-            this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 21;
-            this.gv_createDate.Width = 94;
-            // 
-            // gv_modifierId
-            // 
-            this.gv_modifierId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_modifierId.AppearanceCell.Options.UseFont = true;
-            this.gv_modifierId.Caption = "鏈�鍚庝慨鏀逛汉 ";
-            this.gv_modifierId.FieldName = "modifierId";
-            this.gv_modifierId.MinWidth = 50;
-            this.gv_modifierId.Name = "gv_modifierId";
-            this.gv_modifierId.OptionsColumn.AllowEdit = false;
-            this.gv_modifierId.Tag = "query_a.modifier_id";
-            this.gv_modifierId.Visible = true;
-            this.gv_modifierId.VisibleIndex = 22;
-            this.gv_modifierId.Width = 94;
-            // 
-            // gv_modifyDate
-            // 
-            this.gv_modifyDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_modifyDate.AppearanceCell.Options.UseFont = true;
-            this.gv_modifyDate.Caption = "鏈�鍚庝慨鏀规棩鏈� ";
-            this.gv_modifyDate.FieldName = "modifyDate";
-            this.gv_modifyDate.MinWidth = 50;
-            this.gv_modifyDate.Name = "gv_modifyDate";
-            this.gv_modifyDate.OptionsColumn.AllowEdit = false;
-            this.gv_modifyDate.Tag = "query_a.modify_date";
-            this.gv_modifyDate.Visible = true;
-            this.gv_modifyDate.VisibleIndex = 23;
-            this.gv_modifyDate.Width = 94;
-            // 
-            // gv_approveDate
-            // 
-            this.gv_approveDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_approveDate.AppearanceCell.Options.UseFont = true;
-            this.gv_approveDate.Caption = "瀹℃牳鏃ユ湡 ";
-            this.gv_approveDate.FieldName = "approveDate";
-            this.gv_approveDate.MinWidth = 50;
-            this.gv_approveDate.Name = "gv_approveDate";
-            this.gv_approveDate.OptionsColumn.AllowEdit = false;
-            this.gv_approveDate.Tag = "query_a.approve_date";
-            this.gv_approveDate.Visible = true;
-            this.gv_approveDate.VisibleIndex = 24;
-            this.gv_approveDate.Width = 94;
-            // 
-            // gv_closerId
-            // 
-            this.gv_closerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_closerId.AppearanceCell.Options.UseFont = true;
-            this.gv_closerId.Caption = "鍏抽棴浜� ";
-            this.gv_closerId.FieldName = "closerId";
-            this.gv_closerId.MinWidth = 50;
-            this.gv_closerId.Name = "gv_closerId";
-            this.gv_closerId.OptionsColumn.AllowEdit = false;
-            this.gv_closerId.Tag = "query_a.closer_id";
-            this.gv_closerId.Visible = true;
-            this.gv_closerId.VisibleIndex = 25;
-            this.gv_closerId.Width = 94;
-            // 
-            // gv_closeDate
-            // 
-            this.gv_closeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_closeDate.AppearanceCell.Options.UseFont = true;
-            this.gv_closeDate.Caption = "鍏抽棴鏃ユ湡 ";
-            this.gv_closeDate.FieldName = "closeDate";
-            this.gv_closeDate.MinWidth = 50;
-            this.gv_closeDate.Name = "gv_closeDate";
-            this.gv_closeDate.OptionsColumn.AllowEdit = false;
-            this.gv_closeDate.Tag = "query_a.close_date";
-            this.gv_closeDate.Visible = true;
-            this.gv_closeDate.VisibleIndex = 26;
-            this.gv_closeDate.Width = 94;
-            // 
-            // gv_changeDate
-            // 
-            this.gv_changeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_changeDate.AppearanceCell.Options.UseFont = true;
-            this.gv_changeDate.Caption = "鍙樻洿鏃ユ湡 ";
-            this.gv_changeDate.FieldName = "changeDate";
-            this.gv_changeDate.MinWidth = 50;
-            this.gv_changeDate.Name = "gv_changeDate";
-            this.gv_changeDate.OptionsColumn.AllowEdit = false;
-            this.gv_changeDate.Tag = "query_a.change_date";
-            this.gv_changeDate.Visible = true;
-            this.gv_changeDate.VisibleIndex = 27;
-            this.gv_changeDate.Width = 94;
-            // 
-            // gv_cancelStatus
-            // 
-            this.gv_cancelStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancelStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_cancelStatus.Caption = "浣滃簾鐘舵�� ";
-            this.gv_cancelStatus.FieldName = "cancelStatus";
-            this.gv_cancelStatus.MinWidth = 50;
-            this.gv_cancelStatus.Name = "gv_cancelStatus";
-            this.gv_cancelStatus.OptionsColumn.AllowEdit = false;
-            this.gv_cancelStatus.Tag = "query_a.cancel_status";
-            this.gv_cancelStatus.Visible = true;
-            this.gv_cancelStatus.VisibleIndex = 28;
-            this.gv_cancelStatus.Width = 94;
-            // 
-            // gv_cancellerId
-            // 
-            this.gv_cancellerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancellerId.AppearanceCell.Options.UseFont = true;
-            this.gv_cancellerId.Caption = "浣滃簾浜� ";
-            this.gv_cancellerId.FieldName = "cancellerId";
-            this.gv_cancellerId.MinWidth = 50;
-            this.gv_cancellerId.Name = "gv_cancellerId";
-            this.gv_cancellerId.OptionsColumn.AllowEdit = false;
-            this.gv_cancellerId.Tag = "query_a.canceller_id";
-            this.gv_cancellerId.Visible = true;
-            this.gv_cancellerId.VisibleIndex = 29;
-            this.gv_cancellerId.Width = 94;
-            // 
-            // gv_versionNo
-            // 
-            this.gv_versionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_versionNo.AppearanceCell.Options.UseFont = true;
-            this.gv_versionNo.Caption = "鐗堟湰鍙� ";
-            this.gv_versionNo.FieldName = "versionNo";
-            this.gv_versionNo.MinWidth = 50;
-            this.gv_versionNo.Name = "gv_versionNo";
-            this.gv_versionNo.OptionsColumn.AllowEdit = false;
-            this.gv_versionNo.Tag = "query_a.version_no";
-            this.gv_versionNo.Visible = true;
-            this.gv_versionNo.VisibleIndex = 30;
-            this.gv_versionNo.Width = 94;
-            // 
-            // gv_changerId
-            // 
-            this.gv_changerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_changerId.AppearanceCell.Options.UseFont = true;
-            this.gv_changerId.Caption = "鍙樻洿浜� ";
-            this.gv_changerId.FieldName = "changerId";
-            this.gv_changerId.MinWidth = 50;
-            this.gv_changerId.Name = "gv_changerId";
-            this.gv_changerId.OptionsColumn.AllowEdit = false;
-            this.gv_changerId.Tag = "query_a.changer_id";
-            this.gv_changerId.Visible = true;
-            this.gv_changerId.VisibleIndex = 31;
-            this.gv_changerId.Width = 94;
-            // 
-            // gv_entryNote
-            // 
-            this.gv_entryNote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_entryNote.AppearanceCell.Options.UseFont = true;
-            this.gv_entryNote.Caption = "澶囨敞 ";
-            this.gv_entryNote.FieldName = "entryNote";
-            this.gv_entryNote.MinWidth = 50;
-            this.gv_entryNote.Name = "gv_entryNote";
-            this.gv_entryNote.OptionsColumn.AllowEdit = false;
-            this.gv_entryNote.Tag = "query_a.entry_note";
-            this.gv_entryNote.Visible = true;
-            this.gv_entryNote.VisibleIndex = 32;
-            this.gv_entryNote.Width = 94;
-            // 
-            // gv_fbilltype
-            // 
-            this.gv_fbilltype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fbilltype.AppearanceCell.Options.UseFont = true;
-            this.gv_fbilltype.Caption = "fbilltype ";
-            this.gv_fbilltype.FieldName = "fbilltype";
-            this.gv_fbilltype.MinWidth = 50;
-            this.gv_fbilltype.Name = "gv_fbilltype";
-            this.gv_fbilltype.OptionsColumn.AllowEdit = false;
-            this.gv_fbilltype.Tag = "query_a.fbilltype";
-            this.gv_fbilltype.Visible = true;
-            this.gv_fbilltype.VisibleIndex = 33;
-            this.gv_fbilltype.Width = 94;
-            // 
-            // gv_saleOrgId
-            // 
-            this.gv_saleOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_saleOrgId.AppearanceCell.Options.UseFont = true;
-            this.gv_saleOrgId.Caption = "閿�鍞粍缁嘔D ";
-            this.gv_saleOrgId.FieldName = "saleOrgId";
-            this.gv_saleOrgId.MinWidth = 50;
-            this.gv_saleOrgId.Name = "gv_saleOrgId";
-            this.gv_saleOrgId.OptionsColumn.AllowEdit = false;
-            this.gv_saleOrgId.Tag = "query_a.SALE_ORG_ID";
-            this.gv_saleOrgId.Visible = true;
-            this.gv_saleOrgId.VisibleIndex = 34;
-            this.gv_saleOrgId.Width = 94;
-            // 
-            // gv_receiveId
-            // 
-            this.gv_receiveId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_receiveId.AppearanceCell.Options.UseFont = true;
-            this.gv_receiveId.Caption = "鏀惰揣鏂� ";
-            this.gv_receiveId.FieldName = "receiveId";
-            this.gv_receiveId.MinWidth = 50;
-            this.gv_receiveId.Name = "gv_receiveId";
-            this.gv_receiveId.OptionsColumn.AllowEdit = false;
-            this.gv_receiveId.Tag = "query_a.RECEIVE_ID";
-            this.gv_receiveId.Visible = true;
-            this.gv_receiveId.VisibleIndex = 35;
-            this.gv_receiveId.Width = 94;
-            // 
-            // gv_receiveContact
-            // 
-            this.gv_receiveContact.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_receiveContact.AppearanceCell.Options.UseFont = true;
-            this.gv_receiveContact.Caption = "鏀惰揣鏂硅仈绯讳汉 ";
-            this.gv_receiveContact.FieldName = "receiveContact";
-            this.gv_receiveContact.MinWidth = 50;
-            this.gv_receiveContact.Name = "gv_receiveContact";
-            this.gv_receiveContact.OptionsColumn.AllowEdit = false;
-            this.gv_receiveContact.Tag = "query_a.RECEIVE_CONTACT";
-            this.gv_receiveContact.Visible = true;
-            this.gv_receiveContact.VisibleIndex = 36;
-            this.gv_receiveContact.Width = 94;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.splitContainerControl1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1055, 628);
-            this.xtraTabPage2.Text = "xtraTabPage2";
-            // 
-            // splitContainerControl1
-            // 
-            this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainerControl1.Horizontal = false;
-            this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainerControl1.Name = "splitContainerControl1";
-            // 
-            // splitContainerControl1.Panel1
-            // 
-            this.splitContainerControl1.Panel1.Appearance.BackColor = System.Drawing.Color.White;
-            this.splitContainerControl1.Panel1.Appearance.Options.UseBackColor = true;
-            this.splitContainerControl1.Panel1.Controls.Add(this.panel1);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panelControl2);
-            this.splitContainerControl1.Panel1.Controls.Add(this.panelControl1);
-            this.splitContainerControl1.Panel1.Text = "Panel1";
-            // 
-            // splitContainerControl1.Panel2
-            // 
-            this.splitContainerControl1.Panel2.Text = "Panel2";
-            this.splitContainerControl1.Size = new System.Drawing.Size(1055, 628);
-            this.splitContainerControl1.SplitterPosition = 189;
-            this.splitContainerControl1.TabIndex = 2;
-            // 
-            // panelControl2
-            // 
-            this.panelControl2.Appearance.BackColor = System.Drawing.Color.White;
-            this.panelControl2.Appearance.Options.UseBackColor = true;
-            this.panelControl2.Controls.Add(this.labelControl3);
-            this.panelControl2.Controls.Add(this.textEdit2);
-            this.panelControl2.Location = new System.Drawing.Point(189, 76);
-            this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(237, 39);
-            this.panelControl2.TabIndex = 1;
-            // 
-            // labelControl3
-            // 
-            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(4, 5);
-            this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(73, 21);
-            this.labelControl3.TabIndex = 217;
-            this.labelControl3.Text = "鍗曟嵁绫诲瀷 ";
-            // 
-            // textEdit2
-            // 
-            this.textEdit2.Location = new System.Drawing.Point(78, 5);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit2.Properties.Appearance.Options.UseFont = true;
-            this.textEdit2.Size = new System.Drawing.Size(155, 28);
-            this.textEdit2.TabIndex = 218;
-            // 
-            // panelControl1
-            // 
-            this.panelControl1.Controls.Add(this.labelControl1);
-            this.panelControl1.Controls.Add(this.textEdit1);
-            this.panelControl1.Location = new System.Drawing.Point(189, 31);
-            this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(237, 39);
-            this.panelControl1.TabIndex = 0;
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(4, 8);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(68, 21);
-            this.labelControl1.TabIndex = 214;
-            this.labelControl1.Text = "鍗曟嵁缂栧彿";
-            // 
-            // textEdit1
-            // 
-            this.textEdit1.Location = new System.Drawing.Point(78, 5);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(155, 28);
-            this.textEdit1.TabIndex = 215;
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.labelControl2);
-            this.panel1.Controls.Add(this.textEdit4);
-            this.panel1.Location = new System.Drawing.Point(494, 31);
+            this.panel1.Controls.Add(this.layoutControl1);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(271, 100);
-            this.panel1.TabIndex = 2;
+            this.panel1.Size = new System.Drawing.Size(1057, 392);
+            this.panel1.TabIndex = 0;
             // 
-            // labelControl2
+            // layoutControl1
             // 
-            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(34, 40);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(73, 21);
-            this.labelControl2.TabIndex = 219;
-            this.labelControl2.Text = "鍗曟嵁绫诲瀷 ";
+            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.Root;
+            this.layoutControl1.Size = new System.Drawing.Size(1057, 392);
+            this.layoutControl1.TabIndex = 0;
+            this.layoutControl1.Text = "layoutControl1";
             // 
-            // textEdit4
+            // Root
             // 
-            this.textEdit4.Location = new System.Drawing.Point(113, 33);
-            this.textEdit4.Name = "textEdit4";
-            this.textEdit4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit4.Properties.Appearance.Options.UseFont = true;
-            this.textEdit4.Size = new System.Drawing.Size(155, 28);
-            this.textEdit4.TabIndex = 220;
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Name = "Root";
+            this.Root.OptionsCustomization.AllowDrag = DevExpress.XtraLayout.ItemDragDropMode.Allow;
+            this.Root.OptionsCustomization.AllowDrop = DevExpress.XtraLayout.ItemDragDropMode.Allow;
+            this.Root.Size = new System.Drawing.Size(1057, 392);
+            this.Root.TextVisible = false;
             // 
             // XtraForm1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1057, 660);
-            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.panel1);
             this.Name = "XtraForm1";
             this.Text = "XtraForm1";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            this.xtraTabPage1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
-            this.splitContainerControl1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
-            this.splitContainerControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
-            this.panelControl2.ResumeLayout(false);
-            this.panelControl2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
-            this.panelControl1.ResumeLayout(false);
-            this.panelControl1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
             this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billTypeId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_headDeliveryWay;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_headLocId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_custId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_saleDeptId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_salerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_changeReason;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_note;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_settleId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_approverId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_linkMan;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_chargeId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_linkPhone;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_creatorId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_modifierId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_modifyDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_approveDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_changeDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_cancellerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_versionNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_changerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_entryNote;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fbilltype;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrgId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_receiveId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_receiveContact;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
-        private DevExpress.XtraEditors.PanelControl panelControl2;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit textEdit2;
-        private DevExpress.XtraEditors.PanelControl panelControl1;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ToolTip toolTip1;
         private System.Windows.Forms.Panel panel1;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.TextEdit textEdit4;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
index a43388d..5ac81fb 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -1,4 +1,5 @@
 锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraLayout;
 using DevExpress.XtraRichEdit.Model;
 using Gs.DevApp.ToolBox;
 using System;
@@ -15,21 +16,14 @@
 {
     public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
     {
-        private Gs.DevApp.ToolBox.DragResizeHelp _drapHelp;
+        
         public XtraForm1()
         {
             InitializeComponent();
-           
-            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1);
-            this.xtraTabControl1.CustomHeaderButtonClick += XtraTabControl1_CustomHeaderButtonClick;
+            
         }
-
-        private void XtraTabControl1_CustomHeaderButtonClick(object sender, DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventArgs e)
-        {
-            _drapHelp.Show();
-        }
-
-     
-    
+ 
     }
+
+   
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
index 468543d..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
@@ -117,10 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>139, 17</value>
-  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index a48f65a..3642326 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,31 +1,32 @@
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.GalleryControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.GalleryControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
index f622ba7..a2f3b9b 100644
--- a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
+++ b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
@@ -21,7 +21,7 @@
         private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
         private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
         private System.ComponentModel.IContainer components = null;
-        private ToolTip toolTip;
+        //private ToolTip toolTip;
         #endregion
         #region Inner Object
         private enum EnumMousePointPosition
@@ -40,7 +40,7 @@
         #endregion
         public DragResizeHelp(DevExpress.XtraEditors.XtraForm frm, Control regBox)
         {
-            toolTip = new ToolTip();
+          //  toolTip = new ToolTip();
             this.components = new System.ComponentModel.Container();
             dragBox1 = regBox;
             this.components = new System.ComponentModel.Container();
@@ -180,7 +180,7 @@
                     //   isDragging = false;
                     dragBoxCurrentName = dockPanel1_Container.Name;
                 }
-                reloadLoaction(null);
+              //  reloadLoaction(null);
             }
             else if (dockPanel1_Container.Name == dragBoxCurrentName)
             {
@@ -227,7 +227,7 @@
                 });
                 menu.Items.Add($"涓�閿噸鎺�", null, (ss, ee) =>
                 {
-                    frm.ShowDialog();
+                    reloadLoaction((sender as Control).Parent);
                 });
                 menu.Show(control, e.Location);
             }
@@ -366,7 +366,7 @@
                 int height = control.Height;
                 Point[] ps =  { new Point(0, 0),new Point(width - 1, 0),
                 new Point(width - 1, height - 1),new Point(0, height - 1),new Point(0, 0) };
-                g.DrawLines(new Pen(Color.LightCoral), ps);
+                g.DrawLines(new Pen(Color.Pink), ps);
             }
             //  reloadLoaction();
             reloadMsg(lCtrl);
@@ -476,6 +476,7 @@
         private void reloadLoaction(Control cocccc)
         {
             int _top = 0;
+            //濡傛灉鏄帶浠剁锛屼笉绉籐eft
             if (dockPanel1_Container.Name == dragBoxCurrentName)
             {
                 foreach (Control col in dockPanel1_Container.Controls)
@@ -487,19 +488,22 @@
                 return;
             }
             if (cocccc == null) return;
-            int x = 15;
-            int y = 15;
+            //杩欐槸瀹瑰櫒
+            int x = 2;
+            int y = 2;
             foreach (Control btn in dragBox1.Controls)
             {
                 if (cocccc.Name == btn.Name)
                     continue;
-                //btn.Left = x;
-                //btn.Top = y;
-                x += btn.Width + 15;
+                if (cocccc.Visible ==false)
+                    continue;
+                btn.Left = x;
+                btn.Top = y;
+                x += btn.Width + 2;
                 if (btn.Width > dragBox1.Width - x)
                 {
-                    x = 15;
-                    y += btn.Height + 15;
+                    x = 2;
+                    y += btn.Height +2;
                 }
             }
             cocccc.Left = x;
@@ -515,7 +519,7 @@
             sb.Append(string.IsNullOrEmpty(dragBoxCurrentName) ? "琛ㄥ崟涓�" : "缁勪欢绠变腑");
             sb.Append("锛屽潗鏍�:" + cocccc.Location.ToString());
             sb.Append(",澶у皬锛�" + cocccc.Size.ToString());
-            toolTip.SetToolTip(ctrlCurrentObj, sb.ToString());
+           // toolTip.SetToolTip(ctrlCurrentObj, sb.ToString());
         }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
index 8ba0ba7..39ea454 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
@@ -54,7 +54,6 @@
             this.txtUrl.Name = "txtUrl";
             this.txtUrl.Size = new System.Drawing.Size(905, 24);
             this.txtUrl.TabIndex = 0;
-            this.txtUrl.Visible = false;
             // 
             // ShowFile
             // 
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
index 7ba6b7d..69905ec 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -22,7 +22,7 @@
             lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
             lookSearchSupplier.EditValueChanged +=
                 LookSearchSupplier_EditValueChanged;
-            getSuppler();
+          //  getSuppler();
         }
 
         public bool IsReadly { get; set; }
@@ -37,10 +37,19 @@
         {
             if (EditChanged != null) EditChanged(this, e);
         }
-
-        private void getSuppler()
+        /// <summary>
+        /// 璇诲彇閿�鍞鍗�
+        /// </summary>
+        /// <param name="orgId"></param>
+        /// <param name="_dftVale"></param>
+        public void getSuppler(string orgId, string _dftVale = "")
         {
-            var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "", " and 1=1");
+            lookSearchSupplier.EditValue = null;
+            string _keyWhere = "";
+            if (!string.IsNullOrEmpty(orgId))
+                _keyWhere = " and a.erp_sczz ='" + orgId + "'";
+            var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "",
+                " and 1=1" + _keyWhere);
             var json = JsonConvert.SerializeObject(pgq);
             try
             {
@@ -52,7 +61,8 @@
                 lookSearchSupplier.Properties.ValueMember = "id";
                 lookSearchSupplier.ForceInitialize();
                 lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
-
+                if (!string.IsNullOrEmpty(_dftVale))
+                    SetIdOrCode(_dftVale);
             }
             catch (Exception ex)
             {
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 758f5ad..00a0424 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -4,15 +4,21 @@
 using System.Data;
 using System.Linq;
 using System.Net;
+using System.Windows.Controls.Primitives;
 using System.Windows.Forms;
 using DevExpress.XtraBars;
 using DevExpress.XtraBars.Commands;
 using DevExpress.XtraEditors;
+using DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Columns;
+using DevExpress.XtraGrid.Menu;
+using DevExpress.XtraGrid.Views.Grid;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Gs.DevApp.UserControl
 {
@@ -652,9 +658,25 @@
             Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg);
         }
 
-        private void BtnLayout_ItemClick(object sender, ItemClickEventArgs e)
+        private void BtnLayout_ItemClick(object sender, ItemClickEventArgs ee)
         {
-            if (btnLayoutClick != null) btnLayoutClick(this, e);
+            Form parentForm = this.Parent as Form;
+            string _formNamespace = parentForm.GetType().FullName;
+            if (parentForm != null)
+            {
+                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                GridControl gcMain = parentForm.Controls.Find("gcMain", true).OfType<GridControl>().FirstOrDefault();
+                if (gcMain != null) {
+                    GridView gv1 = gcMain.MainView as GridView;
+                    if (gv1 != null)
+                    {
+                        gvList.Add(gv1);
+                    }
+                }
+                Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
+                DevFrm.ShowDialog();
+            }
+            if (btnLayoutClick != null) btnLayoutClick(this, ee);
         }
         private void _enabledBtn(List<string> lstBtn)
         {

--
Gitblit v1.9.3