From 5e376d06404a16cb3c82a93cff351c5315bbcfe3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 28 六月 2025 16:10:22 +0800
Subject: [PATCH] 客户多打印

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs |  639 ++++++++++++++++++++++++----------------------------------
 1 files changed, 264 insertions(+), 375 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 4c47b66..889b4cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -171,6 +171,13 @@
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -200,18 +207,11 @@
             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.gvMx1supplyOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1settleOrgIds = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -227,13 +227,6 @@
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -328,12 +321,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
@@ -341,6 +328,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).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.SuspendLayout();
             // 
             // toolBarMenu1
@@ -354,7 +347,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1256, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1570, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -365,7 +358,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1256, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1570, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -375,7 +368,7 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1254, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1568, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -396,7 +389,7 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1254, 570);
+            this.split1.Size = new System.Drawing.Size(1568, 570);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
@@ -406,7 +399,7 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1254, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1568, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -975,7 +968,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1254, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1568, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -983,7 +976,7 @@
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1254, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1568, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -1003,8 +996,8 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1254, 570);
-            this.splitMx1.SplitterPosition = 307;
+            this.splitMx1.Size = new System.Drawing.Size(1568, 570);
+            this.splitMx1.SplitterPosition = 267;
             this.splitMx1.TabIndex = 4;
             // 
             // layoutMx1
@@ -1063,7 +1056,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(667, 301, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1254, 307);
+            this.layoutMx1.Size = new System.Drawing.Size(1568, 267);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -1077,19 +1070,19 @@
             // 
             // txt_receiveContact
             // 
-            this.txt_receiveContact.Location = new System.Drawing.Point(1023, 171);
+            this.txt_receiveContact.Location = new System.Drawing.Point(1244, 152);
             this.txt_receiveContact.Name = "txt_receiveContact";
             this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiveContact.Size = new System.Drawing.Size(219, 24);
+            this.txt_receiveContact.Size = new System.Drawing.Size(291, 24);
             this.txt_receiveContact.StyleController = this.layoutMx1;
             this.txt_receiveContact.TabIndex = 427;
             // 
             // txt_receiveId
             // 
-            this.txt_receiveId.Location = new System.Drawing.Point(1023, 75);
+            this.txt_receiveId.Location = new System.Drawing.Point(1244, 68);
             this.txt_receiveId.Name = "txt_receiveId";
             this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiveId.Size = new System.Drawing.Size(219, 24);
+            this.txt_receiveId.Size = new System.Drawing.Size(291, 24);
             this.txt_receiveId.StyleController = this.layoutMx1;
             this.txt_receiveId.TabIndex = 425;
             // 
@@ -1113,172 +1106,172 @@
             // 
             // txt_changerId
             // 
-            this.txt_changerId.Location = new System.Drawing.Point(1023, 203);
+            this.txt_changerId.Location = new System.Drawing.Point(1244, 180);
             this.txt_changerId.Name = "txt_changerId";
             this.txt_changerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_changerId.Size = new System.Drawing.Size(219, 24);
+            this.txt_changerId.Size = new System.Drawing.Size(291, 24);
             this.txt_changerId.StyleController = this.layoutMx1;
             this.txt_changerId.TabIndex = 378;
             // 
             // txt_versionNo
             // 
-            this.txt_versionNo.Location = new System.Drawing.Point(99, 203);
+            this.txt_versionNo.Location = new System.Drawing.Point(99, 180);
             this.txt_versionNo.Name = "txt_versionNo";
             this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_versionNo.Size = new System.Drawing.Size(217, 24);
+            this.txt_versionNo.Size = new System.Drawing.Size(290, 24);
             this.txt_versionNo.StyleController = this.layoutMx1;
             this.txt_versionNo.TabIndex = 376;
             // 
             // txt_cancellerId
             // 
-            this.txt_cancellerId.Location = new System.Drawing.Point(407, 203);
+            this.txt_cancellerId.Location = new System.Drawing.Point(480, 180);
             this.txt_cancellerId.Name = "txt_cancellerId";
             this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancellerId.Size = new System.Drawing.Size(217, 24);
+            this.txt_cancellerId.Size = new System.Drawing.Size(291, 24);
             this.txt_cancellerId.StyleController = this.layoutMx1;
             this.txt_cancellerId.TabIndex = 374;
             // 
             // txt_cancelStatusTxt
             // 
-            this.txt_cancelStatusTxt.Location = new System.Drawing.Point(407, 235);
+            this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 208);
             this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt";
             this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelStatusTxt.Size = new System.Drawing.Size(217, 24);
+            this.txt_cancelStatusTxt.Size = new System.Drawing.Size(291, 24);
             this.txt_cancelStatusTxt.StyleController = this.layoutMx1;
             this.txt_cancelStatusTxt.TabIndex = 372;
             // 
             // txt_changeDate
             // 
-            this.txt_changeDate.Location = new System.Drawing.Point(1023, 235);
+            this.txt_changeDate.Location = new System.Drawing.Point(1244, 208);
             this.txt_changeDate.Name = "txt_changeDate";
             this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_changeDate.Size = new System.Drawing.Size(219, 24);
+            this.txt_changeDate.Size = new System.Drawing.Size(291, 24);
             this.txt_changeDate.StyleController = this.layoutMx1;
             this.txt_changeDate.TabIndex = 344;
             // 
             // txt_closeDate
             // 
-            this.txt_closeDate.Location = new System.Drawing.Point(715, 267);
+            this.txt_closeDate.Location = new System.Drawing.Point(862, 236);
             this.txt_closeDate.Name = "txt_closeDate";
             this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeDate.Size = new System.Drawing.Size(217, 24);
+            this.txt_closeDate.Size = new System.Drawing.Size(291, 24);
             this.txt_closeDate.StyleController = this.layoutMx1;
             this.txt_closeDate.TabIndex = 342;
             // 
             // txt_closerId
             // 
-            this.txt_closerId.Location = new System.Drawing.Point(715, 235);
+            this.txt_closerId.Location = new System.Drawing.Point(862, 208);
             this.txt_closerId.Name = "txt_closerId";
             this.txt_closerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_closerId.Size = new System.Drawing.Size(217, 24);
+            this.txt_closerId.Size = new System.Drawing.Size(291, 24);
             this.txt_closerId.StyleController = this.layoutMx1;
             this.txt_closerId.TabIndex = 340;
             // 
             // txt_approveDate
             // 
-            this.txt_approveDate.Location = new System.Drawing.Point(407, 107);
+            this.txt_approveDate.Location = new System.Drawing.Point(480, 96);
             this.txt_approveDate.Name = "txt_approveDate";
             this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_approveDate.Size = new System.Drawing.Size(217, 24);
+            this.txt_approveDate.Size = new System.Drawing.Size(291, 24);
             this.txt_approveDate.StyleController = this.layoutMx1;
             this.txt_approveDate.TabIndex = 338;
             // 
             // txt_modifyDate
             // 
-            this.txt_modifyDate.Location = new System.Drawing.Point(715, 171);
+            this.txt_modifyDate.Location = new System.Drawing.Point(862, 152);
             this.txt_modifyDate.Name = "txt_modifyDate";
             this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifyDate.Size = new System.Drawing.Size(217, 24);
+            this.txt_modifyDate.Size = new System.Drawing.Size(291, 24);
             this.txt_modifyDate.StyleController = this.layoutMx1;
             this.txt_modifyDate.TabIndex = 314;
             // 
             // txt_modifierId
             // 
-            this.txt_modifierId.Location = new System.Drawing.Point(715, 139);
+            this.txt_modifierId.Location = new System.Drawing.Point(862, 124);
             this.txt_modifierId.Name = "txt_modifierId";
             this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifierId.Size = new System.Drawing.Size(217, 24);
+            this.txt_modifierId.Size = new System.Drawing.Size(291, 24);
             this.txt_modifierId.StyleController = this.layoutMx1;
             this.txt_modifierId.TabIndex = 312;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(407, 171);
+            this.txt_createDate.Location = new System.Drawing.Point(480, 152);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(217, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(291, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 310;
             // 
             // txt_creatorId
             // 
-            this.txt_creatorId.Location = new System.Drawing.Point(407, 139);
+            this.txt_creatorId.Location = new System.Drawing.Point(480, 124);
             this.txt_creatorId.Name = "txt_creatorId";
             this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_creatorId.Size = new System.Drawing.Size(217, 24);
+            this.txt_creatorId.Size = new System.Drawing.Size(291, 24);
             this.txt_creatorId.StyleController = this.layoutMx1;
             this.txt_creatorId.TabIndex = 308;
             // 
             // txt_linkPhone
             // 
-            this.txt_linkPhone.Location = new System.Drawing.Point(1023, 139);
+            this.txt_linkPhone.Location = new System.Drawing.Point(1244, 124);
             this.txt_linkPhone.Name = "txt_linkPhone";
             this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
-            this.txt_linkPhone.Size = new System.Drawing.Size(219, 24);
+            this.txt_linkPhone.Size = new System.Drawing.Size(291, 24);
             this.txt_linkPhone.StyleController = this.layoutMx1;
             this.txt_linkPhone.TabIndex = 288;
             // 
             // txt_chargeId
             // 
-            this.txt_chargeId.Location = new System.Drawing.Point(715, 75);
+            this.txt_chargeId.Location = new System.Drawing.Point(862, 68);
             this.txt_chargeId.Name = "txt_chargeId";
             this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
-            this.txt_chargeId.Size = new System.Drawing.Size(217, 24);
+            this.txt_chargeId.Size = new System.Drawing.Size(291, 24);
             this.txt_chargeId.StyleController = this.layoutMx1;
             this.txt_chargeId.TabIndex = 286;
             // 
             // txt_linkMan
             // 
-            this.txt_linkMan.Location = new System.Drawing.Point(1023, 107);
+            this.txt_linkMan.Location = new System.Drawing.Point(1244, 96);
             this.txt_linkMan.Name = "txt_linkMan";
             this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
-            this.txt_linkMan.Size = new System.Drawing.Size(219, 24);
+            this.txt_linkMan.Size = new System.Drawing.Size(291, 24);
             this.txt_linkMan.StyleController = this.layoutMx1;
             this.txt_linkMan.TabIndex = 284;
             // 
             // txt_approverId
             // 
-            this.txt_approverId.Location = new System.Drawing.Point(407, 75);
+            this.txt_approverId.Location = new System.Drawing.Point(480, 68);
             this.txt_approverId.Name = "txt_approverId";
             this.txt_approverId.Properties.Appearance.Options.UseFont = true;
-            this.txt_approverId.Size = new System.Drawing.Size(217, 24);
+            this.txt_approverId.Size = new System.Drawing.Size(291, 24);
             this.txt_approverId.StyleController = this.layoutMx1;
             this.txt_approverId.TabIndex = 282;
             // 
             // txt_settleId
             // 
-            this.txt_settleId.Location = new System.Drawing.Point(715, 107);
+            this.txt_settleId.Location = new System.Drawing.Point(862, 96);
             this.txt_settleId.Name = "txt_settleId";
             this.txt_settleId.Properties.Appearance.Options.UseFont = true;
-            this.txt_settleId.Size = new System.Drawing.Size(217, 24);
+            this.txt_settleId.Size = new System.Drawing.Size(291, 24);
             this.txt_settleId.StyleController = this.layoutMx1;
             this.txt_settleId.TabIndex = 265;
             // 
             // txt_note
             // 
-            this.txt_note.Location = new System.Drawing.Point(99, 235);
+            this.txt_note.Location = new System.Drawing.Point(99, 208);
             this.txt_note.Name = "txt_note";
             this.txt_note.Properties.Appearance.Options.UseFont = true;
-            this.txt_note.Size = new System.Drawing.Size(217, 24);
+            this.txt_note.Size = new System.Drawing.Size(290, 24);
             this.txt_note.StyleController = this.layoutMx1;
             this.txt_note.TabIndex = 263;
             // 
             // txt_changeReason
             // 
-            this.txt_changeReason.Location = new System.Drawing.Point(1023, 267);
+            this.txt_changeReason.Location = new System.Drawing.Point(1244, 236);
             this.txt_changeReason.Name = "txt_changeReason";
             this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_changeReason.Size = new System.Drawing.Size(219, 24);
+            this.txt_changeReason.Size = new System.Drawing.Size(291, 24);
             this.txt_changeReason.StyleController = this.layoutMx1;
             this.txt_changeReason.TabIndex = 261;
             // 
@@ -1302,10 +1295,10 @@
             // 
             // txt_closeStatusTxt
             // 
-            this.txt_closeStatusTxt.Location = new System.Drawing.Point(715, 203);
+            this.txt_closeStatusTxt.Location = new System.Drawing.Point(862, 180);
             this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
             this.txt_closeStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeStatusTxt.Size = new System.Drawing.Size(217, 24);
+            this.txt_closeStatusTxt.Size = new System.Drawing.Size(291, 24);
             this.txt_closeStatusTxt.StyleController = this.layoutMx1;
             this.txt_closeStatusTxt.TabIndex = 247;
             // 
@@ -1320,64 +1313,64 @@
             // 
             // txt_headLocId
             // 
-            this.txt_headLocId.Location = new System.Drawing.Point(1023, 43);
+            this.txt_headLocId.Location = new System.Drawing.Point(1244, 40);
             this.txt_headLocId.Name = "txt_headLocId";
             this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
-            this.txt_headLocId.Size = new System.Drawing.Size(219, 24);
+            this.txt_headLocId.Size = new System.Drawing.Size(291, 24);
             this.txt_headLocId.StyleController = this.layoutMx1;
             this.txt_headLocId.TabIndex = 243;
             // 
             // txt_headDeliveryWay
             // 
-            this.txt_headDeliveryWay.Location = new System.Drawing.Point(1023, 12);
+            this.txt_headDeliveryWay.Location = new System.Drawing.Point(1244, 12);
             this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
             this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
-            this.txt_headDeliveryWay.Size = new System.Drawing.Size(219, 24);
+            this.txt_headDeliveryWay.Size = new System.Drawing.Size(291, 24);
             this.txt_headDeliveryWay.StyleController = this.layoutMx1;
             this.txt_headDeliveryWay.TabIndex = 235;
             // 
             // txt_businessTypeTxt
             // 
-            this.txt_businessTypeTxt.Location = new System.Drawing.Point(715, 43);
+            this.txt_businessTypeTxt.Location = new System.Drawing.Point(862, 40);
             this.txt_businessTypeTxt.Name = "txt_businessTypeTxt";
             this.txt_businessTypeTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_businessTypeTxt.Size = new System.Drawing.Size(217, 24);
+            this.txt_businessTypeTxt.Size = new System.Drawing.Size(291, 24);
             this.txt_businessTypeTxt.StyleController = this.layoutMx1;
             this.txt_businessTypeTxt.TabIndex = 233;
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(407, 43);
+            this.txt_fDate.Location = new System.Drawing.Point(480, 40);
             this.txt_fDate.Name = "txt_fDate";
             this.txt_fDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fDate.Size = new System.Drawing.Size(217, 24);
+            this.txt_fDate.Size = new System.Drawing.Size(291, 24);
             this.txt_fDate.StyleController = this.layoutMx1;
             this.txt_fDate.TabIndex = 231;
             // 
             // txt_billTypeId
             // 
-            this.txt_billTypeId.Location = new System.Drawing.Point(715, 12);
+            this.txt_billTypeId.Location = new System.Drawing.Point(862, 12);
             this.txt_billTypeId.Name = "txt_billTypeId";
             this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
-            this.txt_billTypeId.Size = new System.Drawing.Size(217, 24);
+            this.txt_billTypeId.Size = new System.Drawing.Size(291, 24);
             this.txt_billTypeId.StyleController = this.layoutMx1;
             this.txt_billTypeId.TabIndex = 219;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(407, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(480, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(217, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(291, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 216;
             // 
             // txt_documentStatusTxt
             // 
-            this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 43);
+            this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 40);
             this.txt_documentStatusTxt.Name = "txt_documentStatusTxt";
             this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentStatusTxt.Size = new System.Drawing.Size(217, 24);
+            this.txt_documentStatusTxt.Size = new System.Drawing.Size(290, 24);
             this.txt_documentStatusTxt.StyleController = this.layoutMx1;
             this.txt_documentStatusTxt.TabIndex = 229;
             // 
@@ -1386,7 +1379,7 @@
             this.txt_erpId.Location = new System.Drawing.Point(99, 12);
             this.txt_erpId.Name = "txt_erpId";
             this.txt_erpId.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpId.Size = new System.Drawing.Size(217, 24);
+            this.txt_erpId.Size = new System.Drawing.Size(290, 24);
             this.txt_erpId.StyleController = this.layoutMx1;
             this.txt_erpId.TabIndex = 214;
             // 
@@ -1402,33 +1395,33 @@
             // 
             // txt_xsOrgName
             // 
-            this.txt_xsOrgName.Location = new System.Drawing.Point(99, 107);
+            this.txt_xsOrgName.Location = new System.Drawing.Point(99, 96);
             this.txt_xsOrgName.Name = "txt_xsOrgName";
-            this.txt_xsOrgName.Size = new System.Drawing.Size(217, 24);
+            this.txt_xsOrgName.Size = new System.Drawing.Size(290, 24);
             this.txt_xsOrgName.StyleController = this.layoutMx1;
             this.txt_xsOrgName.TabIndex = 429;
             // 
             // txt_salerName
             // 
-            this.txt_salerName.Location = new System.Drawing.Point(99, 171);
+            this.txt_salerName.Location = new System.Drawing.Point(99, 152);
             this.txt_salerName.Name = "txt_salerName";
-            this.txt_salerName.Size = new System.Drawing.Size(217, 24);
+            this.txt_salerName.Size = new System.Drawing.Size(290, 24);
             this.txt_salerName.StyleController = this.layoutMx1;
             this.txt_salerName.TabIndex = 430;
             // 
             // txt_custName
             // 
-            this.txt_custName.Location = new System.Drawing.Point(99, 139);
+            this.txt_custName.Location = new System.Drawing.Point(99, 124);
             this.txt_custName.Name = "txt_custName";
-            this.txt_custName.Size = new System.Drawing.Size(217, 24);
+            this.txt_custName.Size = new System.Drawing.Size(290, 24);
             this.txt_custName.StyleController = this.layoutMx1;
             this.txt_custName.TabIndex = 431;
             // 
             // txt_saleDeptName
             // 
-            this.txt_saleDeptName.Location = new System.Drawing.Point(99, 75);
+            this.txt_saleDeptName.Location = new System.Drawing.Point(99, 68);
             this.txt_saleDeptName.Name = "txt_saleDeptName";
-            this.txt_saleDeptName.Size = new System.Drawing.Size(217, 24);
+            this.txt_saleDeptName.Size = new System.Drawing.Size(290, 24);
             this.txt_saleDeptName.StyleController = this.layoutMx1;
             this.txt_saleDeptName.TabIndex = 432;
             // 
@@ -1589,49 +1582,49 @@
             rowDefinition7,
             rowDefinition8,
             rowDefinition9});
-            this.Root.Size = new System.Drawing.Size(1254, 307);
+            this.Root.Size = new System.Drawing.Size(1547, 272);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_documentStatusTxt;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_fDate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(308, 31);
+            this.layoutControlItem6.Location = new System.Drawing.Point(381, 28);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_businessTypeTxt;
-            this.layoutControlItem7.Location = new System.Drawing.Point(616, 31);
+            this.layoutControlItem7.Location = new System.Drawing.Point(763, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_linkPhone;
-            this.layoutControlItem20.Location = new System.Drawing.Point(924, 127);
+            this.layoutControlItem20.Location = new System.Drawing.Point(1145, 112);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem20.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -1640,243 +1633,319 @@
             this.layoutControlItem2.Control = this.txt_erpId;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(308, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem2.Text = "ERPID";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_billNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(308, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(381, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(308, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_billTypeId;
-            this.layoutControlItem5.Location = new System.Drawing.Point(616, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(763, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(308, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_headDeliveryWay;
-            this.layoutControlItem8.Location = new System.Drawing.Point(924, 0);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1145, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(310, 31);
+            this.layoutControlItem8.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem37
             // 
             this.layoutControlItem37.Control = this.txt_receiveContact;
-            this.layoutControlItem37.Location = new System.Drawing.Point(924, 159);
+            this.layoutControlItem37.Location = new System.Drawing.Point(1145, 140);
             this.layoutControlItem37.Name = "layoutControlItem37";
             this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem37.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem37.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem41
             // 
             this.layoutControlItem41.Control = this.txt_custName;
-            this.layoutControlItem41.Location = new System.Drawing.Point(0, 127);
+            this.layoutControlItem41.Location = new System.Drawing.Point(0, 112);
             this.layoutControlItem41.Name = "layoutControlItem41";
             this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem41.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem41.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
             this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
             // 
             // lab_saleDeptName
             // 
             this.lab_saleDeptName.Control = this.txt_saleDeptName;
-            this.lab_saleDeptName.Location = new System.Drawing.Point(0, 63);
+            this.lab_saleDeptName.Location = new System.Drawing.Point(0, 56);
             this.lab_saleDeptName.Name = "lab_saleDeptName";
             this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2;
-            this.lab_saleDeptName.Size = new System.Drawing.Size(308, 32);
+            this.lab_saleDeptName.Size = new System.Drawing.Size(381, 28);
             this.lab_saleDeptName.Text = "閿�鍞儴闂�";
             this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem39
             // 
             this.layoutControlItem39.Control = this.txt_xsOrgName;
-            this.layoutControlItem39.Location = new System.Drawing.Point(0, 95);
+            this.layoutControlItem39.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem39.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem39.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem39.Text = "閿�鍞粍缁�";
             this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem40
             // 
             this.layoutControlItem40.Control = this.txt_salerName;
-            this.layoutControlItem40.Location = new System.Drawing.Point(0, 159);
+            this.layoutControlItem40.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem40.Name = "layoutControlItem40";
             this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem40.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem40.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem40.Text = "閿�鍞憳鍚�";
             this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_headLocId;
-            this.layoutControlItem9.Location = new System.Drawing.Point(924, 31);
+            this.layoutControlItem9.Location = new System.Drawing.Point(1145, 28);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem36
             // 
             this.layoutControlItem36.Control = this.txt_receiveId;
-            this.layoutControlItem36.Location = new System.Drawing.Point(924, 63);
+            this.layoutControlItem36.Location = new System.Drawing.Point(1145, 56);
             this.layoutControlItem36.Name = "layoutControlItem36";
             this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem36.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem36.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem36.Text = "鏀惰揣鏂�";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_linkMan;
-            this.layoutControlItem18.Location = new System.Drawing.Point(924, 95);
+            this.layoutControlItem18.Location = new System.Drawing.Point(1145, 84);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem18.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_chargeId;
-            this.layoutControlItem19.Location = new System.Drawing.Point(616, 63);
+            this.layoutControlItem19.Location = new System.Drawing.Point(763, 56);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem19.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem19.Text = "浠樻鏂�";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_settleId;
-            this.layoutControlItem16.Location = new System.Drawing.Point(616, 95);
+            this.layoutControlItem16.Location = new System.Drawing.Point(763, 84);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem16.Text = "缁撶畻鏂�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.txt_modifierId;
-            this.layoutControlItem23.Location = new System.Drawing.Point(616, 127);
+            this.layoutControlItem23.Location = new System.Drawing.Point(763, 112);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem23.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem23.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem23.Text = "淇敼浜哄憳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txt_modifyDate;
-            this.layoutControlItem24.Location = new System.Drawing.Point(616, 159);
+            this.layoutControlItem24.Location = new System.Drawing.Point(763, 140);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem24.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem24.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem24.Text = "淇敼鏃ユ湡";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_closeDate;
-            this.layoutControlItem27.Location = new System.Drawing.Point(616, 255);
+            this.layoutControlItem27.Location = new System.Drawing.Point(763, 224);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem27.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem27.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem26
             // 
             this.layoutControlItem26.Control = this.txt_closerId;
-            this.layoutControlItem26.Location = new System.Drawing.Point(616, 223);
+            this.layoutControlItem26.Location = new System.Drawing.Point(763, 196);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem26.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_closeStatusTxt;
-            this.layoutControlItem11.Location = new System.Drawing.Point(616, 191);
+            this.layoutControlItem11.Location = new System.Drawing.Point(763, 168);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem11.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.txt_versionNo;
-            this.layoutControlItem31.Location = new System.Drawing.Point(0, 191);
+            this.layoutControlItem31.Location = new System.Drawing.Point(0, 168);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem31.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem31.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem31.Text = "鐗堟湰鍙�";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_changerId;
-            this.layoutControlItem32.Location = new System.Drawing.Point(924, 191);
+            this.layoutControlItem32.Location = new System.Drawing.Point(1145, 168);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem32.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem32.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem32.Text = "鍙樻洿浜哄憳";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_changeDate;
-            this.layoutControlItem28.Location = new System.Drawing.Point(924, 223);
+            this.layoutControlItem28.Location = new System.Drawing.Point(1145, 196);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem28.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem28.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_changeReason;
-            this.layoutControlItem14.Location = new System.Drawing.Point(924, 255);
+            this.layoutControlItem14.Location = new System.Drawing.Point(1145, 224);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem14.Size = new System.Drawing.Size(310, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_note;
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem15.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_approverId;
+            this.layoutControlItem17.Location = new System.Drawing.Point(381, 56);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem17.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_approveDate;
+            this.layoutControlItem25.Location = new System.Drawing.Point(381, 84);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem25.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_creatorId;
+            this.layoutControlItem21.Location = new System.Drawing.Point(381, 112);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem21.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_createDate;
+            this.layoutControlItem22.Location = new System.Drawing.Point(381, 140);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem22.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_cancellerId;
+            this.layoutControlItem30.Location = new System.Drawing.Point(381, 168);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem30.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem30.Text = "浣滃簾浜哄憳";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
+            this.layoutControlItem29.Location = new System.Drawing.Point(381, 196);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem29.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -1884,7 +1953,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1254, 251);
+            this.tabMx.Size = new System.Drawing.Size(1568, 291);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1893,7 +1962,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1252, 219);
+            this.tabMxPage1.Size = new System.Drawing.Size(1566, 259);
             this.tabMxPage1.Text = "閿�鍞槑缁�";
             // 
             // gcMx1
@@ -1902,7 +1971,7 @@
             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(1252, 219);
+            this.gcMx1.Size = new System.Drawing.Size(1566, 259);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1935,18 +2004,11 @@
             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.gvMx1supplyOrgId,
             this.gvMx1stockOrgId,
             this.gvMx1settleOrgIds,
@@ -2039,7 +2101,7 @@
             this.gvMx1qty.Name = "gvMx1qty";
             this.gvMx1qty.Tag = "query_a.qty";
             this.gvMx1qty.Visible = true;
-            this.gvMx1qty.VisibleIndex = 2;
+            this.gvMx1qty.VisibleIndex = 5;
             this.gvMx1qty.Width = 94;
             // 
             // gvMx1priceUnitId
@@ -2061,7 +2123,7 @@
             this.gvMx1priceUnitQty.Name = "gvMx1priceUnitQty";
             this.gvMx1priceUnitQty.Tag = "query_a.price_unit_qty";
             this.gvMx1priceUnitQty.Visible = true;
-            this.gvMx1priceUnitQty.VisibleIndex = 3;
+            this.gvMx1priceUnitQty.VisibleIndex = 6;
             this.gvMx1priceUnitQty.Width = 94;
             // 
             // gvMx1deliveryDate
@@ -2073,7 +2135,7 @@
             this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
             this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
             this.gvMx1deliveryDate.Visible = true;
-            this.gvMx1deliveryDate.VisibleIndex = 4;
+            this.gvMx1deliveryDate.VisibleIndex = 9;
             this.gvMx1deliveryDate.Width = 94;
             // 
             // gvMx1isFree
@@ -2085,7 +2147,7 @@
             this.gvMx1isFree.Name = "gvMx1isFree";
             this.gvMx1isFree.Tag = "query_a.is_free";
             this.gvMx1isFree.Visible = true;
-            this.gvMx1isFree.VisibleIndex = 5;
+            this.gvMx1isFree.VisibleIndex = 10;
             this.gvMx1isFree.Width = 94;
             // 
             // gvMx1ownerTypeId
@@ -2097,7 +2159,7 @@
             this.gvMx1ownerTypeId.Name = "gvMx1ownerTypeId";
             this.gvMx1ownerTypeId.Tag = "query_a.owner_type_id";
             this.gvMx1ownerTypeId.Visible = true;
-            this.gvMx1ownerTypeId.VisibleIndex = 6;
+            this.gvMx1ownerTypeId.VisibleIndex = 25;
             this.gvMx1ownerTypeId.Width = 94;
             // 
             // gvMx1ownerId
@@ -2109,7 +2171,7 @@
             this.gvMx1ownerId.Name = "gvMx1ownerId";
             this.gvMx1ownerId.Tag = "query_a.owner_id";
             this.gvMx1ownerId.Visible = true;
-            this.gvMx1ownerId.VisibleIndex = 7;
+            this.gvMx1ownerId.VisibleIndex = 26;
             this.gvMx1ownerId.Width = 94;
             // 
             // gvMx1entryNote
@@ -2121,7 +2183,7 @@
             this.gvMx1entryNote.Name = "gvMx1entryNote";
             this.gvMx1entryNote.Tag = "query_a.entry_note";
             this.gvMx1entryNote.Visible = true;
-            this.gvMx1entryNote.VisibleIndex = 8;
+            this.gvMx1entryNote.VisibleIndex = 11;
             this.gvMx1entryNote.Width = 94;
             // 
             // gvMx1mtoNo
@@ -2133,7 +2195,7 @@
             this.gvMx1mtoNo.Name = "gvMx1mtoNo";
             this.gvMx1mtoNo.Tag = "query_a.mto_no";
             this.gvMx1mtoNo.Visible = true;
-            this.gvMx1mtoNo.VisibleIndex = 9;
+            this.gvMx1mtoNo.VisibleIndex = 12;
             this.gvMx1mtoNo.Width = 94;
             // 
             // gvMx1lot
@@ -2145,7 +2207,7 @@
             this.gvMx1lot.Name = "gvMx1lot";
             this.gvMx1lot.Tag = "query_a.lot";
             this.gvMx1lot.Visible = true;
-            this.gvMx1lot.VisibleIndex = 10;
+            this.gvMx1lot.VisibleIndex = 13;
             this.gvMx1lot.Width = 94;
             // 
             // gvMx1deliveryMaxQty
@@ -2157,7 +2219,7 @@
             this.gvMx1deliveryMaxQty.Name = "gvMx1deliveryMaxQty";
             this.gvMx1deliveryMaxQty.Tag = "query_a.delivery_max_qty";
             this.gvMx1deliveryMaxQty.Visible = true;
-            this.gvMx1deliveryMaxQty.VisibleIndex = 11;
+            this.gvMx1deliveryMaxQty.VisibleIndex = 14;
             this.gvMx1deliveryMaxQty.Width = 94;
             // 
             // gvMx1deliveryMinQty
@@ -2169,7 +2231,7 @@
             this.gvMx1deliveryMinQty.Name = "gvMx1deliveryMinQty";
             this.gvMx1deliveryMinQty.Tag = "query_a.delivery_min_qty";
             this.gvMx1deliveryMinQty.Visible = true;
-            this.gvMx1deliveryMinQty.VisibleIndex = 12;
+            this.gvMx1deliveryMinQty.VisibleIndex = 15;
             this.gvMx1deliveryMinQty.Width = 94;
             // 
             // gvMx1outLmtUnitId
@@ -2186,24 +2248,24 @@
             // 
             this.gvMx1mrpCloseStatus.AppearanceCell.Options.UseFont = true;
             this.gvMx1mrpCloseStatus.Caption = "涓氬姟鍏抽棴 ";
-            this.gvMx1mrpCloseStatus.FieldName = "mrpCloseStatus";
+            this.gvMx1mrpCloseStatus.FieldName = "mrpCloseStatusTxt";
             this.gvMx1mrpCloseStatus.MinWidth = 50;
             this.gvMx1mrpCloseStatus.Name = "gvMx1mrpCloseStatus";
             this.gvMx1mrpCloseStatus.Tag = "query_a.mrp_close_status";
             this.gvMx1mrpCloseStatus.Visible = true;
-            this.gvMx1mrpCloseStatus.VisibleIndex = 13;
+            this.gvMx1mrpCloseStatus.VisibleIndex = 16;
             this.gvMx1mrpCloseStatus.Width = 94;
             // 
             // gvMx1mrpTerminateStatus
             // 
             this.gvMx1mrpTerminateStatus.AppearanceCell.Options.UseFont = true;
             this.gvMx1mrpTerminateStatus.Caption = "涓氬姟缁堟 ";
-            this.gvMx1mrpTerminateStatus.FieldName = "mrpTerminateStatus";
+            this.gvMx1mrpTerminateStatus.FieldName = "mrpTerminateStatusTxt";
             this.gvMx1mrpTerminateStatus.MinWidth = 50;
             this.gvMx1mrpTerminateStatus.Name = "gvMx1mrpTerminateStatus";
             this.gvMx1mrpTerminateStatus.Tag = "query_a.mrp_terminate_status";
             this.gvMx1mrpTerminateStatus.Visible = true;
-            this.gvMx1mrpTerminateStatus.VisibleIndex = 14;
+            this.gvMx1mrpTerminateStatus.VisibleIndex = 17;
             this.gvMx1mrpTerminateStatus.Width = 94;
             // 
             // gvMx1terminateDate
@@ -2215,7 +2277,7 @@
             this.gvMx1terminateDate.Name = "gvMx1terminateDate";
             this.gvMx1terminateDate.Tag = "query_a.terminate_date";
             this.gvMx1terminateDate.Visible = true;
-            this.gvMx1terminateDate.VisibleIndex = 15;
+            this.gvMx1terminateDate.VisibleIndex = 18;
             this.gvMx1terminateDate.Width = 94;
             // 
             // gvMx1terminaterId
@@ -2227,7 +2289,7 @@
             this.gvMx1terminaterId.Name = "gvMx1terminaterId";
             this.gvMx1terminaterId.Tag = "query_a.terminater_id";
             this.gvMx1terminaterId.Visible = true;
-            this.gvMx1terminaterId.VisibleIndex = 16;
+            this.gvMx1terminaterId.VisibleIndex = 19;
             this.gvMx1terminaterId.Width = 94;
             // 
             // gvMx1srcType
@@ -2239,7 +2301,7 @@
             this.gvMx1srcType.Name = "gvMx1srcType";
             this.gvMx1srcType.Tag = "query_a.src_type";
             this.gvMx1srcType.Visible = true;
-            this.gvMx1srcType.VisibleIndex = 17;
+            this.gvMx1srcType.VisibleIndex = 20;
             this.gvMx1srcType.Width = 94;
             // 
             // gvMx1srcBillNo
@@ -2251,80 +2313,32 @@
             this.gvMx1srcBillNo.Name = "gvMx1srcBillNo";
             this.gvMx1srcBillNo.Tag = "query_a.src_bill_no";
             this.gvMx1srcBillNo.Visible = true;
-            this.gvMx1srcBillNo.VisibleIndex = 18;
+            this.gvMx1srcBillNo.VisibleIndex = 21;
             this.gvMx1srcBillNo.Width = 94;
-            // 
-            // gvMx1deliQty
-            // 
-            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 = 19;
-            this.gvMx1deliQty.Width = 94;
             // 
             // gvMx1stockOutQty
             // 
             this.gvMx1stockOutQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1stockOutQty.Caption = "绱鍑哄簱鏁伴噺 ";
-            this.gvMx1stockOutQty.FieldName = "stockOutQty";
+            this.gvMx1stockOutQty.FieldName = "ckQty";
             this.gvMx1stockOutQty.MinWidth = 50;
             this.gvMx1stockOutQty.Name = "gvMx1stockOutQty";
             this.gvMx1stockOutQty.Tag = "query_a.stock_out_qty";
             this.gvMx1stockOutQty.Visible = true;
-            this.gvMx1stockOutQty.VisibleIndex = 20;
+            this.gvMx1stockOutQty.VisibleIndex = 7;
             this.gvMx1stockOutQty.Width = 94;
-            // 
-            // gvMx1baseRetNoticeQty
-            // 
-            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 = 21;
-            this.gvMx1baseRetNoticeQty.Width = 94;
             // 
             // gvMx1baseReturnQty
             // 
             this.gvMx1baseReturnQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲忥紙閿�鍞熀鏈級 ";
-            this.gvMx1baseReturnQty.FieldName = "baseReturnQty";
+            this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲�";
+            this.gvMx1baseReturnQty.FieldName = "thQty";
             this.gvMx1baseReturnQty.MinWidth = 50;
             this.gvMx1baseReturnQty.Name = "gvMx1baseReturnQty";
             this.gvMx1baseReturnQty.Tag = "query_a.base_return_qty";
             this.gvMx1baseReturnQty.Visible = true;
-            this.gvMx1baseReturnQty.VisibleIndex = 22;
+            this.gvMx1baseReturnQty.VisibleIndex = 8;
             this.gvMx1baseReturnQty.Width = 94;
-            // 
-            // gvMx1baseRemainOutQty
-            // 
-            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 = 23;
-            this.gvMx1baseRemainOutQty.Width = 94;
-            // 
-            // gvMx1basearqty
-            // 
-            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 = 24;
-            this.gvMx1basearqty.Width = 94;
             // 
             // gvMx1custIno
             // 
@@ -2334,8 +2348,6 @@
             this.gvMx1custIno.MinWidth = 50;
             this.gvMx1custIno.Name = "gvMx1custIno";
             this.gvMx1custIno.Tag = "query_a.cust_ino";
-            this.gvMx1custIno.Visible = true;
-            this.gvMx1custIno.VisibleIndex = 25;
             this.gvMx1custIno.Width = 94;
             // 
             // gvMx1custInm
@@ -2346,8 +2358,6 @@
             this.gvMx1custInm.MinWidth = 50;
             this.gvMx1custInm.Name = "gvMx1custInm";
             this.gvMx1custInm.Tag = "query_a.cust_inm";
-            this.gvMx1custInm.Visible = true;
-            this.gvMx1custInm.VisibleIndex = 26;
             this.gvMx1custInm.Width = 94;
             // 
             // gvMx1custImd
@@ -2358,45 +2368,7 @@
             this.gvMx1custImd.MinWidth = 50;
             this.gvMx1custImd.Name = "gvMx1custImd";
             this.gvMx1custImd.Tag = "query_a.cust_imd";
-            this.gvMx1custImd.Visible = true;
-            this.gvMx1custImd.VisibleIndex = 27;
             this.gvMx1custImd.Width = 94;
-            // 
-            // gvMx1mapId
-            // 
-            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 = 28;
-            this.gvMx1mapId.Width = 94;
-            // 
-            // gvMx1mapName
-            // 
-            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 = 29;
-            this.gvMx1mapName.Width = 94;
-            // 
-            // gvMx1mapSpec
-            // 
-            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 = 30;
-            this.gvMx1mapSpec.Width = 94;
             // 
             // gvMx1supplyOrgId
             // 
@@ -2441,11 +2413,11 @@
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡缂栫爜";
-            this.gridColumn5.FieldName = "itemName";
+            this.gridColumn5.FieldName = "itemNo";
             this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 31;
+            this.gridColumn5.VisibleIndex = 2;
             this.gridColumn5.Width = 94;
             // 
             // gridColumn6
@@ -2455,7 +2427,7 @@
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 32;
+            this.gridColumn6.VisibleIndex = 3;
             this.gridColumn6.Width = 94;
             // 
             // gridColumn7
@@ -2465,7 +2437,7 @@
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 33;
+            this.gridColumn7.VisibleIndex = 4;
             this.gridColumn7.Width = 94;
             // 
             // gridColumn8
@@ -2475,7 +2447,7 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 34;
+            this.gridColumn8.VisibleIndex = 22;
             this.gridColumn8.Width = 94;
             // 
             // gridColumn9
@@ -2485,7 +2457,7 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 35;
+            this.gridColumn9.VisibleIndex = 23;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn10
@@ -2495,7 +2467,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 36;
+            this.gridColumn10.VisibleIndex = 24;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -2505,7 +2477,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 37;
+            this.gridColumn11.VisibleIndex = 27;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -2515,7 +2487,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 38;
+            this.gridColumn12.VisibleIndex = 28;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
@@ -2525,7 +2497,7 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 39;
+            this.gridColumn13.VisibleIndex = 29;
             this.gridColumn13.Width = 94;
             // 
             // picCheckBox
@@ -2539,87 +2511,11 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_note;
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 223);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem15.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_approverId;
-            this.layoutControlItem17.Location = new System.Drawing.Point(308, 63);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_approveDate;
-            this.layoutControlItem25.Location = new System.Drawing.Point(308, 95);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem25.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_creatorId;
-            this.layoutControlItem21.Location = new System.Drawing.Point(308, 127);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem21.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_createDate;
-            this.layoutControlItem22.Location = new System.Drawing.Point(308, 159);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem22.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txt_cancellerId;
-            this.layoutControlItem30.Location = new System.Drawing.Point(308, 191);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem30.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem30.Text = "浣滃簾浜哄憳";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
-            this.layoutControlItem29.Location = new System.Drawing.Point(308, 223);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem29.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
-            // 
             // Frm_SalesOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1256, 682);
+            this.ClientSize = new System.Drawing.Size(1570, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
@@ -2719,12 +2615,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
@@ -2732,6 +2622,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).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.ResumeLayout(false);
 
         }
@@ -2769,18 +2665,11 @@
         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;

--
Gitblit v1.9.3