From 8d35329ba4acfdb702587eb9b624e320b37ecb4a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 21 六月 2025 17:09:25 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 3903 ++++++++++++++++++++++++----------------------------------
 1 files changed, 1,615 insertions(+), 2,288 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 4ca2da8..3d52a0e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -29,43 +29,102 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.gvMx1erpHeadId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1erpLineId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1orderBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1sourceBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1sourceBillType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ownerTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1inventoryQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1salesClerk = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lotNumber = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1planTrackingNumber = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1warehouse = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
-            this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1salesQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1salesUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1materialSpecification = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_salesDept = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_salesPerson = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createdDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_modifiedBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_modifiedDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_approvedDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup();
+            this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_salesOrderId = new Gs.DevApp.UserControl.UcLookSales();
+            this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_id = new DevExpress.XtraEditors.TextEdit();
+            this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit();
+            this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_custName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            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.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
-            this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -74,560 +133,1063 @@
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1materialSpecification = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1salesUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1salesQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.lb_billStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_billStatus = new DevExpress.XtraEditors.TextEdit();
-            this.gv_billStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_manualCloseFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_cancelDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_cancelledBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_approvedDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_approvedDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_approvedBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closeReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_closedBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_modifiedDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_modifiedDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_modifiedBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_modifiedBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createdDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createdDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createdBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_settleParty = new DevExpress.XtraEditors.LabelControl();
-            this.txt_settleParty = new DevExpress.XtraEditors.TextEdit();
-            this.gv_settleParty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_receiverName = new DevExpress.XtraEditors.LabelControl();
-            this.txt_receiverName = new DevExpress.XtraEditors.TextEdit();
-            this.gv_receiverName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_receiverAddress = new DevExpress.XtraEditors.LabelControl();
-            this.txt_receiverAddress = new DevExpress.XtraEditors.TextEdit();
-            this.gv_receiverAddress = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_receiverContact = new DevExpress.XtraEditors.LabelControl();
-            this.txt_receiverContact = new DevExpress.XtraEditors.TextEdit();
-            this.gv_receiverContact = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_receiver = new DevExpress.XtraEditors.LabelControl();
-            this.txt_receiver = new DevExpress.XtraEditors.TextEdit();
-            this.gv_receiver = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_expressNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_expressNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_expressNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_salesPerson = new DevExpress.XtraEditors.LabelControl();
-            this.txt_salesPerson = new DevExpress.XtraEditors.TextEdit();
-            this.gv_salesPerson = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_salesGroup = new DevExpress.XtraEditors.LabelControl();
-            this.txt_salesGroup = new DevExpress.XtraEditors.TextEdit();
-            this.gv_salesGroup = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_warehouseManager = new DevExpress.XtraEditors.LabelControl();
-            this.txt_warehouseManager = new DevExpress.XtraEditors.TextEdit();
-            this.gv_warehouseManager = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_inventoryGroup = new DevExpress.XtraEditors.LabelControl();
-            this.txt_inventoryGroup = new DevExpress.XtraEditors.TextEdit();
-            this.gv_inventoryGroup = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_inventoryDept = new DevExpress.XtraEditors.LabelControl();
-            this.txt_inventoryDept = new DevExpress.XtraEditors.TextEdit();
-            this.gv_inventoryDept = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_inventoryOrg = new DevExpress.XtraEditors.LabelControl();
-            this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit();
-            this.gv_inventoryOrg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_deliveryLocation = new DevExpress.XtraEditors.LabelControl();
-            this.txt_deliveryLocation = new DevExpress.XtraEditors.TextEdit();
-            this.gv_deliveryLocation = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_returnReason = new DevExpress.XtraEditors.LabelControl();
-            this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
-            this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_taobaoRemark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_returnCustomer = new DevExpress.XtraEditors.LabelControl();
-            this.txt_returnCustomer = new DevExpress.XtraEditors.TextEdit();
-            this.gv_returnCustomer = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_customerOrderNo = new DevExpress.XtraEditors.LabelControl();
-            this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_salesDept = new DevExpress.XtraEditors.LabelControl();
-            this.txt_salesDept = new DevExpress.XtraEditors.TextEdit();
-            this.gv_salesDept = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_salesOrg = new DevExpress.XtraEditors.LabelControl();
-            this.txt_salesOrg = new DevExpress.XtraEditors.TextEdit();
-            this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_currency = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_billType = new DevExpress.XtraEditors.LabelControl();
-            this.gv_billType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_id = new DevExpress.XtraEditors.LabelControl();
-            this.txt_id = new DevExpress.XtraEditors.TextEdit();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            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.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_customerOrderNo = new Gs.DevApp.UserControl.UcLookSales();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
-            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
-            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
-            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.Panel2.SuspendLayout();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).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.repositoryItemSearchLookUpEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_settleParty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiverName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiverAddress.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiverContact.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiver.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_expressNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesPerson.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesGroup.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_warehouseManager.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryGroup.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryDept.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_id.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();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
-            this.panelMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
             this.SuspendLayout();
             // 
-            // gvMx1erpHeadId
+            // toolBarMenu1
             // 
-            this.gvMx1erpHeadId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1erpHeadId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1erpHeadId.Caption = "ERP澶碔D ";
-            this.gvMx1erpHeadId.FieldName = "erpHeadId";
-            this.gvMx1erpHeadId.MinWidth = 50;
-            this.gvMx1erpHeadId.Name = "gvMx1erpHeadId";
-            this.gvMx1erpHeadId.Tag = "query_a.ERP_HEAD_ID";
-            this.gvMx1erpHeadId.Visible = true;
-            this.gvMx1erpHeadId.VisibleIndex = 25;
-            this.gvMx1erpHeadId.Width = 94;
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
             // 
-            // gvMx1erpLineId
+            // xtraTabControl1
             // 
-            this.gvMx1erpLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1erpLineId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1erpLineId.Caption = "ERP琛孖D ";
-            this.gvMx1erpLineId.FieldName = "erpLineId";
-            this.gvMx1erpLineId.MinWidth = 50;
-            this.gvMx1erpLineId.Name = "gvMx1erpLineId";
-            this.gvMx1erpLineId.Tag = "query_a.ERP_LINE_ID";
-            this.gvMx1erpLineId.Visible = true;
-            this.gvMx1erpLineId.VisibleIndex = 24;
-            this.gvMx1erpLineId.Width = 94;
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
             // 
-            // gvMx1orderBillNo
+            // xtraTabPage1
             // 
-            this.gvMx1orderBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1orderBillNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1orderBillNo.Caption = "璁㈠崟鍗曞彿 ";
-            this.gvMx1orderBillNo.FieldName = "orderBillNo";
-            this.gvMx1orderBillNo.MinWidth = 50;
-            this.gvMx1orderBillNo.Name = "gvMx1orderBillNo";
-            this.gvMx1orderBillNo.Tag = "query_a.ORDER_BILL_NO";
-            this.gvMx1orderBillNo.Visible = true;
-            this.gvMx1orderBillNo.VisibleIndex = 23;
-            this.gvMx1orderBillNo.Width = 94;
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
-            // gvMx1sourceBillNo
+            // split1
             // 
-            this.gvMx1sourceBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1sourceBillNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sourceBillNo.Caption = "婧愬崟鍗曞彿 ";
-            this.gvMx1sourceBillNo.FieldName = "sourceBillNo";
-            this.gvMx1sourceBillNo.MinWidth = 50;
-            this.gvMx1sourceBillNo.Name = "gvMx1sourceBillNo";
-            this.gvMx1sourceBillNo.Tag = "query_a.SOURCE_BILL_NO";
-            this.gvMx1sourceBillNo.Visible = true;
-            this.gvMx1sourceBillNo.VisibleIndex = 22;
-            this.gvMx1sourceBillNo.Width = 94;
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Name = "split1";
             // 
-            // gvMx1sourceBillType
+            // split1.Panel1
             // 
-            this.gvMx1sourceBillType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1sourceBillType.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sourceBillType.Caption = "婧愬崟绫诲瀷 ";
-            this.gvMx1sourceBillType.FieldName = "sourceBillType";
-            this.gvMx1sourceBillType.MinWidth = 50;
-            this.gvMx1sourceBillType.Name = "gvMx1sourceBillType";
-            this.gvMx1sourceBillType.Tag = "query_a.SOURCE_BILL_TYPE";
-            this.gvMx1sourceBillType.Visible = true;
-            this.gvMx1sourceBillType.VisibleIndex = 21;
-            this.gvMx1sourceBillType.Width = 94;
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
             // 
-            // gvMx1ownerId
+            // split1.Panel2
             // 
-            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 = 20;
-            this.gvMx1ownerId.Width = 94;
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1274, 570);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
             // 
-            // gvMx1ownerTypeId
+            // gcMain1
             // 
-            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 = 19;
-            this.gvMx1ownerTypeId.Width = 94;
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1274, 519);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
             // 
-            // gvMx1inventoryQuantity
+            // gridView1
             // 
-            this.gvMx1inventoryQuantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1inventoryQuantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx1inventoryQuantity.Caption = "搴撳瓨鏁伴噺 ";
-            this.gvMx1inventoryQuantity.FieldName = "inventoryQuantity";
-            this.gvMx1inventoryQuantity.MinWidth = 50;
-            this.gvMx1inventoryQuantity.Name = "gvMx1inventoryQuantity";
-            this.gvMx1inventoryQuantity.Tag = "query_a.INVENTORY_QUANTITY";
-            this.gvMx1inventoryQuantity.Visible = true;
-            this.gvMx1inventoryQuantity.VisibleIndex = 18;
-            this.gvMx1inventoryQuantity.Width = 94;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_id,
+            this.gridColumn1,
+            this.gridColumn19,
+            this.gridColumn27,
+            this.gv_billType,
+            this.gv_billNo,
+            this.gv_salesOrg,
+            this.gv_salesDept,
+            this.gv_salesPerson,
+            this.gv_returnReason,
+            this.gv_createdBy,
+            this.gv_createdDate,
+            this.gv_modifiedBy,
+            this.gv_modifiedDate,
+            this.gv_approvedBy,
+            this.gv_approvedDate,
+            this.gridColumn18,
+            this.gv_customerOrderNo,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26});
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
-            // gvMx1inventoryUnit
+            // gv_id
             // 
-            this.gvMx1inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true;
-            this.gvMx1inventoryUnit.Caption = "搴撳瓨鍗曚綅 ";
-            this.gvMx1inventoryUnit.FieldName = "inventoryUnit";
-            this.gvMx1inventoryUnit.MinWidth = 50;
-            this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
-            this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
-            this.gvMx1inventoryUnit.Visible = true;
-            this.gvMx1inventoryUnit.VisibleIndex = 17;
-            this.gvMx1inventoryUnit.Width = 94;
+            this.gv_id.AppearanceCell.Options.UseFont = true;
+            this.gv_id.Caption = "涓婚敭GUID";
+            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.Width = 94;
             // 
-            // gvMx1salesClerk
+            // gridColumn1
             // 
-            this.gvMx1salesClerk.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1salesClerk.AppearanceCell.Options.UseFont = true;
-            this.gvMx1salesClerk.Caption = "璺熷崟鍛� ";
-            this.gvMx1salesClerk.FieldName = "salesClerk";
-            this.gvMx1salesClerk.MinWidth = 50;
-            this.gvMx1salesClerk.Name = "gvMx1salesClerk";
-            this.gvMx1salesClerk.Tag = "query_a.SALES_CLERK";
-            this.gvMx1salesClerk.Visible = true;
-            this.gvMx1salesClerk.VisibleIndex = 16;
-            this.gvMx1salesClerk.Width = 94;
+            this.gridColumn1.Caption = "瀹℃牳鏍囪瘑";
+            this.gridColumn1.FieldName = "chkStatus";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.Width = 94;
             // 
-            // gvMx1returnType
+            // gridColumn19
             // 
-            this.gvMx1returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1returnType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1returnType.AppearanceCell.Options.UseFont = true;
-            this.gvMx1returnType.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1returnType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1returnType.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1returnType.Caption = "閫�璐х被鍨� ";
-            this.gvMx1returnType.ColumnEdit = this.repositoryItemComboBox1;
-            this.gvMx1returnType.FieldName = "returnType";
-            this.gvMx1returnType.MinWidth = 50;
-            this.gvMx1returnType.Name = "gvMx1returnType";
-            this.gvMx1returnType.Tag = "edit";
-            this.gvMx1returnType.Visible = true;
-            this.gvMx1returnType.VisibleIndex = 15;
-            this.gvMx1returnType.Width = 94;
+            this.gridColumn19.Caption = "瀹岀粨鏍囪瘑";
+            this.gridColumn19.FieldName = "wjStatus";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 1;
+            this.gridColumn19.Width = 94;
             // 
-            // repositoryItemComboBox1
+            // gridColumn27
             // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.gridColumn27.Caption = "婧愬崟鏍囪瘑";
+            this.gridColumn27.FieldName = "fIsLink";
+            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 3;
+            this.gridColumn27.Width = 94;
+            // 
+            // gv_billType
+            // 
+            this.gv_billType.AppearanceCell.Options.UseFont = true;
+            this.gv_billType.Caption = "鍗曟嵁绫诲瀷 ";
+            this.gv_billType.FieldName = "billType";
+            this.gv_billType.MinWidth = 50;
+            this.gv_billType.Name = "gv_billType";
+            this.gv_billType.OptionsColumn.AllowEdit = false;
+            this.gv_billType.Tag = "query_a.BILL_TYPE";
+            this.gv_billType.Visible = true;
+            this.gv_billType.VisibleIndex = 2;
+            this.gv_billType.Width = 94;
+            // 
+            // gv_billNo
+            // 
+            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 = 4;
+            this.gv_billNo.Width = 94;
+            // 
+            // gv_salesOrg
+            // 
+            this.gv_salesOrg.AppearanceCell.Options.UseFont = true;
+            this.gv_salesOrg.Caption = "閿�鍞粍缁� ";
+            this.gv_salesOrg.FieldName = "xsOrgName";
+            this.gv_salesOrg.MinWidth = 50;
+            this.gv_salesOrg.Name = "gv_salesOrg";
+            this.gv_salesOrg.OptionsColumn.AllowEdit = false;
+            this.gv_salesOrg.Tag = "query_a.SALES_ORG";
+            this.gv_salesOrg.Visible = true;
+            this.gv_salesOrg.VisibleIndex = 5;
+            this.gv_salesOrg.Width = 94;
+            // 
+            // gv_salesDept
+            // 
+            this.gv_salesDept.AppearanceCell.Options.UseFont = true;
+            this.gv_salesDept.Caption = "閿�鍞儴闂� ";
+            this.gv_salesDept.FieldName = "saleDeptName";
+            this.gv_salesDept.MinWidth = 50;
+            this.gv_salesDept.Name = "gv_salesDept";
+            this.gv_salesDept.OptionsColumn.AllowEdit = false;
+            this.gv_salesDept.Tag = "query_a.SALES_DEPT";
+            this.gv_salesDept.Visible = true;
+            this.gv_salesDept.VisibleIndex = 6;
+            this.gv_salesDept.Width = 94;
+            // 
+            // gv_salesPerson
+            // 
+            this.gv_salesPerson.AppearanceCell.Options.UseFont = true;
+            this.gv_salesPerson.Caption = "閿�鍞憳 ";
+            this.gv_salesPerson.FieldName = "salerName";
+            this.gv_salesPerson.MinWidth = 50;
+            this.gv_salesPerson.Name = "gv_salesPerson";
+            this.gv_salesPerson.OptionsColumn.AllowEdit = false;
+            this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
+            this.gv_salesPerson.Visible = true;
+            this.gv_salesPerson.VisibleIndex = 8;
+            this.gv_salesPerson.Width = 94;
+            // 
+            // gv_returnReason
+            // 
+            this.gv_returnReason.AppearanceCell.Options.UseFont = true;
+            this.gv_returnReason.Caption = "閫�璐у師鍥� ";
+            this.gv_returnReason.FieldName = "thyy";
+            this.gv_returnReason.MinWidth = 50;
+            this.gv_returnReason.Name = "gv_returnReason";
+            this.gv_returnReason.OptionsColumn.AllowEdit = false;
+            this.gv_returnReason.Tag = "query_a.RETURN_REASON";
+            this.gv_returnReason.Visible = true;
+            this.gv_returnReason.VisibleIndex = 9;
+            this.gv_returnReason.Width = 94;
+            // 
+            // gv_createdBy
+            // 
+            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createdBy.Caption = "鍒涘缓浜� ";
+            this.gv_createdBy.FieldName = "createdBy";
+            this.gv_createdBy.MinWidth = 50;
+            this.gv_createdBy.Name = "gv_createdBy";
+            this.gv_createdBy.OptionsColumn.AllowEdit = false;
+            this.gv_createdBy.Tag = "query_a.CREATED_BY";
+            this.gv_createdBy.Visible = true;
+            this.gv_createdBy.VisibleIndex = 10;
+            this.gv_createdBy.Width = 94;
+            // 
+            // gv_createdDate
+            // 
+            this.gv_createdDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createdDate.Caption = "鍒涘缓鏃堕棿 ";
+            this.gv_createdDate.FieldName = "createdDate";
+            this.gv_createdDate.MinWidth = 50;
+            this.gv_createdDate.Name = "gv_createdDate";
+            this.gv_createdDate.OptionsColumn.AllowEdit = false;
+            this.gv_createdDate.Tag = "query_a.CREATED_DATE";
+            this.gv_createdDate.Visible = true;
+            this.gv_createdDate.VisibleIndex = 11;
+            this.gv_createdDate.Width = 94;
+            // 
+            // gv_modifiedBy
+            // 
+            this.gv_modifiedBy.AppearanceCell.Options.UseFont = true;
+            this.gv_modifiedBy.Caption = "淇敼浜� ";
+            this.gv_modifiedBy.FieldName = "modifiedBy";
+            this.gv_modifiedBy.MinWidth = 50;
+            this.gv_modifiedBy.Name = "gv_modifiedBy";
+            this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
+            this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
+            this.gv_modifiedBy.Visible = true;
+            this.gv_modifiedBy.VisibleIndex = 12;
+            this.gv_modifiedBy.Width = 94;
+            // 
+            // gv_modifiedDate
+            // 
+            this.gv_modifiedDate.AppearanceCell.Options.UseFont = true;
+            this.gv_modifiedDate.Caption = "淇敼鏃堕棿 ";
+            this.gv_modifiedDate.FieldName = "modifiedDate";
+            this.gv_modifiedDate.MinWidth = 50;
+            this.gv_modifiedDate.Name = "gv_modifiedDate";
+            this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
+            this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
+            this.gv_modifiedDate.Visible = true;
+            this.gv_modifiedDate.VisibleIndex = 13;
+            this.gv_modifiedDate.Width = 94;
+            // 
+            // gv_approvedBy
+            // 
+            this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
+            this.gv_approvedBy.Caption = "瀹℃牳浜� ";
+            this.gv_approvedBy.FieldName = "approvedBy";
+            this.gv_approvedBy.MinWidth = 50;
+            this.gv_approvedBy.Name = "gv_approvedBy";
+            this.gv_approvedBy.OptionsColumn.AllowEdit = false;
+            this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
+            this.gv_approvedBy.Visible = true;
+            this.gv_approvedBy.VisibleIndex = 14;
+            this.gv_approvedBy.Width = 94;
+            // 
+            // gv_approvedDate
+            // 
+            this.gv_approvedDate.AppearanceCell.Options.UseFont = true;
+            this.gv_approvedDate.Caption = "瀹℃牳鏃ユ湡 ";
+            this.gv_approvedDate.FieldName = "approvedDate";
+            this.gv_approvedDate.MinWidth = 50;
+            this.gv_approvedDate.Name = "gv_approvedDate";
+            this.gv_approvedDate.OptionsColumn.AllowEdit = false;
+            this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
+            this.gv_approvedDate.Visible = true;
+            this.gv_approvedDate.VisibleIndex = 15;
+            this.gv_approvedDate.Width = 94;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "瀹㈡埛";
+            this.gridColumn18.FieldName = "custName";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 16;
+            this.gridColumn18.Width = 94;
+            // 
+            // gv_customerOrderNo
+            // 
+            this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
+            this.gv_customerOrderNo.Caption = "婧愰攢鍞鍗�";
+            this.gv_customerOrderNo.FieldName = "xsNo";
+            this.gv_customerOrderNo.MinWidth = 50;
+            this.gv_customerOrderNo.Name = "gv_customerOrderNo";
+            this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
+            this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
+            this.gv_customerOrderNo.Visible = true;
+            this.gv_customerOrderNo.VisibleIndex = 7;
+            this.gv_customerOrderNo.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "浠撳簱ID";
+            this.gridColumn24.FieldName = "ckId";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "浠撳簱鍚嶇О";
+            this.gridColumn25.FieldName = "ckName";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 17;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "浠撳簱缂栧彿";
+            this.gridColumn26.FieldName = "ckNo";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 18;
+            this.gridColumn26.Width = 94;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1274, 39);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Controls.Add(this.tabMx);
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1274, 570);
+            this.splitMx1.SplitterPosition = 184;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.txt_fIsLink);
+            this.layoutMx1.Controls.Add(this.txt_fstockid);
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_wjStatus);
+            this.layoutMx1.Controls.Add(this.txt_chkStatus);
+            this.layoutMx1.Controls.Add(this.txt_billType);
+            this.layoutMx1.Controls.Add(this.txt_salesOrderId);
+            this.layoutMx1.Controls.Add(this.txt_approvedDate);
+            this.layoutMx1.Controls.Add(this.txt_id);
+            this.layoutMx1.Controls.Add(this.txt_approvedBy);
+            this.layoutMx1.Controls.Add(this.txt_xsOrgName);
+            this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
+            this.layoutMx1.Controls.Add(this.txt_modifiedDate);
+            this.layoutMx1.Controls.Add(this.txt_billNo);
+            this.layoutMx1.Controls.Add(this.txt_salerName);
+            this.layoutMx1.Controls.Add(this.txt_modifiedBy);
+            this.layoutMx1.Controls.Add(this.txt_saleDeptName);
+            this.layoutMx1.Controls.Add(this.txt_custName);
+            this.layoutMx1.Controls.Add(this.txt_createdDate);
+            this.layoutMx1.Controls.Add(this.txt_returnReason);
+            this.layoutMx1.Controls.Add(this.txt_createdBy);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem19,
+            this.layoutControlItem1});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1274, 184);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_fIsLink
+            // 
+            this.txt_fIsLink.EditValue = "1";
+            this.txt_fIsLink.Location = new System.Drawing.Point(84, 42);
+            this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_fIsLink.Name = "txt_fIsLink";
+            this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
+            this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.txt_fIsLink.Size = new System.Drawing.Size(237, 33);
+            this.txt_fIsLink.StyleController = this.layoutMx1;
+            this.txt_fIsLink.TabIndex = 534;
+            // 
+            // txt_fstockid
+            // 
+            this.txt_fstockid.IsReadly = false;
+            this.txt_fstockid.Location = new System.Drawing.Point(84, 110);
+            this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_fstockid.Name = "txt_fstockid";
+            this.txt_fstockid.Size = new System.Drawing.Size(237, 24);
+            this.txt_fstockid.TabIndex = 454;
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(825, 131);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            // 
+            // txt_wjStatus
+            // 
+            this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);
+            this.txt_wjStatus.Name = "txt_wjStatus";
+            this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
+            this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);
+            this.txt_wjStatus.StyleController = this.layoutMx1;
+            this.txt_wjStatus.TabIndex = 453;
+            this.txt_wjStatus.Tag = "readonly";
+            // 
+            // txt_chkStatus
+            // 
+            this.txt_chkStatus.Location = new System.Drawing.Point(951, 143);
+            this.txt_chkStatus.Name = "txt_chkStatus";
+            this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_chkStatus.Size = new System.Drawing.Size(311, 24);
+            this.txt_chkStatus.StyleController = this.layoutMx1;
+            this.txt_chkStatus.TabIndex = 452;
+            this.txt_chkStatus.Tag = "readonly";
+            // 
+            // txt_billType
+            // 
+            this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
+            this.txt_billType.Location = new System.Drawing.Point(397, 110);
+            this.txt_billType.Name = "txt_billType";
+            this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Items.AddRange(new object[] {
-            "杈呭姪璧勬枡(THLX01_SYS)",
-            "閫�璐�(THLX02_SYS)",
-            "閫�璐цˉ璐�(THLX03_SYS)",
-            "浠呴��娆句笉閫�璐�()"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_billType.Properties.Items.AddRange(new object[] {
+            "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
+            this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_billType.Size = new System.Drawing.Size(237, 24);
+            this.txt_billType.StyleController = this.layoutMx1;
+            this.txt_billType.TabIndex = 451;
             // 
-            // gvMx1note
+            // txt_salesOrderId
             // 
-            this.gvMx1note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1note.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1note.AppearanceCell.Options.UseFont = true;
-            this.gvMx1note.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1note.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1note.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1note.Caption = "鐢宠澶囨敞 ";
-            this.gvMx1note.FieldName = "note";
-            this.gvMx1note.MinWidth = 50;
-            this.gvMx1note.Name = "gvMx1note";
-            this.gvMx1note.Tag = "edit";
-            this.gvMx1note.Visible = true;
-            this.gvMx1note.VisibleIndex = 8;
-            this.gvMx1note.Width = 94;
+            this.txt_salesOrderId.IsReadly = false;
+            this.txt_salesOrderId.Location = new System.Drawing.Point(84, 77);
+            this.txt_salesOrderId.Name = "txt_salesOrderId";
+            this.txt_salesOrderId.Size = new System.Drawing.Size(237, 24);
+            this.txt_salesOrderId.TabIndex = 0;
             // 
-            // gvMx1lotNumber
+            // txt_approvedDate
             // 
-            this.gvMx1lotNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1lotNumber.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lotNumber.Caption = "鎵瑰彿 ";
-            this.gvMx1lotNumber.FieldName = "lotNumber";
-            this.gvMx1lotNumber.MinWidth = 50;
-            this.gvMx1lotNumber.Name = "gvMx1lotNumber";
-            this.gvMx1lotNumber.Tag = "query_a.LOT_NUMBER";
-            this.gvMx1lotNumber.Visible = true;
-            this.gvMx1lotNumber.VisibleIndex = 14;
-            this.gvMx1lotNumber.Width = 94;
+            this.txt_approvedDate.Location = new System.Drawing.Point(1023, 110);
+            this.txt_approvedDate.Name = "txt_approvedDate";
+            this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_approvedDate.Size = new System.Drawing.Size(239, 24);
+            this.txt_approvedDate.StyleController = this.layoutMx1;
+            this.txt_approvedDate.TabIndex = 378;
+            this.txt_approvedDate.Tag = "readonly";
             // 
-            // gvMx1planTrackingNumber
+            // txt_id
             // 
-            this.gvMx1planTrackingNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1planTrackingNumber.AppearanceCell.Options.UseFont = true;
-            this.gvMx1planTrackingNumber.Caption = "璁″垝璺熻釜鍙� ";
-            this.gvMx1planTrackingNumber.FieldName = "planTrackingNumber";
-            this.gvMx1planTrackingNumber.MinWidth = 50;
-            this.gvMx1planTrackingNumber.Name = "gvMx1planTrackingNumber";
-            this.gvMx1planTrackingNumber.Tag = "query_a.PLAN_TRACKING_NUMBER";
-            this.gvMx1planTrackingNumber.Visible = true;
-            this.gvMx1planTrackingNumber.VisibleIndex = 13;
-            this.gvMx1planTrackingNumber.Width = 94;
+            this.txt_id.Location = new System.Drawing.Point(90, 3);
+            this.txt_id.Name = "txt_id";
+            this.txt_id.Properties.Appearance.Options.UseFont = true;
+            this.txt_id.Size = new System.Drawing.Size(189, 24);
+            this.txt_id.StyleController = this.layoutMx1;
+            this.txt_id.TabIndex = 210;
+            this.txt_id.Tag = "readonly";
             // 
-            // gvMx1warehouse
+            // txt_approvedBy
             // 
-            this.gvMx1warehouse.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1warehouse.AppearanceCell.Options.UseFont = true;
-            this.gvMx1warehouse.Caption = "浠撳簱 ";
-            this.gvMx1warehouse.FieldName = "warehouse";
-            this.gvMx1warehouse.MinWidth = 50;
-            this.gvMx1warehouse.Name = "gvMx1warehouse";
-            this.gvMx1warehouse.Tag = "query_a.WAREHOUSE";
-            this.gvMx1warehouse.Visible = true;
-            this.gvMx1warehouse.VisibleIndex = 12;
-            this.gvMx1warehouse.Width = 94;
+            this.txt_approvedBy.Location = new System.Drawing.Point(1023, 77);
+            this.txt_approvedBy.Name = "txt_approvedBy";
+            this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_approvedBy.Size = new System.Drawing.Size(239, 24);
+            this.txt_approvedBy.StyleController = this.layoutMx1;
+            this.txt_approvedBy.TabIndex = 370;
+            this.txt_approvedBy.Tag = "readonly";
             // 
-            // gvMx1returnDate
+            // txt_xsOrgName
             // 
-            this.gvMx1returnDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1returnDate.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1returnDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1returnDate.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1returnDate.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1returnDate.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1returnDate.Caption = "閫�璐ф棩鏈� ";
-            this.gvMx1returnDate.ColumnEdit = this.repositoryItemDateEdit1;
-            this.gvMx1returnDate.FieldName = "returnDate";
-            this.gvMx1returnDate.MinWidth = 50;
-            this.gvMx1returnDate.Name = "gvMx1returnDate";
-            this.gvMx1returnDate.Tag = "edit";
-            this.gvMx1returnDate.Visible = true;
-            this.gvMx1returnDate.VisibleIndex = 11;
-            this.gvMx1returnDate.Width = 94;
+            this.txt_xsOrgName.Location = new System.Drawing.Point(397, 12);
+            this.txt_xsOrgName.Name = "txt_xsOrgName";
+            this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
+            this.txt_xsOrgName.Size = new System.Drawing.Size(237, 24);
+            this.txt_xsOrgName.StyleController = this.layoutMx1;
+            this.txt_xsOrgName.TabIndex = 219;
+            this.txt_xsOrgName.Tag = "readonly";
             // 
-            // repositoryItemDateEdit1
+            // txt_inventoryOrg
             // 
-            this.repositoryItemDateEdit1.AutoHeight = false;
-            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+            this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12);
+            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
+            this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
+            this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
+            this.txt_inventoryOrg.StyleController = this.layoutMx1;
+            this.txt_inventoryOrg.TabIndex = 243;
+            this.txt_inventoryOrg.Tag = "readonly";
             // 
-            // gvMx1isFree
+            // txt_modifiedDate
             // 
-            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;
+            this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44);
+            this.txt_modifiedDate.Name = "txt_modifiedDate";
+            this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_modifiedDate.Size = new System.Drawing.Size(239, 24);
+            this.txt_modifiedDate.StyleController = this.layoutMx1;
+            this.txt_modifiedDate.TabIndex = 336;
+            this.txt_modifiedDate.Tag = "readonly";
             // 
-            // gvMx1salesQuantity
+            // txt_billNo
             // 
-            this.gvMx1salesQuantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx1salesQuantity.Caption = "閿�鍞暟閲� ";
-            this.gvMx1salesQuantity.FieldName = "salesQuantity";
-            this.gvMx1salesQuantity.MinWidth = 50;
-            this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
-            this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
-            this.gvMx1salesQuantity.Visible = true;
-            this.gvMx1salesQuantity.VisibleIndex = 7;
-            this.gvMx1salesQuantity.Width = 94;
+            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_billNo.Name = "txt_billNo";
+            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_billNo.Size = new System.Drawing.Size(237, 24);
+            this.txt_billNo.StyleController = this.layoutMx1;
+            this.txt_billNo.TabIndex = 213;
+            this.txt_billNo.Tag = "readonly";
             // 
-            // gvMx1salesUnitId
+            // txt_salerName
             // 
-            this.gvMx1salesUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1salesUnitId.Caption = "閿�鍞崟浣� ";
-            this.gvMx1salesUnitId.FieldName = "salesUnitId";
-            this.gvMx1salesUnitId.MinWidth = 50;
-            this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
-            this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
-            this.gvMx1salesUnitId.Visible = true;
-            this.gvMx1salesUnitId.VisibleIndex = 6;
-            this.gvMx1salesUnitId.Width = 94;
+            this.txt_salerName.Location = new System.Drawing.Point(397, 44);
+            this.txt_salerName.Name = "txt_salerName";
+            this.txt_salerName.Properties.Appearance.Options.UseFont = true;
+            this.txt_salerName.Size = new System.Drawing.Size(237, 24);
+            this.txt_salerName.StyleController = this.layoutMx1;
+            this.txt_salerName.TabIndex = 267;
+            this.txt_salerName.Tag = "readonly";
             // 
-            // gvMx1materialSpecification
+            // txt_modifiedBy
             // 
-            this.gvMx1materialSpecification.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;
-            this.gvMx1materialSpecification.Caption = "鐗╂枡瑙勬牸 ";
-            this.gvMx1materialSpecification.FieldName = "materialSpecification";
-            this.gvMx1materialSpecification.MinWidth = 50;
-            this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
-            this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
-            this.gvMx1materialSpecification.Visible = true;
-            this.gvMx1materialSpecification.VisibleIndex = 5;
-            this.gvMx1materialSpecification.Width = 94;
+            this.txt_modifiedBy.Location = new System.Drawing.Point(1023, 12);
+            this.txt_modifiedBy.Name = "txt_modifiedBy";
+            this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_modifiedBy.Size = new System.Drawing.Size(239, 24);
+            this.txt_modifiedBy.StyleController = this.layoutMx1;
+            this.txt_modifiedBy.TabIndex = 327;
+            this.txt_modifiedBy.Tag = "readonly";
             // 
-            // gvMx1materialName
+            // txt_saleDeptName
             // 
-            this.gvMx1materialName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1materialName.AppearanceCell.Options.UseFont = true;
-            this.gvMx1materialName.Caption = "鐗╂枡鍚嶇О ";
-            this.gvMx1materialName.FieldName = "materialName";
-            this.gvMx1materialName.MinWidth = 50;
-            this.gvMx1materialName.Name = "gvMx1materialName";
-            this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
-            this.gvMx1materialName.Visible = true;
-            this.gvMx1materialName.VisibleIndex = 4;
-            this.gvMx1materialName.Width = 94;
+            this.txt_saleDeptName.Location = new System.Drawing.Point(397, 77);
+            this.txt_saleDeptName.Name = "txt_saleDeptName";
+            this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
+            this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24);
+            this.txt_saleDeptName.StyleController = this.layoutMx1;
+            this.txt_saleDeptName.TabIndex = 222;
+            this.txt_saleDeptName.Tag = "readonly";
             // 
-            // gvMx1materialId
+            // txt_custName
             // 
-            this.gvMx1materialId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1materialId.Caption = "鐗╂枡ID ";
-            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;
+            this.txt_custName.Location = new System.Drawing.Point(710, 44);
+            this.txt_custName.Name = "txt_custName";
+            this.txt_custName.Properties.Appearance.Options.UseFont = true;
+            this.txt_custName.Size = new System.Drawing.Size(237, 24);
+            this.txt_custName.StyleController = this.layoutMx1;
+            this.txt_custName.TabIndex = 252;
+            this.txt_custName.Tag = "readonly";
             // 
-            // gvMx1salesOrderId
+            // txt_createdDate
             // 
-            this.gvMx1salesOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1salesOrderId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1salesOrderId.Caption = "閿�鍞鍗曞彿 ";
-            this.gvMx1salesOrderId.FieldName = "salesOrderId";
-            this.gvMx1salesOrderId.MinWidth = 50;
-            this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
-            this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
-            this.gvMx1salesOrderId.Visible = true;
-            this.gvMx1salesOrderId.VisibleIndex = 2;
-            this.gvMx1salesOrderId.Width = 94;
+            this.txt_createdDate.Location = new System.Drawing.Point(710, 110);
+            this.txt_createdDate.Name = "txt_createdDate";
+            this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createdDate.Size = new System.Drawing.Size(237, 24);
+            this.txt_createdDate.StyleController = this.layoutMx1;
+            this.txt_createdDate.TabIndex = 319;
+            this.txt_createdDate.Tag = "readonly";
             // 
-            // gvMx1id
+            // txt_returnReason
             // 
-            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 = 1;
-            this.gvMx1id.Width = 94;
+            this.txt_returnReason.Location = new System.Drawing.Point(84, 143);
+            this.txt_returnReason.Name = "txt_returnReason";
+            this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
+            this.txt_returnReason.Size = new System.Drawing.Size(550, 24);
+            this.txt_returnReason.StyleController = this.layoutMx1;
+            this.txt_returnReason.TabIndex = 235;
+            // 
+            // txt_createdBy
+            // 
+            this.txt_createdBy.Location = new System.Drawing.Point(710, 77);
+            this.txt_createdBy.Name = "txt_createdBy";
+            this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createdBy.Size = new System.Drawing.Size(237, 24);
+            this.txt_createdBy.StyleController = this.layoutMx1;
+            this.txt_createdBy.TabIndex = 312;
+            this.txt_createdBy.Tag = "readonly";
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.lbGuid;
+            this.layoutControlItem19.Location = new System.Drawing.Point(813, 128);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem19.Text = "lbGuid";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem19.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_id;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Text = "涓婚敭GUID";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem12,
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem15,
+            this.layoutControlItem16,
+            this.layoutControlItem17,
+            this.layoutControlItem18,
+            this.layoutControlItem4,
+            this.layoutControlItem9,
+            this.layoutControlItem20,
+            this.layoutControlItem5,
+            this.layoutControlItem21});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5});
+            this.Root.Size = new System.Drawing.Size(1274, 184);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_xsOrgName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(313, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem2.Text = "閿�鍞粍缁�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_inventoryOrg;
+            this.layoutControlItem3.Location = new System.Drawing.Point(626, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_salerName;
+            this.layoutControlItem6.Location = new System.Drawing.Point(313, 32);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem6.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_saleDeptName;
+            this.layoutControlItem7.Location = new System.Drawing.Point(313, 65);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem7.Text = "閿�鍞儴闂�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_custName;
+            this.layoutControlItem8.Location = new System.Drawing.Point(626, 32);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_billType;
+            this.layoutControlItem10.Location = new System.Drawing.Point(313, 98);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_createdBy;
+            this.layoutControlItem11.Location = new System.Drawing.Point(626, 65);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_createdDate;
+            this.layoutControlItem12.Location = new System.Drawing.Point(626, 98);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_modifiedBy;
+            this.layoutControlItem13.Location = new System.Drawing.Point(939, 0);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(315, 32);
+            this.layoutControlItem13.Text = "淇敼浜哄憳";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_modifiedDate;
+            this.layoutControlItem14.Location = new System.Drawing.Point(939, 32);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem14.Text = "淇敼鏃堕棿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_approvedBy;
+            this.layoutControlItem15.Location = new System.Drawing.Point(939, 65);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem15.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_approvedDate;
+            this.layoutControlItem16.Location = new System.Drawing.Point(939, 98);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem16.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_chkStatus;
+            this.layoutControlItem17.Location = new System.Drawing.Point(939, 131);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem17.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_wjStatus;
+            this.layoutControlItem18.Location = new System.Drawing.Point(626, 131);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem18.TextVisible = false;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_billNo;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem4.Text = "鐢宠鍗曞彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_returnReason;
+            this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 131);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem9.Size = new System.Drawing.Size(626, 33);
+            this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_fstockid;
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 98);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem20.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_salesOrderId;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 65);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem5.Text = "閿�鍞鍗�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_fIsLink;
+            this.layoutControlItem21.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
+            this.layoutControlItem21.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem21.Text = "鏈夋棤婧愬崟";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // 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(1274, 374);
+            this.tabMx.TabIndex = 3;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage1,
+            this.tabMxPage2});
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
-            this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 236);
+            this.tabMxPage1.Size = new System.Drawing.Size(1272, 342);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 102);
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
@@ -635,41 +1197,32 @@
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1,
             this.repositoryItemDateEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 134);
+            this.gcMx1.Size = new System.Drawing.Size(1272, 342);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
             // 
             // gvMx1
             // 
+            this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn2,
             this.gvMx1id,
-            this.gvMx1salesOrderId,
             this.gvMx1materialId,
             this.gvMx1materialName,
             this.gvMx1materialSpecification,
+            this.gridColumn20,
             this.gvMx1salesUnitId,
             this.gvMx1salesQuantity,
+            this.gridColumn32,
             this.gvMx1note,
             this.gridColumn13,
             this.gvMx1returnDate,
             this.gvMx1isFree,
-            this.gvMx1warehouse,
-            this.gvMx1planTrackingNumber,
-            this.gvMx1lotNumber,
             this.gvMx1returnType,
-            this.gvMx1salesClerk,
-            this.gvMx1inventoryUnit,
-            this.gvMx1inventoryQuantity,
-            this.gvMx1ownerTypeId,
-            this.gvMx1ownerId,
-            this.gvMx1sourceBillType,
-            this.gvMx1sourceBillNo,
-            this.gvMx1orderBillNo,
-            this.gvMx1erpLineId,
-            this.gvMx1erpHeadId,
             this.gridColumn12,
+            this.gridColumn21,
+            this.gridColumn22,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -700,12 +1253,12 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
             this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
-            this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
+            this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
             this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
             // 
-            // repositoryItemSearchLookUpEdit1View
+            // gridView2
             // 
-            this.repositoryItemSearchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn4,
             this.gridColumn5,
             this.gridColumn6,
@@ -713,11 +1266,12 @@
             this.gridColumn8,
             this.gridColumn9,
             this.gridColumn10,
-            this.gridColumn11});
-            this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
-            this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            this.gridColumn11,
+            this.gridColumn23});
+            this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.gridView2.Name = "gridView2";
+            this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.gridView2.OptionsView.ShowGroupPanel = false;
             // 
             // gridColumn4
             // 
@@ -780,8 +1334,116 @@
             this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid";
             this.gridColumn11.FieldName = "ckmxGuid";
             this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 7;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "鐗╂枡ID";
+            this.gridColumn23.FieldName = "itemId";
+            this.gridColumn23.Name = "gridColumn23";
+            // 
+            // gvMx1id
+            // 
+            this.gvMx1id.AppearanceCell.Options.UseFont = true;
+            this.gvMx1id.Caption = "涓婚敭GUID";
+            this.gvMx1id.FieldName = "guid";
+            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.Name = "gvMx1id";
+            this.gvMx1id.Tag = "query_a.ID";
+            this.gvMx1id.Width = 94;
+            // 
+            // gvMx1materialId
+            // 
+            this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1materialId.Caption = "鐗╂枡ID ";
+            this.gvMx1materialId.FieldName = "itemId";
+            this.gvMx1materialId.MinWidth = 50;
+            this.gvMx1materialId.Name = "gvMx1materialId";
+            this.gvMx1materialId.Tag = "query_a.MATERIAL_ID";
+            this.gvMx1materialId.Width = 94;
+            // 
+            // gvMx1materialName
+            // 
+            this.gvMx1materialName.AppearanceCell.Options.UseFont = true;
+            this.gvMx1materialName.Caption = "鐗╂枡鍚嶇О ";
+            this.gvMx1materialName.FieldName = "itemName";
+            this.gvMx1materialName.MinWidth = 50;
+            this.gvMx1materialName.Name = "gvMx1materialName";
+            this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
+            this.gvMx1materialName.Visible = true;
+            this.gvMx1materialName.VisibleIndex = 1;
+            this.gvMx1materialName.Width = 94;
+            // 
+            // gvMx1materialSpecification
+            // 
+            this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;
+            this.gvMx1materialSpecification.Caption = "鐗╂枡瑙勬牸 ";
+            this.gvMx1materialSpecification.FieldName = "itemModel";
+            this.gvMx1materialSpecification.MinWidth = 50;
+            this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
+            this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
+            this.gvMx1materialSpecification.Visible = true;
+            this.gvMx1materialSpecification.VisibleIndex = 2;
+            this.gvMx1materialSpecification.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn20.FieldName = "itemNo";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 3;
+            this.gridColumn20.Width = 94;
+            // 
+            // gvMx1salesUnitId
+            // 
+            this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1salesUnitId.Caption = "閿�鍞崟浣� ";
+            this.gvMx1salesUnitId.FieldName = "xxDw";
+            this.gvMx1salesUnitId.MinWidth = 50;
+            this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
+            this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
+            this.gvMx1salesUnitId.Visible = true;
+            this.gvMx1salesUnitId.VisibleIndex = 4;
+            this.gvMx1salesUnitId.Width = 94;
+            // 
+            // gvMx1salesQuantity
+            // 
+            this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx1salesQuantity.Caption = "閿�鍞暟閲� ";
+            this.gvMx1salesQuantity.FieldName = "salesQuantity";
+            this.gvMx1salesQuantity.MinWidth = 50;
+            this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
+            this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
+            this.gvMx1salesQuantity.Visible = true;
+            this.gvMx1salesQuantity.VisibleIndex = 5;
+            this.gvMx1salesQuantity.Width = 94;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "鍙戣揣鎬婚噺";
+            this.gridColumn32.FieldName = "fhQuantity";
+            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 13;
+            this.gridColumn32.Width = 94;
+            // 
+            // gvMx1note
+            // 
+            this.gvMx1note.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1note.AppearanceCell.Options.UseFont = true;
+            this.gvMx1note.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1note.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1note.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1note.Caption = "鐢宠澶囨敞 ";
+            this.gvMx1note.FieldName = "note";
+            this.gvMx1note.MinWidth = 50;
+            this.gvMx1note.Name = "gvMx1note";
+            this.gvMx1note.Tag = "edit";
+            this.gvMx1note.Visible = true;
+            this.gvMx1note.VisibleIndex = 7;
+            this.gvMx1note.Width = 94;
             // 
             // gridColumn13
             // 
@@ -795,18 +1457,104 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "yz_quantity_0_edit";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 10;
+            this.gridColumn13.VisibleIndex = 6;
             this.gridColumn13.Width = 94;
+            // 
+            // gvMx1returnDate
+            // 
+            this.gvMx1returnDate.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1returnDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1returnDate.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1returnDate.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1returnDate.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1returnDate.Caption = "閫�璐ф棩鏈� ";
+            this.gvMx1returnDate.ColumnEdit = this.repositoryItemDateEdit1;
+            this.gvMx1returnDate.FieldName = "returnDate";
+            this.gvMx1returnDate.MinWidth = 50;
+            this.gvMx1returnDate.Name = "gvMx1returnDate";
+            this.gvMx1returnDate.Tag = "edit";
+            this.gvMx1returnDate.Visible = true;
+            this.gvMx1returnDate.VisibleIndex = 8;
+            this.gvMx1returnDate.Width = 94;
+            // 
+            // repositoryItemDateEdit1
+            // 
+            this.repositoryItemDateEdit1.AutoHeight = false;
+            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+            // 
+            // gvMx1isFree
+            // 
+            this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
+            this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
+            this.gvMx1isFree.FieldName = "isFreeChk";
+            this.gvMx1isFree.MinWidth = 50;
+            this.gvMx1isFree.Name = "gvMx1isFree";
+            this.gvMx1isFree.Tag = "query_a.IS_FREE";
+            this.gvMx1isFree.Visible = true;
+            this.gvMx1isFree.VisibleIndex = 10;
+            this.gvMx1isFree.Width = 94;
+            // 
+            // gvMx1returnType
+            // 
+            this.gvMx1returnType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1returnType.AppearanceCell.Options.UseFont = true;
+            this.gvMx1returnType.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1returnType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1returnType.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1returnType.Caption = "閫�璐х被鍨� ";
+            this.gvMx1returnType.ColumnEdit = this.repositoryItemComboBox1;
+            this.gvMx1returnType.FieldName = "returnType";
+            this.gvMx1returnType.MinWidth = 50;
+            this.gvMx1returnType.Name = "gvMx1returnType";
+            this.gvMx1returnType.Tag = "edit";
+            this.gvMx1returnType.Visible = true;
+            this.gvMx1returnType.VisibleIndex = 9;
+            this.gvMx1returnType.Width = 94;
+            // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Items.AddRange(new object[] {
+            "閫�璐�(THLX01_SYS)",
+            "閫�璐цˉ璐�(THLX02_SYS)",
+            "浠呴��娆句笉閫�璐�(THLX03_SYS)"});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
+            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // gridColumn12
             // 
-            this.gridColumn12.Caption = "閫�璐ф槑缁唃uid";
+            this.gridColumn12.Caption = "閫佽揣鏄庣粏guid";
             this.gridColumn12.FieldName = "deliveDetailGuid";
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 27;
             this.gridColumn12.Width = 94;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鍙墦鍗版暟閲�";
+            this.gridColumn21.FieldName = "kdy";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 11;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "宸叉墦鍗版暟閲�";
+            this.gridColumn22.FieldName = "ydy";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 12;
+            this.gridColumn22.Width = 94;
             // 
             // gvMxDel
             // 
@@ -815,1363 +1563,198 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 26;
+            this.gvMxDel.VisibleIndex = 14;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
-            // lb_billStatus
+            // tabMxPage2
             // 
-            this.lb_billStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_billStatus.Appearance.Options.UseFont = true;
-            this.lb_billStatus.Location = new System.Drawing.Point(770, 52);
-            this.lb_billStatus.Name = "lb_billStatus";
-            this.lb_billStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_billStatus.TabIndex = 450;
-            this.lb_billStatus.Text = "鍗曟嵁鐘舵�� ";
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1272, 342);
+            this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
             // 
-            // txt_billStatus
+            // gcMx2
             // 
-            this.txt_billStatus.Location = new System.Drawing.Point(830, 48);
-            this.txt_billStatus.Name = "txt_billStatus";
-            this.txt_billStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_billStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_billStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_billStatus.TabIndex = 450;
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1272, 342);
+            this.gcMx2.TabIndex = 3;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
             // 
-            // gv_billStatus
+            // gvMx2
             // 
-            this.gv_billStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_billStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_billStatus.Caption = "鍗曟嵁鐘舵�� ";
-            this.gv_billStatus.FieldName = "billStatus";
-            this.gv_billStatus.MinWidth = 50;
-            this.gv_billStatus.Name = "gv_billStatus";
-            this.gv_billStatus.OptionsColumn.AllowEdit = false;
-            this.gv_billStatus.Tag = "query_a.BILL_STATUS";
-            this.gv_billStatus.Visible = true;
-            this.gv_billStatus.VisibleIndex = 39;
-            this.gv_billStatus.Width = 94;
+            this.gvMx2.Appearance.Row.Options.UseFont = true;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn3,
+            this.gvMx1itemBarcode,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gvMx1quantity,
+            this.gridColumn17,
+            this.gvMx1createBy,
+            this.gvMx1lotDate,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31});
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
-            // gv_erpId
+            // gridColumn3
             // 
-            this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_erpId.AppearanceCell.Options.UseFont = true;
-            this.gv_erpId.Caption = "ERP澶碔D ";
-            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 = 38;
-            this.gv_erpId.Width = 94;
+            this.gridColumn3.AppearanceCell.Options.UseFont = true;
+            this.gridColumn3.Caption = "guid";
+            this.gridColumn3.FieldName = "guid";
+            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Tag = "query_a.guid";
+            this.gridColumn3.Width = 94;
             // 
-            // gv_manualCloseFlag
+            // gvMx1itemBarcode
             // 
-            this.gv_manualCloseFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_manualCloseFlag.AppearanceCell.Options.UseFont = true;
-            this.gv_manualCloseFlag.Caption = "鏄惁鎵嬪姩鍏抽棴 ";
-            this.gv_manualCloseFlag.FieldName = "manualCloseFlag";
-            this.gv_manualCloseFlag.MinWidth = 50;
-            this.gv_manualCloseFlag.Name = "gv_manualCloseFlag";
-            this.gv_manualCloseFlag.OptionsColumn.AllowEdit = false;
-            this.gv_manualCloseFlag.Tag = "query_a.MANUAL_CLOSE_FLAG";
-            this.gv_manualCloseFlag.Visible = true;
-            this.gv_manualCloseFlag.VisibleIndex = 37;
-            this.gv_manualCloseFlag.Width = 94;
+            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx1itemBarcode.FieldName = "itemBarcode";
+            this.gvMx1itemBarcode.MinWidth = 25;
+            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx1itemBarcode.Visible = true;
+            this.gvMx1itemBarcode.VisibleIndex = 0;
+            this.gvMx1itemBarcode.Width = 300;
             // 
-            // gv_closeStatus
+            // gridColumn14
             // 
-            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 = 36;
-            this.gv_closeStatus.Width = 94;
+            this.gridColumn14.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn14.FieldName = "itemNo";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 1;
+            this.gridColumn14.Width = 94;
             // 
-            // gv_cancelDate
+            // gridColumn15
             // 
-            this.gv_cancelDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancelDate.AppearanceCell.Options.UseFont = true;
-            this.gv_cancelDate.Caption = "浣滃簾鏃ユ湡 ";
-            this.gv_cancelDate.FieldName = "cancelDate";
-            this.gv_cancelDate.MinWidth = 50;
-            this.gv_cancelDate.Name = "gv_cancelDate";
-            this.gv_cancelDate.OptionsColumn.AllowEdit = false;
-            this.gv_cancelDate.Tag = "query_a.CANCEL_DATE";
-            this.gv_cancelDate.Visible = true;
-            this.gv_cancelDate.VisibleIndex = 35;
-            this.gv_cancelDate.Width = 94;
+            this.gridColumn15.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn15.FieldName = "itemName";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 2;
+            this.gridColumn15.Width = 94;
             // 
-            // gv_cancelledBy
+            // gridColumn16
             // 
-            this.gv_cancelledBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancelledBy.AppearanceCell.Options.UseFont = true;
-            this.gv_cancelledBy.Caption = "浣滃簾浜� ";
-            this.gv_cancelledBy.FieldName = "cancelledBy";
-            this.gv_cancelledBy.MinWidth = 50;
-            this.gv_cancelledBy.Name = "gv_cancelledBy";
-            this.gv_cancelledBy.OptionsColumn.AllowEdit = false;
-            this.gv_cancelledBy.Tag = "query_a.CANCELLED_BY";
-            this.gv_cancelledBy.Visible = true;
-            this.gv_cancelledBy.VisibleIndex = 34;
-            this.gv_cancelledBy.Width = 94;
+            this.gridColumn16.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn16.FieldName = "itemModel";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 3;
+            this.gridColumn16.Width = 94;
             // 
-            // gv_cancelStatus
+            // gvMx1quantity
             // 
-            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 = 33;
-            this.gv_cancelStatus.Width = 94;
+            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx1quantity.Caption = "鏁伴噺";
+            this.gvMx1quantity.FieldName = "quantity";
+            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.Name = "gvMx1quantity";
+            this.gvMx1quantity.Tag = "query_a.QUANTITY";
+            this.gvMx1quantity.Visible = true;
+            this.gvMx1quantity.VisibleIndex = 4;
+            this.gvMx1quantity.Width = 94;
             // 
-            // lb_approvedDate
+            // gridColumn17
             // 
-            this.lb_approvedDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_approvedDate.Appearance.Options.UseFont = true;
-            this.lb_approvedDate.Location = new System.Drawing.Point(20, 218);
-            this.lb_approvedDate.Name = "lb_approvedDate";
-            this.lb_approvedDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_approvedDate.TabIndex = 378;
-            this.lb_approvedDate.Text = "瀹℃牳鏃ユ湡 ";
+            this.gridColumn17.Caption = "鍗曚綅";
+            this.gridColumn17.FieldName = "dwName";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 5;
+            this.gridColumn17.Width = 94;
             // 
-            // txt_approvedDate
+            // gvMx1createBy
             // 
-            this.txt_approvedDate.Location = new System.Drawing.Point(80, 218);
-            this.txt_approvedDate.Name = "txt_approvedDate";
-            this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_approvedDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_approvedDate.TabIndex = 378;
+            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createBy.Caption = "鍒涘缓浜�";
+            this.gvMx1createBy.FieldName = "createBy";
+            this.gvMx1createBy.MinWidth = 25;
+            this.gvMx1createBy.Name = "gvMx1createBy";
+            this.gvMx1createBy.Tag = "query_a.CREATE_BY";
+            this.gvMx1createBy.Visible = true;
+            this.gvMx1createBy.VisibleIndex = 6;
+            this.gvMx1createBy.Width = 94;
             // 
-            // gv_approvedDate
+            // gvMx1lotDate
             // 
-            this.gv_approvedDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_approvedDate.AppearanceCell.Options.UseFont = true;
-            this.gv_approvedDate.Caption = "瀹℃牳鏃ユ湡 ";
-            this.gv_approvedDate.FieldName = "approvedDate";
-            this.gv_approvedDate.MinWidth = 50;
-            this.gv_approvedDate.Name = "gv_approvedDate";
-            this.gv_approvedDate.OptionsColumn.AllowEdit = false;
-            this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
-            this.gv_approvedDate.Visible = true;
-            this.gv_approvedDate.VisibleIndex = 32;
-            this.gv_approvedDate.Width = 94;
+            this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
+            this.gvMx1lotDate.FieldName = "createDate";
+            this.gvMx1lotDate.MinWidth = 25;
+            this.gvMx1lotDate.Name = "gvMx1lotDate";
+            this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
+            this.gvMx1lotDate.Visible = true;
+            this.gvMx1lotDate.VisibleIndex = 7;
+            this.gvMx1lotDate.Width = 94;
             // 
-            // lb_approvedBy
+            // gridColumn28
             // 
-            this.lb_approvedBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_approvedBy.Appearance.Options.UseFont = true;
-            this.lb_approvedBy.Location = new System.Drawing.Point(770, 244);
-            this.lb_approvedBy.Name = "lb_approvedBy";
-            this.lb_approvedBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_approvedBy.TabIndex = 370;
-            this.lb_approvedBy.Text = "瀹℃牳浜� ";
+            this.gridColumn28.Caption = "鏄惁鍏ュ簱";
+            this.gridColumn28.FieldName = "isRk";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 8;
+            this.gridColumn28.Width = 94;
             // 
-            // txt_approvedBy
+            // gridColumn29
             // 
-            this.txt_approvedBy.Location = new System.Drawing.Point(830, 244);
-            this.txt_approvedBy.Name = "txt_approvedBy";
-            this.txt_approvedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_approvedBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_approvedBy.TabIndex = 370;
+            this.gridColumn29.Caption = "鍏ュ簱浜�";
+            this.gridColumn29.FieldName = "rkUser";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 9;
+            this.gridColumn29.Width = 94;
             // 
-            // gv_approvedBy
+            // gridColumn30
             // 
-            this.gv_approvedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
-            this.gv_approvedBy.Caption = "瀹℃牳浜� ";
-            this.gv_approvedBy.FieldName = "approvedBy";
-            this.gv_approvedBy.MinWidth = 50;
-            this.gv_approvedBy.Name = "gv_approvedBy";
-            this.gv_approvedBy.OptionsColumn.AllowEdit = false;
-            this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
-            this.gv_approvedBy.Visible = true;
-            this.gv_approvedBy.VisibleIndex = 31;
-            this.gv_approvedBy.Width = 94;
+            this.gridColumn30.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn30.FieldName = "rkDate";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 10;
+            this.gridColumn30.Width = 94;
             // 
-            // gv_closeDate
+            // gridColumn31
             // 
-            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 = 30;
-            this.gv_closeDate.Width = 94;
-            // 
-            // gv_closeReason
-            // 
-            this.gv_closeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_closeReason.AppearanceCell.Options.UseFont = true;
-            this.gv_closeReason.Caption = "鍏抽棴鍘熷洜 ";
-            this.gv_closeReason.FieldName = "closeReason";
-            this.gv_closeReason.MinWidth = 50;
-            this.gv_closeReason.Name = "gv_closeReason";
-            this.gv_closeReason.OptionsColumn.AllowEdit = false;
-            this.gv_closeReason.Tag = "query_a.CLOSE_REASON";
-            this.gv_closeReason.Visible = true;
-            this.gv_closeReason.VisibleIndex = 29;
-            this.gv_closeReason.Width = 94;
-            // 
-            // gv_closedBy
-            // 
-            this.gv_closedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_closedBy.AppearanceCell.Options.UseFont = true;
-            this.gv_closedBy.Caption = "鍏抽棴浜� ";
-            this.gv_closedBy.FieldName = "closedBy";
-            this.gv_closedBy.MinWidth = 50;
-            this.gv_closedBy.Name = "gv_closedBy";
-            this.gv_closedBy.OptionsColumn.AllowEdit = false;
-            this.gv_closedBy.Tag = "query_a.CLOSED_BY";
-            this.gv_closedBy.Visible = true;
-            this.gv_closedBy.VisibleIndex = 28;
-            this.gv_closedBy.Width = 94;
-            // 
-            // lb_modifiedDate
-            // 
-            this.lb_modifiedDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_modifiedDate.Appearance.Options.UseFont = true;
-            this.lb_modifiedDate.Location = new System.Drawing.Point(770, 212);
-            this.lb_modifiedDate.Name = "lb_modifiedDate";
-            this.lb_modifiedDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_modifiedDate.TabIndex = 336;
-            this.lb_modifiedDate.Text = "淇敼鏃堕棿 ";
-            // 
-            // txt_modifiedDate
-            // 
-            this.txt_modifiedDate.Location = new System.Drawing.Point(830, 212);
-            this.txt_modifiedDate.Name = "txt_modifiedDate";
-            this.txt_modifiedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifiedDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_modifiedDate.TabIndex = 336;
-            // 
-            // gv_modifiedDate
-            // 
-            this.gv_modifiedDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_modifiedDate.AppearanceCell.Options.UseFont = true;
-            this.gv_modifiedDate.Caption = "淇敼鏃堕棿 ";
-            this.gv_modifiedDate.FieldName = "modifiedDate";
-            this.gv_modifiedDate.MinWidth = 50;
-            this.gv_modifiedDate.Name = "gv_modifiedDate";
-            this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
-            this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
-            this.gv_modifiedDate.Visible = true;
-            this.gv_modifiedDate.VisibleIndex = 27;
-            this.gv_modifiedDate.Width = 94;
-            // 
-            // lb_modifiedBy
-            // 
-            this.lb_modifiedBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_modifiedBy.Appearance.Options.UseFont = true;
-            this.lb_modifiedBy.Location = new System.Drawing.Point(520, 180);
-            this.lb_modifiedBy.Name = "lb_modifiedBy";
-            this.lb_modifiedBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_modifiedBy.TabIndex = 327;
-            this.lb_modifiedBy.Text = "淇敼浜� ";
-            // 
-            // txt_modifiedBy
-            // 
-            this.txt_modifiedBy.Location = new System.Drawing.Point(580, 180);
-            this.txt_modifiedBy.Name = "txt_modifiedBy";
-            this.txt_modifiedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifiedBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_modifiedBy.TabIndex = 327;
-            // 
-            // gv_modifiedBy
-            // 
-            this.gv_modifiedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_modifiedBy.AppearanceCell.Options.UseFont = true;
-            this.gv_modifiedBy.Caption = "淇敼浜� ";
-            this.gv_modifiedBy.FieldName = "modifiedBy";
-            this.gv_modifiedBy.MinWidth = 50;
-            this.gv_modifiedBy.Name = "gv_modifiedBy";
-            this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
-            this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
-            this.gv_modifiedBy.Visible = true;
-            this.gv_modifiedBy.VisibleIndex = 26;
-            this.gv_modifiedBy.Width = 94;
-            // 
-            // lb_createdDate
-            // 
-            this.lb_createdDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createdDate.Appearance.Options.UseFont = true;
-            this.lb_createdDate.Location = new System.Drawing.Point(253, 155);
-            this.lb_createdDate.Name = "lb_createdDate";
-            this.lb_createdDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_createdDate.TabIndex = 319;
-            this.lb_createdDate.Text = "鍒涘缓鏃堕棿 ";
-            // 
-            // txt_createdDate
-            // 
-            this.txt_createdDate.Location = new System.Drawing.Point(313, 155);
-            this.txt_createdDate.Name = "txt_createdDate";
-            this.txt_createdDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createdDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_createdDate.TabIndex = 319;
-            // 
-            // gv_createdDate
-            // 
-            this.gv_createdDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createdDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createdDate.Caption = "鍒涘缓鏃堕棿 ";
-            this.gv_createdDate.FieldName = "createdDate";
-            this.gv_createdDate.MinWidth = 50;
-            this.gv_createdDate.Name = "gv_createdDate";
-            this.gv_createdDate.OptionsColumn.AllowEdit = false;
-            this.gv_createdDate.Tag = "query_a.CREATED_DATE";
-            this.gv_createdDate.Visible = true;
-            this.gv_createdDate.VisibleIndex = 25;
-            this.gv_createdDate.Width = 94;
-            // 
-            // lb_createdBy
-            // 
-            this.lb_createdBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createdBy.Appearance.Options.UseFont = true;
-            this.lb_createdBy.Location = new System.Drawing.Point(20, 180);
-            this.lb_createdBy.Name = "lb_createdBy";
-            this.lb_createdBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_createdBy.TabIndex = 312;
-            this.lb_createdBy.Text = "鍒涘缓浜� ";
-            // 
-            // txt_createdBy
-            // 
-            this.txt_createdBy.Location = new System.Drawing.Point(80, 180);
-            this.txt_createdBy.Name = "txt_createdBy";
-            this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createdBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_createdBy.TabIndex = 312;
-            // 
-            // gv_createdBy
-            // 
-            this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createdBy.Caption = "鍒涘缓浜� ";
-            this.gv_createdBy.FieldName = "createdBy";
-            this.gv_createdBy.MinWidth = 50;
-            this.gv_createdBy.Name = "gv_createdBy";
-            this.gv_createdBy.OptionsColumn.AllowEdit = false;
-            this.gv_createdBy.Tag = "query_a.CREATED_BY";
-            this.gv_createdBy.Visible = true;
-            this.gv_createdBy.VisibleIndex = 24;
-            this.gv_createdBy.Width = 94;
-            // 
-            // lb_settleParty
-            // 
-            this.lb_settleParty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_settleParty.Appearance.Options.UseFont = true;
-            this.lb_settleParty.Location = new System.Drawing.Point(770, 180);
-            this.lb_settleParty.Name = "lb_settleParty";
-            this.lb_settleParty.Size = new System.Drawing.Size(56, 21);
-            this.lb_settleParty.TabIndex = 306;
-            this.lb_settleParty.Text = "缁撶畻鏂� ";
-            // 
-            // txt_settleParty
-            // 
-            this.txt_settleParty.Location = new System.Drawing.Point(830, 180);
-            this.txt_settleParty.Name = "txt_settleParty";
-            this.txt_settleParty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_settleParty.Properties.Appearance.Options.UseFont = true;
-            this.txt_settleParty.Size = new System.Drawing.Size(150, 28);
-            this.txt_settleParty.TabIndex = 306;
-            // 
-            // gv_settleParty
-            // 
-            this.gv_settleParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_settleParty.AppearanceCell.Options.UseFont = true;
-            this.gv_settleParty.Caption = "缁撶畻鏂� ";
-            this.gv_settleParty.FieldName = "settleParty";
-            this.gv_settleParty.MinWidth = 50;
-            this.gv_settleParty.Name = "gv_settleParty";
-            this.gv_settleParty.OptionsColumn.AllowEdit = false;
-            this.gv_settleParty.Tag = "query_a.SETTLE_PARTY";
-            this.gv_settleParty.Visible = true;
-            this.gv_settleParty.VisibleIndex = 23;
-            this.gv_settleParty.Width = 94;
-            // 
-            // lb_receiverName
-            // 
-            this.lb_receiverName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_receiverName.Appearance.Options.UseFont = true;
-            this.lb_receiverName.Location = new System.Drawing.Point(520, 148);
-            this.lb_receiverName.Name = "lb_receiverName";
-            this.lb_receiverName.Size = new System.Drawing.Size(90, 21);
-            this.lb_receiverName.TabIndex = 298;
-            this.lb_receiverName.Text = "鏀惰揣鏂瑰鍚� ";
-            // 
-            // txt_receiverName
-            // 
-            this.txt_receiverName.Location = new System.Drawing.Point(580, 148);
-            this.txt_receiverName.Name = "txt_receiverName";
-            this.txt_receiverName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_receiverName.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiverName.Size = new System.Drawing.Size(150, 28);
-            this.txt_receiverName.TabIndex = 298;
-            // 
-            // gv_receiverName
-            // 
-            this.gv_receiverName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_receiverName.AppearanceCell.Options.UseFont = true;
-            this.gv_receiverName.Caption = "鏀惰揣鏂瑰鍚� ";
-            this.gv_receiverName.FieldName = "receiverName";
-            this.gv_receiverName.MinWidth = 50;
-            this.gv_receiverName.Name = "gv_receiverName";
-            this.gv_receiverName.OptionsColumn.AllowEdit = false;
-            this.gv_receiverName.Tag = "query_a.RECEIVER_NAME";
-            this.gv_receiverName.Visible = true;
-            this.gv_receiverName.VisibleIndex = 22;
-            this.gv_receiverName.Width = 94;
-            // 
-            // lb_receiverAddress
-            // 
-            this.lb_receiverAddress.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_receiverAddress.Appearance.Options.UseFont = true;
-            this.lb_receiverAddress.Location = new System.Drawing.Point(270, 116);
-            this.lb_receiverAddress.Name = "lb_receiverAddress";
-            this.lb_receiverAddress.Size = new System.Drawing.Size(90, 21);
-            this.lb_receiverAddress.TabIndex = 291;
-            this.lb_receiverAddress.Text = "鏀惰揣鏂瑰湴鍧� ";
-            // 
-            // txt_receiverAddress
-            // 
-            this.txt_receiverAddress.Location = new System.Drawing.Point(330, 112);
-            this.txt_receiverAddress.Name = "txt_receiverAddress";
-            this.txt_receiverAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_receiverAddress.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiverAddress.Size = new System.Drawing.Size(150, 28);
-            this.txt_receiverAddress.TabIndex = 291;
-            // 
-            // gv_receiverAddress
-            // 
-            this.gv_receiverAddress.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_receiverAddress.AppearanceCell.Options.UseFont = true;
-            this.gv_receiverAddress.Caption = "鏀惰揣鏂瑰湴鍧� ";
-            this.gv_receiverAddress.FieldName = "receiverAddress";
-            this.gv_receiverAddress.MinWidth = 50;
-            this.gv_receiverAddress.Name = "gv_receiverAddress";
-            this.gv_receiverAddress.OptionsColumn.AllowEdit = false;
-            this.gv_receiverAddress.Tag = "query_a.RECEIVER_ADDRESS";
-            this.gv_receiverAddress.Visible = true;
-            this.gv_receiverAddress.VisibleIndex = 21;
-            this.gv_receiverAddress.Width = 94;
-            // 
-            // lb_receiverContact
-            // 
-            this.lb_receiverContact.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_receiverContact.Appearance.Options.UseFont = true;
-            this.lb_receiverContact.Location = new System.Drawing.Point(20, 148);
-            this.lb_receiverContact.Name = "lb_receiverContact";
-            this.lb_receiverContact.Size = new System.Drawing.Size(107, 21);
-            this.lb_receiverContact.TabIndex = 285;
-            this.lb_receiverContact.Text = "鏀惰揣鏂硅仈绯讳汉 ";
-            // 
-            // txt_receiverContact
-            // 
-            this.txt_receiverContact.Location = new System.Drawing.Point(80, 148);
-            this.txt_receiverContact.Name = "txt_receiverContact";
-            this.txt_receiverContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_receiverContact.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiverContact.Size = new System.Drawing.Size(150, 28);
-            this.txt_receiverContact.TabIndex = 285;
-            // 
-            // gv_receiverContact
-            // 
-            this.gv_receiverContact.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_receiverContact.AppearanceCell.Options.UseFont = true;
-            this.gv_receiverContact.Caption = "鏀惰揣鏂硅仈绯讳汉 ";
-            this.gv_receiverContact.FieldName = "receiverContact";
-            this.gv_receiverContact.MinWidth = 50;
-            this.gv_receiverContact.Name = "gv_receiverContact";
-            this.gv_receiverContact.OptionsColumn.AllowEdit = false;
-            this.gv_receiverContact.Tag = "query_a.RECEIVER_CONTACT";
-            this.gv_receiverContact.Visible = true;
-            this.gv_receiverContact.VisibleIndex = 20;
-            this.gv_receiverContact.Width = 94;
-            // 
-            // lb_receiver
-            // 
-            this.lb_receiver.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_receiver.Appearance.Options.UseFont = true;
-            this.lb_receiver.Location = new System.Drawing.Point(770, 148);
-            this.lb_receiver.Name = "lb_receiver";
-            this.lb_receiver.Size = new System.Drawing.Size(56, 21);
-            this.lb_receiver.TabIndex = 280;
-            this.lb_receiver.Text = "鏀惰揣鏂� ";
-            // 
-            // txt_receiver
-            // 
-            this.txt_receiver.Location = new System.Drawing.Point(830, 148);
-            this.txt_receiver.Name = "txt_receiver";
-            this.txt_receiver.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_receiver.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiver.Size = new System.Drawing.Size(150, 28);
-            this.txt_receiver.TabIndex = 280;
-            // 
-            // gv_receiver
-            // 
-            this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_receiver.AppearanceCell.Options.UseFont = true;
-            this.gv_receiver.Caption = "鏀惰揣鏂� ";
-            this.gv_receiver.FieldName = "receiver";
-            this.gv_receiver.MinWidth = 50;
-            this.gv_receiver.Name = "gv_receiver";
-            this.gv_receiver.OptionsColumn.AllowEdit = false;
-            this.gv_receiver.Tag = "query_a.RECEIVER";
-            this.gv_receiver.Visible = true;
-            this.gv_receiver.VisibleIndex = 19;
-            this.gv_receiver.Width = 94;
-            // 
-            // lb_expressNo
-            // 
-            this.lb_expressNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_expressNo.Appearance.Options.UseFont = true;
-            this.lb_expressNo.Location = new System.Drawing.Point(520, 116);
-            this.lb_expressNo.Name = "lb_expressNo";
-            this.lb_expressNo.Size = new System.Drawing.Size(73, 21);
-            this.lb_expressNo.TabIndex = 273;
-            this.lb_expressNo.Text = "蹇�掑崟鍙� ";
-            // 
-            // txt_expressNo
-            // 
-            this.txt_expressNo.Location = new System.Drawing.Point(580, 112);
-            this.txt_expressNo.Name = "txt_expressNo";
-            this.txt_expressNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_expressNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_expressNo.Size = new System.Drawing.Size(150, 28);
-            this.txt_expressNo.TabIndex = 273;
-            // 
-            // gv_expressNo
-            // 
-            this.gv_expressNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_expressNo.AppearanceCell.Options.UseFont = true;
-            this.gv_expressNo.Caption = "蹇�掑崟鍙� ";
-            this.gv_expressNo.FieldName = "expressNo";
-            this.gv_expressNo.MinWidth = 50;
-            this.gv_expressNo.Name = "gv_expressNo";
-            this.gv_expressNo.OptionsColumn.AllowEdit = false;
-            this.gv_expressNo.Tag = "query_a.EXPRESS_NO";
-            this.gv_expressNo.Visible = true;
-            this.gv_expressNo.VisibleIndex = 18;
-            this.gv_expressNo.Width = 94;
-            // 
-            // lb_salesPerson
-            // 
-            this.lb_salesPerson.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_salesPerson.Appearance.Options.UseFont = true;
-            this.lb_salesPerson.Location = new System.Drawing.Point(270, 84);
-            this.lb_salesPerson.Name = "lb_salesPerson";
-            this.lb_salesPerson.Size = new System.Drawing.Size(56, 21);
-            this.lb_salesPerson.TabIndex = 267;
-            this.lb_salesPerson.Text = "閿�鍞憳 ";
-            // 
-            // txt_salesPerson
-            // 
-            this.txt_salesPerson.Location = new System.Drawing.Point(330, 80);
-            this.txt_salesPerson.Name = "txt_salesPerson";
-            this.txt_salesPerson.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesPerson.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesPerson.Size = new System.Drawing.Size(150, 28);
-            this.txt_salesPerson.TabIndex = 267;
-            // 
-            // gv_salesPerson
-            // 
-            this.gv_salesPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_salesPerson.AppearanceCell.Options.UseFont = true;
-            this.gv_salesPerson.Caption = "閿�鍞憳 ";
-            this.gv_salesPerson.FieldName = "salesPerson";
-            this.gv_salesPerson.MinWidth = 50;
-            this.gv_salesPerson.Name = "gv_salesPerson";
-            this.gv_salesPerson.OptionsColumn.AllowEdit = false;
-            this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
-            this.gv_salesPerson.Visible = true;
-            this.gv_salesPerson.VisibleIndex = 17;
-            this.gv_salesPerson.Width = 94;
-            // 
-            // lb_salesGroup
-            // 
-            this.lb_salesGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_salesGroup.Appearance.Options.UseFont = true;
-            this.lb_salesGroup.Location = new System.Drawing.Point(20, 116);
-            this.lb_salesGroup.Name = "lb_salesGroup";
-            this.lb_salesGroup.Size = new System.Drawing.Size(56, 21);
-            this.lb_salesGroup.TabIndex = 262;
-            this.lb_salesGroup.Text = "閿�鍞粍 ";
-            // 
-            // txt_salesGroup
-            // 
-            this.txt_salesGroup.Location = new System.Drawing.Point(80, 112);
-            this.txt_salesGroup.Name = "txt_salesGroup";
-            this.txt_salesGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesGroup.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesGroup.Size = new System.Drawing.Size(150, 28);
-            this.txt_salesGroup.TabIndex = 262;
-            // 
-            // gv_salesGroup
-            // 
-            this.gv_salesGroup.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_salesGroup.AppearanceCell.Options.UseFont = true;
-            this.gv_salesGroup.Caption = "閿�鍞粍 ";
-            this.gv_salesGroup.FieldName = "salesGroup";
-            this.gv_salesGroup.MinWidth = 50;
-            this.gv_salesGroup.Name = "gv_salesGroup";
-            this.gv_salesGroup.OptionsColumn.AllowEdit = false;
-            this.gv_salesGroup.Tag = "query_a.SALES_GROUP";
-            this.gv_salesGroup.Visible = true;
-            this.gv_salesGroup.VisibleIndex = 16;
-            this.gv_salesGroup.Width = 94;
-            // 
-            // lb_warehouseManager
-            // 
-            this.lb_warehouseManager.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_warehouseManager.Appearance.Options.UseFont = true;
-            this.lb_warehouseManager.Location = new System.Drawing.Point(770, 116);
-            this.lb_warehouseManager.Name = "lb_warehouseManager";
-            this.lb_warehouseManager.Size = new System.Drawing.Size(56, 21);
-            this.lb_warehouseManager.TabIndex = 258;
-            this.lb_warehouseManager.Text = "浠撶鍛� ";
-            // 
-            // txt_warehouseManager
-            // 
-            this.txt_warehouseManager.Location = new System.Drawing.Point(830, 112);
-            this.txt_warehouseManager.Name = "txt_warehouseManager";
-            this.txt_warehouseManager.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_warehouseManager.Properties.Appearance.Options.UseFont = true;
-            this.txt_warehouseManager.Size = new System.Drawing.Size(150, 28);
-            this.txt_warehouseManager.TabIndex = 258;
-            // 
-            // gv_warehouseManager
-            // 
-            this.gv_warehouseManager.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_warehouseManager.AppearanceCell.Options.UseFont = true;
-            this.gv_warehouseManager.Caption = "浠撶鍛� ";
-            this.gv_warehouseManager.FieldName = "warehouseManager";
-            this.gv_warehouseManager.MinWidth = 50;
-            this.gv_warehouseManager.Name = "gv_warehouseManager";
-            this.gv_warehouseManager.OptionsColumn.AllowEdit = false;
-            this.gv_warehouseManager.Tag = "query_a.WAREHOUSE_MANAGER";
-            this.gv_warehouseManager.Visible = true;
-            this.gv_warehouseManager.VisibleIndex = 15;
-            this.gv_warehouseManager.Width = 94;
-            // 
-            // lb_inventoryGroup
-            // 
-            this.lb_inventoryGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_inventoryGroup.Appearance.Options.UseFont = true;
-            this.lb_inventoryGroup.Location = new System.Drawing.Point(520, 84);
-            this.lb_inventoryGroup.Name = "lb_inventoryGroup";
-            this.lb_inventoryGroup.Size = new System.Drawing.Size(56, 21);
-            this.lb_inventoryGroup.TabIndex = 252;
-            this.lb_inventoryGroup.Text = "搴撳瓨缁� ";
-            // 
-            // txt_inventoryGroup
-            // 
-            this.txt_inventoryGroup.Location = new System.Drawing.Point(580, 80);
-            this.txt_inventoryGroup.Name = "txt_inventoryGroup";
-            this.txt_inventoryGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_inventoryGroup.Properties.Appearance.Options.UseFont = true;
-            this.txt_inventoryGroup.Size = new System.Drawing.Size(150, 28);
-            this.txt_inventoryGroup.TabIndex = 252;
-            // 
-            // gv_inventoryGroup
-            // 
-            this.gv_inventoryGroup.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_inventoryGroup.AppearanceCell.Options.UseFont = true;
-            this.gv_inventoryGroup.Caption = "搴撳瓨缁� ";
-            this.gv_inventoryGroup.FieldName = "inventoryGroup";
-            this.gv_inventoryGroup.MinWidth = 50;
-            this.gv_inventoryGroup.Name = "gv_inventoryGroup";
-            this.gv_inventoryGroup.OptionsColumn.AllowEdit = false;
-            this.gv_inventoryGroup.Tag = "query_a.INVENTORY_GROUP";
-            this.gv_inventoryGroup.Visible = true;
-            this.gv_inventoryGroup.VisibleIndex = 14;
-            this.gv_inventoryGroup.Width = 94;
-            // 
-            // lb_inventoryDept
-            // 
-            this.lb_inventoryDept.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_inventoryDept.Appearance.Options.UseFont = true;
-            this.lb_inventoryDept.Location = new System.Drawing.Point(270, 52);
-            this.lb_inventoryDept.Name = "lb_inventoryDept";
-            this.lb_inventoryDept.Size = new System.Drawing.Size(73, 21);
-            this.lb_inventoryDept.TabIndex = 247;
-            this.lb_inventoryDept.Text = "搴撳瓨閮ㄩ棬 ";
-            // 
-            // txt_inventoryDept
-            // 
-            this.txt_inventoryDept.Location = new System.Drawing.Point(330, 48);
-            this.txt_inventoryDept.Name = "txt_inventoryDept";
-            this.txt_inventoryDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_inventoryDept.Properties.Appearance.Options.UseFont = true;
-            this.txt_inventoryDept.Size = new System.Drawing.Size(150, 28);
-            this.txt_inventoryDept.TabIndex = 247;
-            // 
-            // gv_inventoryDept
-            // 
-            this.gv_inventoryDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_inventoryDept.AppearanceCell.Options.UseFont = true;
-            this.gv_inventoryDept.Caption = "搴撳瓨閮ㄩ棬 ";
-            this.gv_inventoryDept.FieldName = "inventoryDept";
-            this.gv_inventoryDept.MinWidth = 50;
-            this.gv_inventoryDept.Name = "gv_inventoryDept";
-            this.gv_inventoryDept.OptionsColumn.AllowEdit = false;
-            this.gv_inventoryDept.Tag = "query_a.INVENTORY_DEPT";
-            this.gv_inventoryDept.Visible = true;
-            this.gv_inventoryDept.VisibleIndex = 13;
-            this.gv_inventoryDept.Width = 94;
-            // 
-            // lb_inventoryOrg
-            // 
-            this.lb_inventoryOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_inventoryOrg.Appearance.Options.UseFont = true;
-            this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 84);
-            this.lb_inventoryOrg.Name = "lb_inventoryOrg";
-            this.lb_inventoryOrg.Size = new System.Drawing.Size(73, 21);
-            this.lb_inventoryOrg.TabIndex = 243;
-            this.lb_inventoryOrg.Text = "搴撳瓨缁勭粐 ";
-            // 
-            // txt_inventoryOrg
-            // 
-            this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 80);
-            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
-            this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_inventoryOrg.Size = new System.Drawing.Size(150, 28);
-            this.txt_inventoryOrg.TabIndex = 243;
-            // 
-            // gv_inventoryOrg
-            // 
-            this.gv_inventoryOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_inventoryOrg.AppearanceCell.Options.UseFont = true;
-            this.gv_inventoryOrg.Caption = "搴撳瓨缁勭粐 ";
-            this.gv_inventoryOrg.FieldName = "inventoryOrg";
-            this.gv_inventoryOrg.MinWidth = 50;
-            this.gv_inventoryOrg.Name = "gv_inventoryOrg";
-            this.gv_inventoryOrg.OptionsColumn.AllowEdit = false;
-            this.gv_inventoryOrg.Tag = "query_a.INVENTORY_ORG";
-            this.gv_inventoryOrg.Visible = true;
-            this.gv_inventoryOrg.VisibleIndex = 12;
-            this.gv_inventoryOrg.Width = 94;
-            // 
-            // lb_deliveryLocation
-            // 
-            this.lb_deliveryLocation.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_deliveryLocation.Appearance.Options.UseFont = true;
-            this.lb_deliveryLocation.Location = new System.Drawing.Point(770, 84);
-            this.lb_deliveryLocation.Name = "lb_deliveryLocation";
-            this.lb_deliveryLocation.Size = new System.Drawing.Size(73, 21);
-            this.lb_deliveryLocation.TabIndex = 240;
-            this.lb_deliveryLocation.Text = "浜よ揣鍦扮偣 ";
-            // 
-            // txt_deliveryLocation
-            // 
-            this.txt_deliveryLocation.Location = new System.Drawing.Point(830, 80);
-            this.txt_deliveryLocation.Name = "txt_deliveryLocation";
-            this.txt_deliveryLocation.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_deliveryLocation.Properties.Appearance.Options.UseFont = true;
-            this.txt_deliveryLocation.Size = new System.Drawing.Size(150, 28);
-            this.txt_deliveryLocation.TabIndex = 240;
-            // 
-            // gv_deliveryLocation
-            // 
-            this.gv_deliveryLocation.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_deliveryLocation.AppearanceCell.Options.UseFont = true;
-            this.gv_deliveryLocation.Caption = "浜よ揣鍦扮偣 ";
-            this.gv_deliveryLocation.FieldName = "deliveryLocation";
-            this.gv_deliveryLocation.MinWidth = 50;
-            this.gv_deliveryLocation.Name = "gv_deliveryLocation";
-            this.gv_deliveryLocation.OptionsColumn.AllowEdit = false;
-            this.gv_deliveryLocation.Tag = "query_a.DELIVERY_LOCATION";
-            this.gv_deliveryLocation.Visible = true;
-            this.gv_deliveryLocation.VisibleIndex = 11;
-            this.gv_deliveryLocation.Width = 94;
-            // 
-            // lb_returnReason
-            // 
-            this.lb_returnReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_returnReason.Appearance.Options.UseFont = true;
-            this.lb_returnReason.Location = new System.Drawing.Point(287, 263);
-            this.lb_returnReason.Name = "lb_returnReason";
-            this.lb_returnReason.Size = new System.Drawing.Size(73, 21);
-            this.lb_returnReason.TabIndex = 235;
-            this.lb_returnReason.Text = "閫�璐у師鍥� ";
-            // 
-            // txt_returnReason
-            // 
-            this.txt_returnReason.Location = new System.Drawing.Point(347, 259);
-            this.txt_returnReason.Name = "txt_returnReason";
-            this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_returnReason.Size = new System.Drawing.Size(150, 28);
-            this.txt_returnReason.TabIndex = 235;
-            // 
-            // gv_returnReason
-            // 
-            this.gv_returnReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_returnReason.AppearanceCell.Options.UseFont = true;
-            this.gv_returnReason.Caption = "閫�璐у師鍥� ";
-            this.gv_returnReason.FieldName = "returnReason";
-            this.gv_returnReason.MinWidth = 50;
-            this.gv_returnReason.Name = "gv_returnReason";
-            this.gv_returnReason.OptionsColumn.AllowEdit = false;
-            this.gv_returnReason.Tag = "query_a.RETURN_REASON";
-            this.gv_returnReason.Visible = true;
-            this.gv_returnReason.VisibleIndex = 10;
-            this.gv_returnReason.Width = 94;
-            // 
-            // gv_taobaoRemark
-            // 
-            this.gv_taobaoRemark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_taobaoRemark.AppearanceCell.Options.UseFont = true;
-            this.gv_taobaoRemark.Caption = "娣樺疂瀹㈡埛澶囨敞 ";
-            this.gv_taobaoRemark.FieldName = "taobaoRemark";
-            this.gv_taobaoRemark.MinWidth = 50;
-            this.gv_taobaoRemark.Name = "gv_taobaoRemark";
-            this.gv_taobaoRemark.OptionsColumn.AllowEdit = false;
-            this.gv_taobaoRemark.Tag = "query_a.TAOBAO_REMARK";
-            this.gv_taobaoRemark.Visible = true;
-            this.gv_taobaoRemark.VisibleIndex = 9;
-            this.gv_taobaoRemark.Width = 94;
-            // 
-            // lb_returnCustomer
-            // 
-            this.lb_returnCustomer.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_returnCustomer.Appearance.Options.UseFont = true;
-            this.lb_returnCustomer.Location = new System.Drawing.Point(20, 52);
-            this.lb_returnCustomer.Name = "lb_returnCustomer";
-            this.lb_returnCustomer.Size = new System.Drawing.Size(73, 21);
-            this.lb_returnCustomer.TabIndex = 228;
-            this.lb_returnCustomer.Text = "閫�璐у鎴� ";
-            // 
-            // txt_returnCustomer
-            // 
-            this.txt_returnCustomer.Location = new System.Drawing.Point(80, 48);
-            this.txt_returnCustomer.Name = "txt_returnCustomer";
-            this.txt_returnCustomer.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_returnCustomer.Properties.Appearance.Options.UseFont = true;
-            this.txt_returnCustomer.Size = new System.Drawing.Size(150, 28);
-            this.txt_returnCustomer.TabIndex = 228;
-            // 
-            // gv_returnCustomer
-            // 
-            this.gv_returnCustomer.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_returnCustomer.AppearanceCell.Options.UseFont = true;
-            this.gv_returnCustomer.Caption = "閫�璐у鎴� ";
-            this.gv_returnCustomer.FieldName = "returnCustomer";
-            this.gv_returnCustomer.MinWidth = 50;
-            this.gv_returnCustomer.Name = "gv_returnCustomer";
-            this.gv_returnCustomer.OptionsColumn.AllowEdit = false;
-            this.gv_returnCustomer.Tag = "query_a.RETURN_CUSTOMER";
-            this.gv_returnCustomer.Visible = true;
-            this.gv_returnCustomer.VisibleIndex = 8;
-            this.gv_returnCustomer.Width = 94;
-            // 
-            // lb_customerOrderNo
-            // 
-            this.lb_customerOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_customerOrderNo.Appearance.Options.UseFont = true;
-            this.lb_customerOrderNo.Location = new System.Drawing.Point(20, 263);
-            this.lb_customerOrderNo.Name = "lb_customerOrderNo";
-            this.lb_customerOrderNo.Size = new System.Drawing.Size(73, 21);
-            this.lb_customerOrderNo.TabIndex = 226;
-            this.lb_customerOrderNo.Text = "閿�鍞鍗� ";
-            // 
-            // gv_customerOrderNo
-            // 
-            this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
-            this.gv_customerOrderNo.Caption = "瀹㈡埛璁㈠崟 ";
-            this.gv_customerOrderNo.FieldName = "customerOrderNo";
-            this.gv_customerOrderNo.MinWidth = 50;
-            this.gv_customerOrderNo.Name = "gv_customerOrderNo";
-            this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
-            this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
-            this.gv_customerOrderNo.Visible = true;
-            this.gv_customerOrderNo.VisibleIndex = 7;
-            this.gv_customerOrderNo.Width = 94;
-            // 
-            // lb_salesDept
-            // 
-            this.lb_salesDept.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_salesDept.Appearance.Options.UseFont = true;
-            this.lb_salesDept.Location = new System.Drawing.Point(520, 52);
-            this.lb_salesDept.Name = "lb_salesDept";
-            this.lb_salesDept.Size = new System.Drawing.Size(73, 21);
-            this.lb_salesDept.TabIndex = 222;
-            this.lb_salesDept.Text = "閿�鍞儴闂� ";
-            // 
-            // txt_salesDept
-            // 
-            this.txt_salesDept.Location = new System.Drawing.Point(580, 48);
-            this.txt_salesDept.Name = "txt_salesDept";
-            this.txt_salesDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesDept.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesDept.Size = new System.Drawing.Size(150, 28);
-            this.txt_salesDept.TabIndex = 222;
-            // 
-            // gv_salesDept
-            // 
-            this.gv_salesDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_salesDept.AppearanceCell.Options.UseFont = true;
-            this.gv_salesDept.Caption = "閿�鍞儴闂� ";
-            this.gv_salesDept.FieldName = "salesDept";
-            this.gv_salesDept.MinWidth = 50;
-            this.gv_salesDept.Name = "gv_salesDept";
-            this.gv_salesDept.OptionsColumn.AllowEdit = false;
-            this.gv_salesDept.Tag = "query_a.SALES_DEPT";
-            this.gv_salesDept.Visible = true;
-            this.gv_salesDept.VisibleIndex = 6;
-            this.gv_salesDept.Width = 94;
-            // 
-            // lb_salesOrg
-            // 
-            this.lb_salesOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_salesOrg.Appearance.Options.UseFont = true;
-            this.lb_salesOrg.Location = new System.Drawing.Point(270, 20);
-            this.lb_salesOrg.Name = "lb_salesOrg";
-            this.lb_salesOrg.Size = new System.Drawing.Size(73, 21);
-            this.lb_salesOrg.TabIndex = 219;
-            this.lb_salesOrg.Text = "閿�鍞粍缁� ";
-            // 
-            // txt_salesOrg
-            // 
-            this.txt_salesOrg.Location = new System.Drawing.Point(330, 16);
-            this.txt_salesOrg.Name = "txt_salesOrg";
-            this.txt_salesOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesOrg.Size = new System.Drawing.Size(150, 28);
-            this.txt_salesOrg.TabIndex = 219;
-            // 
-            // gv_salesOrg
-            // 
-            this.gv_salesOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_salesOrg.AppearanceCell.Options.UseFont = true;
-            this.gv_salesOrg.Caption = "閿�鍞粍缁� ";
-            this.gv_salesOrg.FieldName = "salesOrg";
-            this.gv_salesOrg.MinWidth = 50;
-            this.gv_salesOrg.Name = "gv_salesOrg";
-            this.gv_salesOrg.OptionsColumn.AllowEdit = false;
-            this.gv_salesOrg.Tag = "query_a.SALES_ORG";
-            this.gv_salesOrg.Visible = true;
-            this.gv_salesOrg.VisibleIndex = 5;
-            this.gv_salesOrg.Width = 94;
-            // 
-            // gv_currency
-            // 
-            this.gv_currency.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_currency.AppearanceCell.Options.UseFont = true;
-            this.gv_currency.Caption = "缁撶畻甯佸埆 ";
-            this.gv_currency.FieldName = "currency";
-            this.gv_currency.MinWidth = 50;
-            this.gv_currency.Name = "gv_currency";
-            this.gv_currency.OptionsColumn.AllowEdit = false;
-            this.gv_currency.Tag = "query_a.CURRENCY";
-            this.gv_currency.Visible = true;
-            this.gv_currency.VisibleIndex = 4;
-            this.gv_currency.Width = 94;
-            // 
-            // 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(770, 20);
-            this.lb_fDate.Name = "lb_fDate";
-            this.lb_fDate.Size = new System.Drawing.Size(39, 21);
-            this.lb_fDate.TabIndex = 216;
-            this.lb_fDate.Text = "鏃ユ湡 ";
-            // 
-            // txt_fDate
-            // 
-            this.txt_fDate.Location = new System.Drawing.Point(830, 16);
-            this.txt_fDate.Name = "txt_fDate";
-            this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_fDate.TabIndex = 216;
-            // 
-            // 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 = 3;
-            this.gv_fDate.Width = 94;
-            // 
-            // 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(520, 20);
-            this.lb_billNo.Name = "lb_billNo";
-            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
-            this.lb_billNo.TabIndex = 213;
-            this.lb_billNo.Text = "鍗曟嵁缂栧彿 ";
-            // 
-            // txt_billNo
-            // 
-            this.txt_billNo.Location = new System.Drawing.Point(580, 16);
-            this.txt_billNo.Name = "txt_billNo";
-            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(150, 28);
-            this.txt_billNo.TabIndex = 213;
-            // 
-            // 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;
-            // 
-            // lb_billType
-            // 
-            this.lb_billType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_billType.Appearance.Options.UseFont = true;
-            this.lb_billType.Location = new System.Drawing.Point(510, 262);
-            this.lb_billType.Name = "lb_billType";
-            this.lb_billType.Size = new System.Drawing.Size(73, 21);
-            this.lb_billType.TabIndex = 211;
-            this.lb_billType.Text = "鍗曟嵁绫诲瀷 ";
-            // 
-            // gv_billType
-            // 
-            this.gv_billType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_billType.AppearanceCell.Options.UseFont = true;
-            this.gv_billType.Caption = "鍗曟嵁绫诲瀷 ";
-            this.gv_billType.FieldName = "billType";
-            this.gv_billType.MinWidth = 50;
-            this.gv_billType.Name = "gv_billType";
-            this.gv_billType.OptionsColumn.AllowEdit = false;
-            this.gv_billType.Tag = "query_a.BILL_TYPE";
-            this.gv_billType.Visible = true;
-            this.gv_billType.VisibleIndex = 1;
-            this.gv_billType.Width = 94;
-            // 
-            // 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(20, 20);
-            this.lb_id.Name = "lb_id";
-            this.lb_id.Size = new System.Drawing.Size(23, 21);
-            this.lb_id.TabIndex = 210;
-            this.lb_id.Text = "ID ";
-            // 
-            // txt_id
-            // 
-            this.txt_id.Location = new System.Drawing.Point(80, 16);
-            this.txt_id.Name = "txt_id";
-            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_id.Properties.Appearance.Options.UseFont = true;
-            this.txt_id.Size = new System.Drawing.Size(150, 28);
-            this.txt_id.TabIndex = 210;
-            // 
-            // 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;
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = null;
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // 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(1126, 531);
-            this.gcMain.TabIndex = 1;
-            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_billType,
-            this.gv_billNo,
-            this.gv_fDate,
-            this.gv_currency,
-            this.gv_salesOrg,
-            this.gv_salesDept,
-            this.gv_customerOrderNo,
-            this.gv_returnCustomer,
-            this.gv_taobaoRemark,
-            this.gv_returnReason,
-            this.gv_deliveryLocation,
-            this.gv_inventoryOrg,
-            this.gv_inventoryDept,
-            this.gv_inventoryGroup,
-            this.gv_warehouseManager,
-            this.gv_salesGroup,
-            this.gv_salesPerson,
-            this.gv_expressNo,
-            this.gv_receiver,
-            this.gv_receiverContact,
-            this.gv_receiverAddress,
-            this.gv_receiverName,
-            this.gv_settleParty,
-            this.gv_createdBy,
-            this.gv_createdDate,
-            this.gv_modifiedBy,
-            this.gv_modifiedDate,
-            this.gv_closedBy,
-            this.gv_closeReason,
-            this.gv_closeDate,
-            this.gv_approvedBy,
-            this.gv_approvedDate,
-            this.gv_cancelStatus,
-            this.gv_cancelledBy,
-            this.gv_cancelDate,
-            this.gv_closeStatus,
-            this.gv_manualCloseFlag,
-            this.gv_erpId,
-            this.gv_billStatus,
-            this.gridColumn1});
-            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;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "瀹℃牳鏍囪瘑";
-            this.gridColumn1.FieldName = "chkStatus";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 40;
-            this.gridColumn1.Width = 94;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            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(1128, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 531);
-            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(1126, 39);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.tabMx);
-            this.xtraTabPage2.Controls.Add(this.panel1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.PageEnabled = false;
-            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, 302);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 268);
-            this.tabMx.TabIndex = 2;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1,
-            this.tabMxPage2});
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_billType);
-            this.panel1.Controls.Add(this.txt_customerOrderNo);
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_billStatus);
-            this.panel1.Controls.Add(this.txt_billStatus);
-            this.panel1.Controls.Add(this.lb_approvedDate);
-            this.panel1.Controls.Add(this.txt_approvedDate);
-            this.panel1.Controls.Add(this.lb_approvedBy);
-            this.panel1.Controls.Add(this.txt_approvedBy);
-            this.panel1.Controls.Add(this.lb_modifiedDate);
-            this.panel1.Controls.Add(this.txt_modifiedDate);
-            this.panel1.Controls.Add(this.lb_modifiedBy);
-            this.panel1.Controls.Add(this.txt_modifiedBy);
-            this.panel1.Controls.Add(this.lb_createdDate);
-            this.panel1.Controls.Add(this.txt_createdDate);
-            this.panel1.Controls.Add(this.lb_createdBy);
-            this.panel1.Controls.Add(this.txt_createdBy);
-            this.panel1.Controls.Add(this.lb_settleParty);
-            this.panel1.Controls.Add(this.txt_settleParty);
-            this.panel1.Controls.Add(this.lb_receiverName);
-            this.panel1.Controls.Add(this.txt_receiverName);
-            this.panel1.Controls.Add(this.lb_receiverAddress);
-            this.panel1.Controls.Add(this.txt_receiverAddress);
-            this.panel1.Controls.Add(this.lb_receiverContact);
-            this.panel1.Controls.Add(this.txt_receiverContact);
-            this.panel1.Controls.Add(this.lb_receiver);
-            this.panel1.Controls.Add(this.txt_receiver);
-            this.panel1.Controls.Add(this.lb_expressNo);
-            this.panel1.Controls.Add(this.txt_expressNo);
-            this.panel1.Controls.Add(this.lb_salesPerson);
-            this.panel1.Controls.Add(this.txt_salesPerson);
-            this.panel1.Controls.Add(this.lb_salesGroup);
-            this.panel1.Controls.Add(this.txt_salesGroup);
-            this.panel1.Controls.Add(this.lb_warehouseManager);
-            this.panel1.Controls.Add(this.txt_warehouseManager);
-            this.panel1.Controls.Add(this.lb_inventoryGroup);
-            this.panel1.Controls.Add(this.txt_inventoryGroup);
-            this.panel1.Controls.Add(this.lb_inventoryDept);
-            this.panel1.Controls.Add(this.txt_inventoryDept);
-            this.panel1.Controls.Add(this.lb_inventoryOrg);
-            this.panel1.Controls.Add(this.txt_inventoryOrg);
-            this.panel1.Controls.Add(this.lb_deliveryLocation);
-            this.panel1.Controls.Add(this.txt_deliveryLocation);
-            this.panel1.Controls.Add(this.lb_returnReason);
-            this.panel1.Controls.Add(this.txt_returnReason);
-            this.panel1.Controls.Add(this.lb_returnCustomer);
-            this.panel1.Controls.Add(this.txt_returnCustomer);
-            this.panel1.Controls.Add(this.lb_customerOrderNo);
-            this.panel1.Controls.Add(this.lb_salesDept);
-            this.panel1.Controls.Add(this.txt_salesDept);
-            this.panel1.Controls.Add(this.lb_salesOrg);
-            this.panel1.Controls.Add(this.txt_salesOrg);
-            this.panel1.Controls.Add(this.lb_fDate);
-            this.panel1.Controls.Add(this.txt_fDate);
-            this.panel1.Controls.Add(this.lb_billNo);
-            this.panel1.Controls.Add(this.txt_billNo);
-            this.panel1.Controls.Add(this.lb_billType);
-            this.panel1.Controls.Add(this.lb_id);
-            this.panel1.Controls.Add(this.txt_id);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 302);
-            this.panel1.TabIndex = 1;
-            // 
-            // txt_billType
-            // 
-            this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
-            this.txt_billType.Location = new System.Drawing.Point(589, 260);
-            this.txt_billType.Name = "txt_billType";
-            this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_billType.Properties.Items.AddRange(new object[] {
-            "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
-            this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_billType.Size = new System.Drawing.Size(185, 24);
-            this.txt_billType.TabIndex = 451;
-            // 
-            // txt_customerOrderNo
-            // 
-            this.txt_customerOrderNo.IsReadly = false;
-            this.txt_customerOrderNo.Location = new System.Drawing.Point(113, 259);
-            this.txt_customerOrderNo.Name = "txt_customerOrderNo";
-            this.txt_customerOrderNo.Size = new System.Drawing.Size(141, 29);
-            this.txt_customerOrderNo.TabIndex = 0;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(999, 171);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(1050, 171);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
+            this.gridColumn31.Caption = "鍏ュ簱浣�";
+            this.gridColumn31.FieldName = "rkPositon";
+            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 11;
+            this.gridColumn31.Width = 94;
             // 
             // picCheckBox
             // 
@@ -2184,443 +1767,163 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // tabMxPage2
-            // 
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 236);
-            this.tabMxPage2.Text = "鎵爜鏄庣粏";
-            // 
-            // panelMx1
-            // 
-            this.panelMx1.Controls.Add(this.ucBtnPrint1);
-            this.panelMx1.Controls.Add(this.lbMxGuid);
-            this.panelMx1.Controls.Add(this.txt_iCount_1);
-            this.panelMx1.Controls.Add(this.labelControl14);
-            this.panelMx1.Controls.Add(this.txt_psnQty_1);
-            this.panelMx1.Controls.Add(this.labelControl12);
-            this.panelMx1.Controls.Add(this.txtKdy);
-            this.panelMx1.Controls.Add(this.labelControl13);
-            this.panelMx1.Controls.Add(this.txtYdy);
-            this.panelMx1.Controls.Add(this.labelControl1);
-            this.panelMx1.Controls.Add(this.txtQuantity);
-            this.panelMx1.Controls.Add(this.labelControl10);
-            this.panelMx1.Controls.Add(this.txtWlgg);
-            this.panelMx1.Controls.Add(this.labelControl9);
-            this.panelMx1.Controls.Add(this.txtWlmc);
-            this.panelMx1.Controls.Add(this.labelControl8);
-            this.panelMx1.Controls.Add(this.txtWlid);
-            this.panelMx1.Controls.Add(this.labelControl7);
-            this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelMx1.Location = new System.Drawing.Point(0, 0);
-            this.panelMx1.Name = "panelMx1";
-            this.panelMx1.Size = new System.Drawing.Size(1124, 102);
-            this.panelMx1.TabIndex = 3;
-            // 
-            // ucBtnPrint1
-            // 
-            this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
-            this.ucBtnPrint1.Name = "ucBtnPrint1";
-            this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
-            this.ucBtnPrint1.TabIndex = 230;
-            // 
-            // lbMxGuid
-            // 
-            this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
-            this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
-            this.lbMxGuid.TabIndex = 229;
-            this.lbMxGuid.Text = "lbMxGuid";
-            this.lbMxGuid.Visible = false;
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_iCount_1.TabIndex = 228;
-            // 
-            // labelControl14
-            // 
-            this.labelControl14.Location = new System.Drawing.Point(543, 39);
-            this.labelControl14.Name = "labelControl14";
-            this.labelControl14.Size = new System.Drawing.Size(105, 18);
-            this.labelControl14.TabIndex = 227;
-            this.labelControl14.Text = "鎵撳嵃鏉$爜寮犳暟锛�";
-            // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_psnQty_1.TabIndex = 226;
-            // 
-            // labelControl12
-            // 
-            this.labelControl12.Location = new System.Drawing.Point(543, 9);
-            this.labelControl12.Name = "labelControl12";
-            this.labelControl12.Size = new System.Drawing.Size(105, 18);
-            this.labelControl12.TabIndex = 225;
-            this.labelControl12.Text = "姣忓紶鏉$爜鏁伴噺锛�";
-            // 
-            // txtKdy
-            // 
-            this.txtKdy.Location = new System.Drawing.Point(430, 65);
-            this.txtKdy.Name = "txtKdy";
-            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txtKdy.Properties.Appearance.Options.UseFont = true;
-            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
-            this.txtKdy.Properties.ReadOnly = true;
-            this.txtKdy.Size = new System.Drawing.Size(96, 28);
-            this.txtKdy.TabIndex = 224;
-            // 
-            // labelControl13
-            // 
-            this.labelControl13.Location = new System.Drawing.Point(346, 70);
-            this.labelControl13.Name = "labelControl13";
-            this.labelControl13.Size = new System.Drawing.Size(80, 18);
-            this.labelControl13.TabIndex = 223;
-            this.labelControl13.Text = "鍙墦鍗版�绘暟:";
-            // 
-            // txtYdy
-            // 
-            this.txtYdy.Location = new System.Drawing.Point(430, 34);
-            this.txtYdy.Name = "txtYdy";
-            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtYdy.Properties.Appearance.Options.UseFont = true;
-            this.txtYdy.Properties.ReadOnly = true;
-            this.txtYdy.Size = new System.Drawing.Size(96, 28);
-            this.txtYdy.TabIndex = 222;
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Location = new System.Drawing.Point(346, 39);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(80, 18);
-            this.labelControl1.TabIndex = 221;
-            this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
-            // 
-            // txtQuantity
-            // 
-            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
-            this.txtQuantity.Name = "txtQuantity";
-            this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
-            this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(96, 28);
-            this.txtQuantity.TabIndex = 220;
-            // 
-            // labelControl10
-            // 
-            this.labelControl10.Location = new System.Drawing.Point(331, 9);
-            this.labelControl10.Name = "labelControl10";
-            this.labelControl10.Size = new System.Drawing.Size(95, 18);
-            this.labelControl10.TabIndex = 219;
-            this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
-            // 
-            // txtWlgg
-            // 
-            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
-            this.txtWlgg.Name = "txtWlgg";
-            this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
-            this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(236, 28);
-            this.txtWlgg.TabIndex = 218;
-            // 
-            // labelControl9
-            // 
-            this.labelControl9.Location = new System.Drawing.Point(20, 70);
-            this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(65, 18);
-            this.labelControl9.TabIndex = 217;
-            this.labelControl9.Text = "鐗╂枡瑙勬牸:";
-            // 
-            // txtWlmc
-            // 
-            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
-            this.txtWlmc.Name = "txtWlmc";
-            this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
-            this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(236, 28);
-            this.txtWlmc.TabIndex = 216;
-            // 
-            // labelControl8
-            // 
-            this.labelControl8.Location = new System.Drawing.Point(20, 39);
-            this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(65, 18);
-            this.labelControl8.TabIndex = 215;
-            this.labelControl8.Text = "鐗╂枡鍚嶇О:";
-            // 
-            // txtWlid
-            // 
-            this.txtWlid.Location = new System.Drawing.Point(90, 4);
-            this.txtWlid.Name = "txtWlid";
-            this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlid.Properties.Appearance.Options.UseFont = true;
-            this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(236, 28);
-            this.txtWlid.TabIndex = 214;
-            // 
-            // labelControl7
-            // 
-            this.labelControl7.Location = new System.Drawing.Point(20, 9);
-            this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(65, 18);
-            this.labelControl7.TabIndex = 213;
-            this.labelControl7.Text = "鐗╂枡缂栫爜:";
-            // 
             // Frm_SalesReturnNotice
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1276, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_SalesReturnNotice";
             this.Text = "閿�鍞��璐х敵璇峰崟";
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            this.splitMx1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).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.repositoryItemSearchLookUpEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_settleParty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiverName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiverAddress.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiverContact.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_receiver.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_expressNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesPerson.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesGroup.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_warehouseManager.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryGroup.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryDept.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_id.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();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
-            this.panelMx1.ResumeLayout(false);
-            this.panelMx1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
         private UserControls.Data.UcPageBar pageBar1;
-        private System.Windows.Forms.Panel panel1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_customerOrderNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrg;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_salesDept;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_salesPerson;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createdDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_approvedBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_approvedDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
+        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
+        private UserControl.UcLookSales txt_salesOrderId;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
+        private DevExpress.XtraEditors.TextEdit txt_approvedDate;
+        private DevExpress.XtraEditors.TextEdit txt_approvedBy;
+        private DevExpress.XtraEditors.TextEdit txt_modifiedDate;
+        private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
+        private DevExpress.XtraEditors.TextEdit txt_createdDate;
+        private DevExpress.XtraEditors.TextEdit txt_createdBy;
+        private DevExpress.XtraEditors.TextEdit txt_salerName;
+        private DevExpress.XtraEditors.TextEdit txt_custName;
+        private DevExpress.XtraEditors.TextEdit txt_inventoryOrg;
+        private DevExpress.XtraEditors.TextEdit txt_returnReason;
+        private DevExpress.XtraEditors.TextEdit txt_saleDeptName;
+        private DevExpress.XtraEditors.TextEdit txt_xsOrgName;
+        private DevExpress.XtraEditors.TextEdit txt_billNo;
+        private DevExpress.XtraEditors.TextEdit txt_id;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-
-        //BQCreateConrolObejct
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpHeadId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpLineId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceBillType;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerTypeId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryQuantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesClerk;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnType;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1note;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotNumber;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1planTrackingNumber;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1warehouse;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesQuantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesUnitId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialSpecification;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
-        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_billStatus;
-        private DevExpress.XtraEditors.TextEdit txt_billStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_manualCloseFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_cancelDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_cancelledBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_approvedDate;
-        private DevExpress.XtraEditors.TextEdit txt_approvedDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_approvedDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_approvedBy;
-        private DevExpress.XtraEditors.TextEdit txt_approvedBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_approvedBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closeReason;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_closedBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_modifiedDate;
-        private DevExpress.XtraEditors.TextEdit txt_modifiedDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_modifiedBy;
-        private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_createdDate;
-        private DevExpress.XtraEditors.TextEdit txt_createdDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createdDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_createdBy;
-        private DevExpress.XtraEditors.TextEdit txt_createdBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_settleParty;
-        private DevExpress.XtraEditors.TextEdit txt_settleParty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_settleParty;
-
-        private DevExpress.XtraEditors.LabelControl lb_receiverName;
-        private DevExpress.XtraEditors.TextEdit txt_receiverName;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_receiverName;
-
-        private DevExpress.XtraEditors.LabelControl lb_receiverAddress;
-        private DevExpress.XtraEditors.TextEdit txt_receiverAddress;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_receiverAddress;
-
-        private DevExpress.XtraEditors.LabelControl lb_receiverContact;
-        private DevExpress.XtraEditors.TextEdit txt_receiverContact;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_receiverContact;
-
-        private DevExpress.XtraEditors.LabelControl lb_receiver;
-        private DevExpress.XtraEditors.TextEdit txt_receiver;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_receiver;
-
-        private DevExpress.XtraEditors.LabelControl lb_expressNo;
-        private DevExpress.XtraEditors.TextEdit txt_expressNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_expressNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_salesPerson;
-        private DevExpress.XtraEditors.TextEdit txt_salesPerson;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_salesPerson;
-
-        private DevExpress.XtraEditors.LabelControl lb_salesGroup;
-        private DevExpress.XtraEditors.TextEdit txt_salesGroup;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_salesGroup;
-
-        private DevExpress.XtraEditors.LabelControl lb_warehouseManager;
-        private DevExpress.XtraEditors.TextEdit txt_warehouseManager;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_warehouseManager;
-
-        private DevExpress.XtraEditors.LabelControl lb_inventoryGroup;
-        private DevExpress.XtraEditors.TextEdit txt_inventoryGroup;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryGroup;
-
-        private DevExpress.XtraEditors.LabelControl lb_inventoryDept;
-        private DevExpress.XtraEditors.TextEdit txt_inventoryDept;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryDept;
-
-        private DevExpress.XtraEditors.LabelControl lb_inventoryOrg;
-        private DevExpress.XtraEditors.TextEdit txt_inventoryOrg;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryOrg;
-
-        private DevExpress.XtraEditors.LabelControl lb_deliveryLocation;
-        private DevExpress.XtraEditors.TextEdit txt_deliveryLocation;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_deliveryLocation;
-
-        private DevExpress.XtraEditors.LabelControl lb_returnReason;
-        private DevExpress.XtraEditors.TextEdit txt_returnReason;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_taobaoRemark;
-
-        private DevExpress.XtraEditors.LabelControl lb_returnCustomer;
-        private DevExpress.XtraEditors.TextEdit txt_returnCustomer;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_returnCustomer;
-
-        private DevExpress.XtraEditors.LabelControl lb_customerOrderNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_customerOrderNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_salesDept;
-        private DevExpress.XtraEditors.TextEdit txt_salesDept;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_salesDept;
-
-        private DevExpress.XtraEditors.LabelControl lb_salesOrg;
-        private DevExpress.XtraEditors.TextEdit txt_salesOrg;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrg;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_currency;
-
-        private DevExpress.XtraEditors.LabelControl lb_fDate;
-        private DevExpress.XtraEditors.TextEdit txt_fDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_billNo;
-        private DevExpress.XtraEditors.TextEdit txt_billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_billType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billType;
-
-        private DevExpress.XtraEditors.LabelControl lb_id;
-        private DevExpress.XtraEditors.TextEdit txt_id;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-        private System.Windows.Forms.PictureBox picCheckBox;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private UserControl.UcLookSales txt_customerOrderNo;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
-        private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
@@ -2628,33 +1931,57 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialName;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialSpecification;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesUnitId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesQuantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1note;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnDate;
+        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnType;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraEditors.PanelControl panelMx1;
-        private UserControl.UcBtnPrint ucBtnPrint1;
-        private DevExpress.XtraEditors.LabelControl lbMxGuid;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
-        private DevExpress.XtraEditors.LabelControl labelControl14;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
-        private DevExpress.XtraEditors.LabelControl labelControl12;
-        private DevExpress.XtraEditors.TextEdit txtKdy;
-        private DevExpress.XtraEditors.LabelControl labelControl13;
-        private DevExpress.XtraEditors.TextEdit txtYdy;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit txtQuantity;
-        private DevExpress.XtraEditors.LabelControl labelControl10;
-        private DevExpress.XtraEditors.TextEdit txtWlgg;
-        private DevExpress.XtraEditors.LabelControl labelControl9;
-        private DevExpress.XtraEditors.TextEdit txtWlmc;
-        private DevExpress.XtraEditors.LabelControl labelControl8;
-        private DevExpress.XtraEditors.TextEdit txtWlid;
-        private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private UserControl.UcLookCk txt_fstockid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3