From fbe33a615f1c4e798a0f8e58163e68c3ce789614 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:17:49 +0800
Subject: [PATCH] 初始化标准版

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 1664 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 865 insertions(+), 799 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index d3612b5..0c3f026 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -54,11 +54,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -86,53 +81,62 @@
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = 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.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
+            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+            this.txt_returnCustomer = new Gs.DevApp.UserControl.UcLookCustomer();
+            this.txt_salesDept = new Gs.DevApp.UserControl.UcLookDepartment();
+            this.txt_inventoryOrg = new Gs.DevApp.UserControl.UcLookOrg();
+            this.txt_salesOrg = new Gs.DevApp.UserControl.UcLookOrg();
+            this.txt_fHasLinkRad = new DevExpress.XtraEditors.RadioGroup();
             this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_salesOrderId = new Gs.DevApp.UserControl.UcLookSales();
             this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
-            this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit();
+            this.txt_shUserName2 = 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_xgUserName1 = 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.txt_fHasLinkSource = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_xsms = new DevExpress.XtraEditors.ComboBoxEdit();
             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.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.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.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem100 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem101 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -167,18 +171,6 @@
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
-            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -215,8 +207,6 @@
             this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -238,46 +228,49 @@
             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_fHasLinkRad.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_shUserName2.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_xgUserName1.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.txt_fHasLinkSource.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.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.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.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.layItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem100)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem101)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -318,8 +311,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
@@ -327,7 +318,6 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -340,9 +330,10 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1799, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -350,10 +341,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1799, 736);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -362,8 +354,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1797, 698);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -372,6 +365,7 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -384,17 +378,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1274, 570);
+            this.split1.Size = new System.Drawing.Size(1797, 698);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1274, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1797, 635);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -423,9 +419,11 @@
             this.gv_customerOrderNo,
             this.gridColumn24,
             this.gridColumn25,
-            this.gridColumn26});
+            this.gridColumn26,
+            this.gridColumn2});
+            this.gridView1.DetailHeight = 428;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 62;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -436,266 +434,269 @@
             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.MinWidth = 62;
             this.gv_id.Name = "gv_id";
             this.gv_id.OptionsColumn.AllowEdit = false;
             this.gv_id.Tag = "query_a.ID";
-            this.gv_id.Width = 94;
+            this.gv_id.Width = 117;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "瀹℃牳鏍囪瘑";
             this.gridColumn1.FieldName = "chkStatus";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.MinWidth = 31;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.Width = 117;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "瀹岀粨鏍囪瘑";
-            this.gridColumn19.FieldName = "wjStatus";
-            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.FieldName = "txtColor";
+            this.gridColumn19.MinWidth = 31;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 1;
-            this.gridColumn19.Width = 94;
+            this.gridColumn19.Width = 117;
             // 
             // gridColumn27
             // 
             this.gridColumn27.Caption = "婧愬崟鏍囪瘑";
-            this.gridColumn27.FieldName = "fIsLink";
-            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.FieldName = "fHasLinkTxt";
+            this.gridColumn27.MinWidth = 31;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 3;
-            this.gridColumn27.Width = 94;
+            this.gridColumn27.VisibleIndex = 2;
+            this.gridColumn27.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_billType.VisibleIndex = 14;
+            this.gv_billType.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_billNo.VisibleIndex = 3;
+            this.gv_billNo.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_salesOrg.VisibleIndex = 13;
+            this.gv_salesOrg.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_salesDept.VisibleIndex = 5;
+            this.gv_salesDept.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_salesPerson.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_returnReason.VisibleIndex = 6;
+            this.gv_returnReason.Width = 117;
             // 
             // 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.FieldName = "cjPeople";
+            this.gv_createdBy.MinWidth = 62;
             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;
+            this.gv_createdBy.VisibleIndex = 7;
+            this.gv_createdBy.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_createdDate.VisibleIndex = 8;
+            this.gv_createdDate.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_modifiedBy.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_modifiedDate.Width = 117;
             // 
             // 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.FieldName = "shPeople";
+            this.gv_approvedBy.MinWidth = 62;
             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;
+            this.gv_approvedBy.VisibleIndex = 9;
+            this.gv_approvedBy.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_approvedDate.VisibleIndex = 10;
+            this.gv_approvedDate.Width = 117;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "瀹㈡埛";
             this.gridColumn18.FieldName = "custName";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 31;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 16;
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.VisibleIndex = 4;
+            this.gridColumn18.Width = 117;
             // 
             // 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.MinWidth = 62;
             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;
+            this.gv_customerOrderNo.Width = 117;
             // 
             // gridColumn24
             // 
             this.gridColumn24.Caption = "浠撳簱ID";
             this.gridColumn24.FieldName = "ckId";
-            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.MinWidth = 31;
             this.gridColumn24.Name = "gridColumn24";
-            this.gridColumn24.Width = 94;
+            this.gridColumn24.Width = 117;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "浠撳簱鍚嶇О";
             this.gridColumn25.FieldName = "ckName";
-            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.MinWidth = 31;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 17;
-            this.gridColumn25.Width = 94;
+            this.gridColumn25.VisibleIndex = 11;
+            this.gridColumn25.Width = 117;
             // 
             // gridColumn26
             // 
             this.gridColumn26.Caption = "浠撳簱缂栧彿";
             this.gridColumn26.FieldName = "ckNo";
-            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.MinWidth = 31;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 18;
-            this.gridColumn26.Width = 94;
+            this.gridColumn26.VisibleIndex = 12;
+            this.gridColumn26.Width = 117;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鏁版嵁鏉ユ簮";
+            this.gridColumn2.FieldName = "fHasLinkSource";
+            this.gridColumn2.MinWidth = 31;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 15;
+            this.gridColumn2.Width = 117;
             // 
             // 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.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1274, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1797, 48);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1797, 698);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -703,6 +704,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -715,92 +717,169 @@
             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.Size = new System.Drawing.Size(1437, 570);
+            this.splitMx1.SplitterPosition = 182;
+ 
+            this.splitMx1.Size = new System.Drawing.Size(1797, 698);
+            this.splitMx1.SplitterPosition = 213;
+ 
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
-            this.layoutMx1.Controls.Add(this.txt_fIsLink);
+            this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
+            this.layoutMx1.Controls.Add(this.btnSelect);
+            this.layoutMx1.Controls.Add(this.txt_returnCustomer);
+            this.layoutMx1.Controls.Add(this.txt_salesDept);
+            this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
+            this.layoutMx1.Controls.Add(this.txt_salesOrg);
+            this.layoutMx1.Controls.Add(this.txt_fHasLinkRad);
             this.layoutMx1.Controls.Add(this.txt_fstockid);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_wjStatus);
             this.layoutMx1.Controls.Add(this.txt_chkStatus);
             this.layoutMx1.Controls.Add(this.txt_billType);
-            this.layoutMx1.Controls.Add(this.txt_salesOrderId);
             this.layoutMx1.Controls.Add(this.txt_approvedDate);
             this.layoutMx1.Controls.Add(this.txt_id);
-            this.layoutMx1.Controls.Add(this.txt_approvedBy);
-            this.layoutMx1.Controls.Add(this.txt_xsOrgName);
-            this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
+            this.layoutMx1.Controls.Add(this.txt_shUserName2);
             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_xgUserName1);
             this.layoutMx1.Controls.Add(this.txt_saleDeptName);
-            this.layoutMx1.Controls.Add(this.txt_custName);
             this.layoutMx1.Controls.Add(this.txt_createdDate);
             this.layoutMx1.Controls.Add(this.txt_returnReason);
             this.layoutMx1.Controls.Add(this.txt_createdBy);
+            this.layoutMx1.Controls.Add(this.txt_fHasLinkSource);
+            this.layoutMx1.Controls.Add(this.txt_xsms);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem19,
-            this.layoutControlItem1});
+            this.layoutControlItem1,
+            this.layoutControlItem12,
+            this.layoutControlItem11,
+            this.layoutControlItem18,
+            this.layoutControlItem6});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(575, 496, 812, 534);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1274, 184);
+ 
+            this.layoutMx1.Size = new System.Drawing.Size(1437, 182);
+ 
+            this.layoutMx1.Size = new System.Drawing.Size(1797, 213);
+ 
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
-            // txt_fIsLink
+            // ucBtnPrintAll1
             // 
-            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[] {
+            this.ucBtnPrintAll1.Location = new System.Drawing.Point(1074, 140);
+            this.ucBtnPrintAll1.mxList = null;
+            this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+            this.ucBtnPrintAll1.rptType = null;
+            this.ucBtnPrintAll1.Size = new System.Drawing.Size(196, 27);
+            this.ucBtnPrintAll1.TabIndex = 546;
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            this.btnSelect.Location = new System.Drawing.Point(14, 128);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(158, 34);
+            this.btnSelect.StyleController = this.layoutMx1;
+            this.btnSelect.TabIndex = 541;
+            this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
+            // 
+            // txt_returnCustomer
+            // 
+            this.txt_returnCustomer.IsReadly = false;
+            this.txt_returnCustomer.Location = new System.Drawing.Point(537, 52);
+            this.txt_returnCustomer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_returnCustomer.Name = "txt_returnCustomer";
+            this.txt_returnCustomer.Size = new System.Drawing.Size(346, 28);
+            this.txt_returnCustomer.TabIndex = 539;
+            // 
+            // txt_salesDept
+            // 
+            this.txt_salesDept.IsReadly = false;
+            this.txt_salesDept.Location = new System.Drawing.Point(1411, 128);
+            this.txt_salesDept.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_salesDept.Name = "txt_salesDept";
+            this.txt_salesDept.Size = new System.Drawing.Size(346, 28);
+            this.txt_salesDept.TabIndex = 538;
+            // 
+            // txt_inventoryOrg
+            // 
+            this.txt_inventoryOrg.IsReadly = false;
+            this.txt_inventoryOrg.Location = new System.Drawing.Point(974, 128);
+            this.txt_inventoryOrg.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
+            this.txt_inventoryOrg.Size = new System.Drawing.Size(346, 28);
+            this.txt_inventoryOrg.TabIndex = 537;
+            // 
+            // txt_salesOrg
+            // 
+            this.txt_salesOrg.IsReadly = false;
+            this.txt_salesOrg.Location = new System.Drawing.Point(101, 52);
+            this.txt_salesOrg.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_salesOrg.Name = "txt_salesOrg";
+            this.txt_salesOrg.Size = new System.Drawing.Size(345, 28);
+            this.txt_salesOrg.TabIndex = 535;
+            // 
+            // txt_fHasLinkRad
+            // 
+            this.txt_fHasLinkRad.EditValue = "1";
+            this.txt_fHasLinkRad.Location = new System.Drawing.Point(537, 126);
+            this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
+            this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
             new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
-            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;
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
+            this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.txt_fHasLinkRad.Size = new System.Drawing.Size(346, 38);
+            this.txt_fHasLinkRad.StyleController = this.layoutMx1;
+            this.txt_fHasLinkRad.TabIndex = 534;
             // 
             // txt_fstockid
             // 
             this.txt_fstockid.IsReadly = false;
-            this.txt_fstockid.Location = new System.Drawing.Point(84, 110);
+            this.txt_fstockid.Location = new System.Drawing.Point(101, 90);
             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.Size = new System.Drawing.Size(345, 28);
             this.txt_fstockid.TabIndex = 454;
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 131);
+            this.lbGuid.Location = new System.Drawing.Point(1031, 160);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.Size = new System.Drawing.Size(335, 34);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             // 
             // txt_wjStatus
             // 
-            this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);
+            this.txt_wjStatus.Location = new System.Drawing.Point(798, 175);
+            this.txt_wjStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_wjStatus.Name = "txt_wjStatus";
             this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
-            this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);
+            this.txt_wjStatus.Size = new System.Drawing.Size(386, 27);
             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.Location = new System.Drawing.Point(1324, 90);
+            this.txt_chkStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_chkStatus.Size = new System.Drawing.Size(311, 24);
+            this.txt_chkStatus.Size = new System.Drawing.Size(433, 27);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 452;
             this.txt_chkStatus.Tag = "readonly";
@@ -808,163 +887,172 @@
             // txt_billType
             // 
             this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
-            this.txt_billType.Location = new System.Drawing.Point(397, 110);
+            this.txt_billType.Location = new System.Drawing.Point(537, 14);
+            this.txt_billType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(237, 24);
+            this.txt_billType.Size = new System.Drawing.Size(346, 28);
             this.txt_billType.StyleController = this.layoutMx1;
             this.txt_billType.TabIndex = 451;
             // 
-            // txt_salesOrderId
-            // 
-            this.txt_salesOrderId.IsReadly = false;
-            this.txt_salesOrderId.Location = new System.Drawing.Point(84, 77);
-            this.txt_salesOrderId.Name = "txt_salesOrderId";
-            this.txt_salesOrderId.Size = new System.Drawing.Size(237, 24);
-            this.txt_salesOrderId.TabIndex = 0;
-            // 
             // txt_approvedDate
             // 
-            this.txt_approvedDate.Location = new System.Drawing.Point(1023, 110);
+            this.txt_approvedDate.Location = new System.Drawing.Point(1411, 52);
+            this.txt_approvedDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(346, 28);
             this.txt_approvedDate.StyleController = this.layoutMx1;
             this.txt_approvedDate.TabIndex = 378;
             this.txt_approvedDate.Tag = "readonly";
             // 
             // txt_id
             // 
-            this.txt_id.Location = new System.Drawing.Point(90, 3);
+            this.txt_id.Location = new System.Drawing.Point(112, 4);
+            this.txt_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(236, 28);
             this.txt_id.StyleController = this.layoutMx1;
             this.txt_id.TabIndex = 210;
             this.txt_id.Tag = "readonly";
             // 
-            // txt_approvedBy
+            // txt_shUserName2
             // 
-            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";
-            // 
-            // txt_xsOrgName
-            // 
-            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";
-            // 
-            // txt_inventoryOrg
-            // 
-            this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12);
-            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
-            this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
-            this.txt_inventoryOrg.StyleController = this.layoutMx1;
-            this.txt_inventoryOrg.TabIndex = 243;
-            this.txt_inventoryOrg.Tag = "readonly";
+            this.txt_shUserName2.Location = new System.Drawing.Point(1411, 14);
+            this.txt_shUserName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_shUserName2.Name = "txt_shUserName2";
+            this.txt_shUserName2.Properties.Appearance.Options.UseFont = true;
+            this.txt_shUserName2.Size = new System.Drawing.Size(346, 28);
+            this.txt_shUserName2.StyleController = this.layoutMx1;
+            this.txt_shUserName2.TabIndex = 370;
+            this.txt_shUserName2.Tag = "readonly";
             // 
             // txt_modifiedDate
             // 
-            this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44);
+            this.txt_modifiedDate.Location = new System.Drawing.Point(974, 52);
+            this.txt_modifiedDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(346, 28);
             this.txt_modifiedDate.StyleController = this.layoutMx1;
             this.txt_modifiedDate.TabIndex = 336;
             this.txt_modifiedDate.Tag = "readonly";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(101, 14);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(345, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readonly";
             // 
             // txt_salerName
             // 
-            this.txt_salerName.Location = new System.Drawing.Point(397, 44);
+            this.txt_salerName.Location = new System.Drawing.Point(875, 54);
+            this.txt_salerName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(290, 28);
             this.txt_salerName.StyleController = this.layoutMx1;
             this.txt_salerName.TabIndex = 267;
             this.txt_salerName.Tag = "readonly";
             // 
-            // txt_modifiedBy
+            // txt_xgUserName1
             // 
-            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";
+            this.txt_xgUserName1.Location = new System.Drawing.Point(974, 14);
+            this.txt_xgUserName1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_xgUserName1.Name = "txt_xgUserName1";
+            this.txt_xgUserName1.Properties.Appearance.Options.UseFont = true;
+            this.txt_xgUserName1.Size = new System.Drawing.Size(346, 28);
+            this.txt_xgUserName1.StyleController = this.layoutMx1;
+            this.txt_xgUserName1.TabIndex = 327;
+            this.txt_xgUserName1.Tag = "readonly";
             // 
             // txt_saleDeptName
             // 
-            this.txt_saleDeptName.Location = new System.Drawing.Point(397, 77);
+            this.txt_saleDeptName.Location = new System.Drawing.Point(974, 90);
+            this.txt_saleDeptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(346, 28);
             this.txt_saleDeptName.StyleController = this.layoutMx1;
             this.txt_saleDeptName.TabIndex = 222;
             this.txt_saleDeptName.Tag = "readonly";
             // 
-            // txt_custName
-            // 
-            this.txt_custName.Location = new System.Drawing.Point(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";
-            // 
             // txt_createdDate
             // 
-            this.txt_createdDate.Location = new System.Drawing.Point(710, 110);
+            this.txt_createdDate.Location = new System.Drawing.Point(888, 134);
+            this.txt_createdDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(296, 28);
             this.txt_createdDate.StyleController = this.layoutMx1;
             this.txt_createdDate.TabIndex = 319;
             this.txt_createdDate.Tag = "readonly";
             // 
             // txt_returnReason
             // 
-            this.txt_returnReason.Location = new System.Drawing.Point(84, 143);
+            this.txt_returnReason.Location = new System.Drawing.Point(537, 90);
+            this.txt_returnReason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(346, 28);
             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.Location = new System.Drawing.Point(888, 94);
+            this.txt_createdBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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.Size = new System.Drawing.Size(296, 28);
             this.txt_createdBy.StyleController = this.layoutMx1;
             this.txt_createdBy.TabIndex = 312;
             this.txt_createdBy.Tag = "readonly";
+            // 
+            // txt_fHasLinkSource
+            // 
+            this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
+            this.txt_fHasLinkSource.Location = new System.Drawing.Point(537, 166);
+            this.txt_fHasLinkSource.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
+            this.txt_fHasLinkSource.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_fHasLinkSource.Properties.Items.AddRange(new object[] {
+            "閿�鍞嚭搴撳崟(SAL_OUTSTOCK)",
+            "閿�鍞鍗�(SAL_SaleOrder)"});
+            this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fHasLinkSource.Size = new System.Drawing.Size(346, 28);
+            this.txt_fHasLinkSource.StyleController = this.layoutMx1;
+            this.txt_fHasLinkSource.TabIndex = 544;
+            // 
+            // txt_xsms
+            // 
+            this.txt_xsms.EditValue = "-璇烽�夋嫨-";
+            this.txt_xsms.Location = new System.Drawing.Point(974, 166);
+            this.txt_xsms.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_xsms.Name = "txt_xsms";
+            this.txt_xsms.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_xsms.Properties.Items.AddRange(new object[] {
+            "-璇烽�夋嫨-",
+            "1:ODM",
+            "2:OEM",
+            "3:OBM",
+            "4:渚涘簲鍟嗕拱鏂�"});
+            this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_xsms.Size = new System.Drawing.Size(346, 28);
+            this.txt_xsms.StyleController = this.layoutMx1;
+            this.txt_xsms.TabIndex = 545;
             // 
             // layoutControlItem19
             // 
@@ -985,32 +1073,77 @@
             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);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(82, 22);
+            // 
+            // 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(75, 22);
+            // 
+            // 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(75, 22);
+            // 
+            // 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;
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_salerName;
+            this.layoutControlItem6.Location = new System.Drawing.Point(616, 32);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem6.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 22);
             // 
             // 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.layoutControlItem4,
             this.layoutControlItem15,
             this.layoutControlItem16,
             this.layoutControlItem17,
-            this.layoutControlItem18,
-            this.layoutControlItem4,
-            this.layoutControlItem9,
             this.layoutControlItem20,
-            this.layoutControlItem5,
-            this.layoutControlItem21});
+            this.layItem1,
+            this.layoutControlItem21,
+            this.layoutControlItem7,
+            this.layoutControlItem10,
+            this.layItem2,
+            this.layItem3,
+            this.layItem4,
+            this.layItem100,
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem9,
+            this.layoutControlItem3,
+            this.layItem101,
+            this.layoutControlItem2});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1042,221 +1175,256 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1274, 184);
+ 
+            this.Root.Size = new System.Drawing.Size(1437, 182);
+ 
+            this.Root.Size = new System.Drawing.Size(1771, 214);
+ 
             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.Size = new System.Drawing.Size(436, 38);
             this.layoutControlItem4.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_shUserName2;
+            this.layoutControlItem15.Location = new System.Drawing.Point(1310, 0);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_approvedDate;
+            this.layoutControlItem16.Location = new System.Drawing.Point(1310, 38);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem16.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_chkStatus;
+            this.layoutControlItem17.Location = new System.Drawing.Point(1310, 76);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem17.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_fstockid;
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 76);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem20.Size = new System.Drawing.Size(436, 38);
+            this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layItem1
+            // 
+            this.layItem1.Control = this.txt_salesOrg;
+            this.layItem1.Location = new System.Drawing.Point(0, 38);
+            this.layItem1.Name = "layItem1";
+            this.layItem1.OptionsTableLayoutItem.RowIndex = 1;
+            this.layItem1.Size = new System.Drawing.Size(436, 38);
+            this.layItem1.Text = "閿�鍞粍缁�";
+            this.layItem1.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layoutControlItem21.Control = this.txt_fHasLinkRad;
+            this.layoutControlItem21.Location = new System.Drawing.Point(436, 114);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
+            this.layoutControlItem21.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_saleDeptName;
+            this.layoutControlItem7.Location = new System.Drawing.Point(873, 76);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem7.Text = "閿�鍞儴闂�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_billType;
+            this.layoutControlItem10.Location = new System.Drawing.Point(436, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layItem2
+            // 
+            this.layItem2.Control = this.txt_returnCustomer;
+            this.layItem2.Location = new System.Drawing.Point(436, 38);
+            this.layItem2.Name = "layItem2";
+            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layItem2.Size = new System.Drawing.Size(437, 38);
+            this.layItem2.Text = "閫�璐у鎴�";
+            this.layItem2.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layItem3
+            // 
+            this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layItem3.Control = this.txt_inventoryOrg;
+            this.layItem3.Location = new System.Drawing.Point(873, 114);
+            this.layItem3.Name = "layItem3";
+            this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
+            this.layItem3.Size = new System.Drawing.Size(437, 38);
+            this.layItem3.Text = "搴撳瓨缁勭粐";
+            this.layItem3.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layItem4
+            // 
+            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layItem4.Control = this.txt_salesDept;
+            this.layItem4.Location = new System.Drawing.Point(1310, 114);
+            this.layItem4.Name = "layItem4";
+            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
+            this.layItem4.Size = new System.Drawing.Size(437, 38);
+            this.layItem4.Text = "閿�鍞儴闂�";
+            this.layItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layItem100
+            // 
+            this.layItem100.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layItem100.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layItem100.Control = this.txt_fHasLinkSource;
+            this.layItem100.CustomizationFormText = "鏁版嵁鏉ユ簮";
+            this.layItem100.Location = new System.Drawing.Point(436, 152);
+            this.layItem100.Name = "layItem100";
+            this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layItem100.OptionsTableLayoutItem.RowIndex = 4;
+ 
+            this.layItem100.Size = new System.Drawing.Size(354, 34);
+ 
+            this.layItem100.Size = new System.Drawing.Size(437, 38);
+ 
+            this.layItem100.Text = "鏁版嵁鏉ユ簮";
+            this.layItem100.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_xgUserName1;
+            this.layoutControlItem13.Location = new System.Drawing.Point(873, 0);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem13.Text = "淇敼浜哄憳";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_modifiedDate;
+            this.layoutControlItem14.Location = new System.Drawing.Point(873, 38);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(437, 38);
+            this.layoutControlItem14.Text = "淇敼鏃堕棿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_returnReason;
             this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 131);
+            this.layoutControlItem9.Location = new System.Drawing.Point(436, 76);
             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.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(437, 38);
             this.layoutControlItem9.Text = "鐢宠鍘熷洜";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
             // 
-            // layoutControlItem20
+            // layoutControlItem3
             // 
-            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);
+            this.layoutControlItem3.Control = this.btnSelect;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 114);
+            this.layoutControlItem3.MaxSize = new System.Drawing.Size(162, 38);
+            this.layoutControlItem3.MinSize = new System.Drawing.Size(25, 38);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem3.Size = new System.Drawing.Size(436, 38);
+            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
             // 
-            // layoutControlItem5
+            // layItem101
             // 
-            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);
+            this.layItem101.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layItem101.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layItem101.Control = this.txt_xsms;
+            this.layItem101.Location = new System.Drawing.Point(873, 152);
+            this.layItem101.Name = "layItem101";
+            this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
+ 
+            this.layItem101.Size = new System.Drawing.Size(354, 34);
+ 
+            this.layItem101.Size = new System.Drawing.Size(437, 38);
+ 
+            this.layItem101.Text = "閿�鍞ā寮�";
+            this.layItem101.TextSize = new System.Drawing.Size(72, 22);
             // 
-            // layoutControlItem21
+            // layoutControlItem2
             // 
-            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);
+            this.layoutControlItem2.Control = this.ucBtnPrintAll1;
+            this.layoutControlItem2.Location = new System.Drawing.Point(1062, 128);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(200, 31);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(101, 31);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem2.Size = new System.Drawing.Size(355, 34);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.Text = "鎵撳嵃鎵�鏈夋槑缁�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1274, 374);
+ 
+            this.tabMx.Size = new System.Drawing.Size(1437, 376);
+ 
+            this.tabMx.Size = new System.Drawing.Size(1797, 470);
+ 
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1265,8 +1433,13 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.split99);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1272, 342);
+ 
+            this.tabMxPage1.Size = new System.Drawing.Size(1435, 344);
+ 
+            this.tabMxPage1.Size = new System.Drawing.Size(1795, 432);
+ 
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // split99
@@ -1274,6 +1447,7 @@
             this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.split99.Horizontal = false;
             this.split99.Location = new System.Drawing.Point(0, 0);
+            this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.split99.Name = "split99";
             // 
             // split99.Panel1
@@ -1286,8 +1460,13 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1272, 342);
-            this.split99.SplitterPosition = 137;
+ 
+            this.split99.Size = new System.Drawing.Size(1435, 344);
+            this.split99.SplitterPosition = 132;
+ 
+            this.split99.Size = new System.Drawing.Size(1795, 432);
+            this.split99.SplitterPosition = 161;
+ 
             this.split99.TabIndex = 4;
             // 
             // layout99
@@ -1307,10 +1486,11 @@
             this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem29});
             this.layout99.Location = new System.Drawing.Point(0, 0);
+            this.layout99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1272, 137);
+            this.layout99.Size = new System.Drawing.Size(1795, 161);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -1318,29 +1498,32 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+            this.layoutControl1.Location = new System.Drawing.Point(899, 105);
+            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+            this.layoutControl1.Size = new System.Drawing.Size(439, 42);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+            this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);
+            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_1.Properties.ReadOnly = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(92, 28);
             this.txt_iCount_1.StyleController = this.layoutControl1;
             this.txt_iCount_1.TabIndex = 228;
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(344, 2);
+            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(93, 28);
             this.txt_yuliang_1.StyleController = this.layoutControl1;
             this.txt_yuliang_1.TabIndex = 229;
             // 
@@ -1365,7 +1548,7 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition6});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(439, 42);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem33
@@ -1373,33 +1556,34 @@
             this.layoutControlItem33.Control = this.txt_iCount_1;
             this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem33.Size = new System.Drawing.Size(219, 42);
             this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem34
             // 
             this.layoutControlItem34.Control = this.txt_yuliang_1;
-            this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
+            this.layoutControlItem34.Location = new System.Drawing.Point(219, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem34.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem34.Size = new System.Drawing.Size(220, 42);
             this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(108, 22);
             // 
             // ucBtnPrint1
             // 
+            this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1341, 57);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(441, 46);
             this.ucBtnPrint1.TabIndex = 230;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1033, 10);
+            this.radOut.Location = new System.Drawing.Point(1344, 12);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1407,15 +1591,17 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
-            this.radOut.Size = new System.Drawing.Size(227, 28);
+            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.radOut.Size = new System.Drawing.Size(439, 45);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(755, 76);
+            this.lbMxGuid.Location = new System.Drawing.Point(944, 93);
+            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+            this.lbMxGuid.Size = new System.Drawing.Size(72, 22);
             this.lbMxGuid.StyleController = this.layout99;
             this.lbMxGuid.TabIndex = 229;
             this.lbMxGuid.Text = "lbMxGuid";
@@ -1423,72 +1609,79 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(114, 12);
+            this.txtWlid.Location = new System.Drawing.Point(137, 14);
+            this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(234, 24);
+            this.txtWlid.Size = new System.Drawing.Size(315, 28);
             this.txtWlid.StyleController = this.layout99;
             this.txtWlid.TabIndex = 214;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(1022, 59);
+            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(316, 28);
             this.txt_psnQty_1.StyleController = this.layout99;
             this.txt_psnQty_1.TabIndex = 226;
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+            this.txtWlmc.Location = new System.Drawing.Point(137, 59);
+            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+            this.txtWlmc.Size = new System.Drawing.Size(315, 28);
             this.txtWlmc.StyleController = this.layout99;
             this.txtWlmc.TabIndex = 216;
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+            this.txtWlgg.Location = new System.Drawing.Point(137, 105);
+            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+            this.txtWlgg.Size = new System.Drawing.Size(758, 28);
             this.txtWlgg.StyleController = this.layout99;
             this.txtWlgg.TabIndex = 218;
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(1022, 14);
+            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(316, 28);
             this.txt_kQty.StyleController = this.layout99;
             this.txt_kQty.TabIndex = 224;
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+            this.txtQuantity.Location = new System.Drawing.Point(579, 14);
+            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+            this.txtQuantity.Size = new System.Drawing.Size(316, 28);
             this.txtQuantity.StyleController = this.layout99;
             this.txtQuantity.TabIndex = 220;
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+            this.txt_yQty.Location = new System.Drawing.Point(579, 59);
+            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(316, 28);
             this.txt_yQty.StyleController = this.layout99;
             this.txt_yQty.TabIndex = 222;
             // 
@@ -1544,7 +1737,7 @@
             rowDefinition7,
             rowDefinition8,
             rowDefinition9});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1795, 161);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem22
@@ -1552,84 +1745,81 @@
             this.layoutControlItem22.Control = this.txtWlid;
             this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem22.Size = new System.Drawing.Size(442, 45);
             this.layoutControlItem22.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.txtWlmc;
-            this.layoutControlItem23.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem23.Location = new System.Drawing.Point(0, 45);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem23.Size = new System.Drawing.Size(442, 46);
             this.layoutControlItem23.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txtWlgg;
-            this.layoutControlItem24.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem24.Location = new System.Drawing.Point(0, 91);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem24.Size = new System.Drawing.Size(680, 32);
+            this.layoutControlItem24.Size = new System.Drawing.Size(885, 46);
             this.layoutControlItem24.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.txtQuantity;
-            this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
+            this.layoutControlItem25.Location = new System.Drawing.Point(442, 0);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem25.Size = new System.Drawing.Size(443, 45);
             this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem26
             // 
             this.layoutControlItem26.Control = this.txt_yQty;
-            this.layoutControlItem26.Location = new System.Drawing.Point(340, 32);
+            this.layoutControlItem26.Location = new System.Drawing.Point(442, 45);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem26.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem26.Size = new System.Drawing.Size(443, 46);
             this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_kQty;
-            this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
+            this.layoutControlItem27.Location = new System.Drawing.Point(885, 0);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem27.Size = new System.Drawing.Size(443, 45);
             this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_psnQty_1;
-            this.layoutControlItem28.Location = new System.Drawing.Point(680, 32);
+            this.layoutControlItem28.Location = new System.Drawing.Point(885, 45);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem28.Size = new System.Drawing.Size(443, 46);
             this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem30
             // 
             this.layoutControlItem30.Control = this.radOut;
-            this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0);
-            this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
-            this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
+            this.layoutControlItem30.Location = new System.Drawing.Point(1328, 0);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
-            this.layoutControlItem30.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 0, 0, 0);
+            this.layoutControlItem30.Size = new System.Drawing.Size(443, 45);
             this.layoutControlItem30.Text = "鑷姩璁$畻";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem30.TextVisible = false;
@@ -1637,15 +1827,12 @@
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.ucBtnPrint1;
-            this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32);
-            this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
-            this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
+            this.layoutControlItem31.Location = new System.Drawing.Point(1328, 45);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem31.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem31.Size = new System.Drawing.Size(443, 46);
             this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem31.TextVisible = false;
@@ -1653,11 +1840,11 @@
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.layoutControl1;
-            this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
+            this.layoutControlItem32.Location = new System.Drawing.Point(885, 91);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem32.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem32.Size = new System.Drawing.Size(443, 46);
             this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem32.TextVisible = false;
@@ -1665,15 +1852,20 @@
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1,
             this.repositoryItemDateEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1272, 193);
+ 
+            this.gcMx1.Size = new System.Drawing.Size(1435, 200);
+ 
+            this.gcMx1.Size = new System.Drawing.Size(1795, 256);
+ 
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1682,7 +1874,6 @@
             // 
             this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn2,
             this.gvMx1id,
             this.gvMx1materialId,
             this.gvMx1materialName,
@@ -1700,210 +1891,100 @@
             this.gridColumn21,
             this.gridColumn22,
             this.gvMxDel});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
-            this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn2.Caption = "璇烽�夋嫨";
-            this.gridColumn2.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Tag = "edit";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 94;
-            // 
-            // repositoryItemSearchLookUpEdit1
-            // 
-            this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
-            this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
-            this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
-            this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
-            this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
-            // 
-            // gridView2
-            // 
-            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn4,
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gridColumn7,
-            this.gridColumn8,
-            this.gridColumn9,
-            this.gridColumn10,
-            this.gridColumn11,
-            this.gridColumn23});
-            this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.gridView2.Name = "gridView2";
-            this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.gridView2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "閿�鍞崟鍙�";
-            this.gridColumn4.FieldName = "xsHno";
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 0;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
-            this.gridColumn5.FieldName = "fhNo";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 1;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn6.FieldName = "itemNo";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 2;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn7.FieldName = "itemName";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 3;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn8.FieldName = "itemModel";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 4;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
-            this.gridColumn9.FieldName = "fhSl";
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 5;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "宸查��鏁伴噺";
-            this.gridColumn10.FieldName = "ytSl";
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 6;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid";
-            this.gridColumn11.FieldName = "ckmxGuid";
-            this.gridColumn11.Name = "gridColumn11";
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "鐗╂枡ID";
-            this.gridColumn23.FieldName = "itemId";
-            this.gridColumn23.Name = "gridColumn23";
             // 
             // gvMx1id
             // 
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "涓婚敭GUID";
             this.gvMx1id.FieldName = "guid";
-            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.MinWidth = 62;
             this.gvMx1id.Name = "gvMx1id";
             this.gvMx1id.Tag = "query_a.ID";
-            this.gvMx1id.Width = 94;
+            this.gvMx1id.Width = 117;
             // 
             // gvMx1materialId
             // 
             this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
             this.gvMx1materialId.Caption = "鐗╂枡ID ";
             this.gvMx1materialId.FieldName = "itemId";
-            this.gvMx1materialId.MinWidth = 50;
+            this.gvMx1materialId.MinWidth = 62;
             this.gvMx1materialId.Name = "gvMx1materialId";
             this.gvMx1materialId.Tag = "query_a.MATERIAL_ID";
-            this.gvMx1materialId.Width = 94;
+            this.gvMx1materialId.Width = 117;
             // 
             // gvMx1materialName
             // 
             this.gvMx1materialName.AppearanceCell.Options.UseFont = true;
             this.gvMx1materialName.Caption = "鐗╂枡鍚嶇О ";
             this.gvMx1materialName.FieldName = "itemName";
-            this.gvMx1materialName.MinWidth = 50;
+            this.gvMx1materialName.MinWidth = 62;
             this.gvMx1materialName.Name = "gvMx1materialName";
             this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
             this.gvMx1materialName.Visible = true;
-            this.gvMx1materialName.VisibleIndex = 1;
-            this.gvMx1materialName.Width = 94;
+            this.gvMx1materialName.VisibleIndex = 0;
+            this.gvMx1materialName.Width = 117;
             // 
             // gvMx1materialSpecification
             // 
             this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;
             this.gvMx1materialSpecification.Caption = "鐗╂枡瑙勬牸 ";
             this.gvMx1materialSpecification.FieldName = "itemModel";
-            this.gvMx1materialSpecification.MinWidth = 50;
+            this.gvMx1materialSpecification.MinWidth = 62;
             this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
             this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
             this.gvMx1materialSpecification.Visible = true;
-            this.gvMx1materialSpecification.VisibleIndex = 2;
-            this.gvMx1materialSpecification.Width = 94;
+            this.gvMx1materialSpecification.VisibleIndex = 8;
+            this.gvMx1materialSpecification.Width = 117;
             // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "鐗╂枡缂栫爜";
             this.gridColumn20.FieldName = "itemNo";
-            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.MinWidth = 31;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 3;
-            this.gridColumn20.Width = 94;
+            this.gridColumn20.VisibleIndex = 1;
+            this.gridColumn20.Width = 117;
             // 
             // gvMx1salesUnitId
             // 
             this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;
             this.gvMx1salesUnitId.Caption = "閿�鍞崟浣� ";
             this.gvMx1salesUnitId.FieldName = "xxDw";
-            this.gvMx1salesUnitId.MinWidth = 50;
+            this.gvMx1salesUnitId.MinWidth = 62;
             this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
             this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
             this.gvMx1salesUnitId.Visible = true;
-            this.gvMx1salesUnitId.VisibleIndex = 4;
-            this.gvMx1salesUnitId.Width = 94;
+            this.gvMx1salesUnitId.VisibleIndex = 2;
+            this.gvMx1salesUnitId.Width = 117;
             // 
             // gvMx1salesQuantity
             // 
             this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1salesQuantity.Caption = "閿�鍞暟閲� ";
             this.gvMx1salesQuantity.FieldName = "salesQuantity";
-            this.gvMx1salesQuantity.MinWidth = 50;
+            this.gvMx1salesQuantity.MinWidth = 62;
             this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
             this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
             this.gvMx1salesQuantity.Visible = true;
-            this.gvMx1salesQuantity.VisibleIndex = 5;
-            this.gvMx1salesQuantity.Width = 94;
+            this.gvMx1salesQuantity.VisibleIndex = 3;
+            this.gvMx1salesQuantity.Width = 117;
             // 
             // gridColumn32
             // 
             this.gridColumn32.Caption = "鍙戣揣鎬婚噺";
             this.gridColumn32.FieldName = "fhQuantity";
-            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.MinWidth = 31;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 13;
-            this.gridColumn32.Width = 94;
+            this.gridColumn32.VisibleIndex = 12;
+            this.gridColumn32.Width = 117;
             // 
             // gvMx1note
             // 
@@ -1914,12 +1995,12 @@
             this.gvMx1note.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1note.Caption = "鐢宠澶囨敞 ";
             this.gvMx1note.FieldName = "note";
-            this.gvMx1note.MinWidth = 50;
+            this.gvMx1note.MinWidth = 62;
             this.gvMx1note.Name = "gvMx1note";
             this.gvMx1note.Tag = "edit";
             this.gvMx1note.Visible = true;
-            this.gvMx1note.VisibleIndex = 7;
-            this.gvMx1note.Width = 94;
+            this.gvMx1note.VisibleIndex = 5;
+            this.gvMx1note.Width = 117;
             // 
             // gridColumn13
             // 
@@ -1929,12 +2010,12 @@
             this.gridColumn13.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn13.Caption = "鐢宠鏁伴噺";
             this.gridColumn13.FieldName = "sqQty";
-            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.MinWidth = 31;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "yz_quantity_0_edit";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 6;
-            this.gridColumn13.Width = 94;
+            this.gridColumn13.VisibleIndex = 4;
+            this.gridColumn13.Width = 117;
             // 
             // gvMx1returnDate
             // 
@@ -1946,12 +2027,12 @@
             this.gvMx1returnDate.Caption = "閫�璐ф棩鏈� ";
             this.gvMx1returnDate.ColumnEdit = this.repositoryItemDateEdit1;
             this.gvMx1returnDate.FieldName = "returnDate";
-            this.gvMx1returnDate.MinWidth = 50;
+            this.gvMx1returnDate.MinWidth = 62;
             this.gvMx1returnDate.Name = "gvMx1returnDate";
             this.gvMx1returnDate.Tag = "edit";
             this.gvMx1returnDate.Visible = true;
-            this.gvMx1returnDate.VisibleIndex = 8;
-            this.gvMx1returnDate.Width = 94;
+            this.gvMx1returnDate.VisibleIndex = 6;
+            this.gvMx1returnDate.Width = 117;
             // 
             // repositoryItemDateEdit1
             // 
@@ -1967,12 +2048,12 @@
             this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
             this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
             this.gvMx1isFree.FieldName = "isFreeChk";
-            this.gvMx1isFree.MinWidth = 50;
+            this.gvMx1isFree.MinWidth = 62;
             this.gvMx1isFree.Name = "gvMx1isFree";
             this.gvMx1isFree.Tag = "query_a.IS_FREE";
             this.gvMx1isFree.Visible = true;
-            this.gvMx1isFree.VisibleIndex = 10;
-            this.gvMx1isFree.Width = 94;
+            this.gvMx1isFree.VisibleIndex = 9;
+            this.gvMx1isFree.Width = 117;
             // 
             // gvMx1returnType
             // 
@@ -1984,12 +2065,12 @@
             this.gvMx1returnType.Caption = "閫�璐х被鍨� ";
             this.gvMx1returnType.ColumnEdit = this.repositoryItemComboBox1;
             this.gvMx1returnType.FieldName = "returnType";
-            this.gvMx1returnType.MinWidth = 50;
+            this.gvMx1returnType.MinWidth = 62;
             this.gvMx1returnType.Name = "gvMx1returnType";
             this.gvMx1returnType.Tag = "edit";
             this.gvMx1returnType.Visible = true;
-            this.gvMx1returnType.VisibleIndex = 9;
-            this.gvMx1returnType.Width = 94;
+            this.gvMx1returnType.VisibleIndex = 7;
+            this.gvMx1returnType.Width = 117;
             // 
             // repositoryItemComboBox1
             // 
@@ -2008,39 +2089,39 @@
             // 
             this.gridColumn12.Caption = "閫佽揣鏄庣粏guid";
             this.gridColumn12.FieldName = "deliveDetailGuid";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.Width = 117;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "鍙墦鍗版暟閲�";
             this.gridColumn21.FieldName = "kdy";
-            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.MinWidth = 31;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 11;
-            this.gridColumn21.Width = 94;
+            this.gridColumn21.VisibleIndex = 10;
+            this.gridColumn21.Width = 117;
             // 
             // gridColumn22
             // 
             this.gridColumn22.Caption = "宸叉墦鍗版暟閲�";
             this.gridColumn22.FieldName = "ydy";
-            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.MinWidth = 31;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 12;
-            this.gridColumn22.Width = 94;
+            this.gridColumn22.VisibleIndex = 11;
+            this.gridColumn22.Width = 117;
             // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.MinWidth = 31;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 14;
-            this.gvMxDel.Width = 94;
+            this.gvMxDel.VisibleIndex = 13;
+            this.gvMxDel.Width = 117;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -2056,19 +2137,28 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1272, 342);
+ 
+            this.tabMxPage2.Size = new System.Drawing.Size(1435, 344);
+ 
+            this.tabMxPage2.Size = new System.Drawing.Size(1794, 428);
+ 
             this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptChongDa});
-            this.gcMx2.Size = new System.Drawing.Size(1272, 342);
+ 
+            this.gcMx2.Size = new System.Drawing.Size(1435, 344);
+ 
+            this.gcMx2.Size = new System.Drawing.Size(1794, 428);
+ 
             this.gcMx2.TabIndex = 3;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2089,8 +2179,8 @@
             this.gridColumn28,
             this.gridColumn29,
             this.gridColumn30,
-            this.gridColumn31,
-            this.gvBtnAlawys});
+            this.gridColumn31});
+            this.gvMx2.DetailHeight = 428;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2102,166 +2192,146 @@
             this.gridColumn3.AppearanceCell.Options.UseFont = true;
             this.gridColumn3.Caption = "guid";
             this.gridColumn3.FieldName = "guid";
-            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.MinWidth = 62;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Tag = "query_a.guid";
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 117;
             // 
             // gvMx1itemBarcode
             // 
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
-            this.gvMx1itemBarcode.MinWidth = 25;
+            this.gvMx1itemBarcode.MinWidth = 31;
             this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
             this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx1itemBarcode.Visible = true;
             this.gvMx1itemBarcode.VisibleIndex = 0;
-            this.gvMx1itemBarcode.Width = 300;
+            this.gvMx1itemBarcode.Width = 375;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鐗╂枡缂栫爜";
             this.gridColumn14.FieldName = "itemNo";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 31;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 1;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 117;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn15.FieldName = "itemName";
-            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.MinWidth = 31;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 2;
-            this.gridColumn15.Width = 94;
+            this.gridColumn15.Width = 117;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn16.FieldName = "itemModel";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.MinWidth = 31;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 3;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.Width = 117;
             // 
             // gvMx1quantity
             // 
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.MinWidth = 62;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.QUANTITY";
             this.gvMx1quantity.Visible = true;
             this.gvMx1quantity.VisibleIndex = 4;
-            this.gvMx1quantity.Width = 94;
+            this.gvMx1quantity.Width = 117;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鍗曚綅";
             this.gridColumn17.FieldName = "dwName";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.MinWidth = 31;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 5;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.Width = 117;
             // 
             // gvMx1createBy
             // 
             this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
             this.gvMx1createBy.Caption = "鍒涘缓浜�";
             this.gvMx1createBy.FieldName = "createBy";
-            this.gvMx1createBy.MinWidth = 25;
+            this.gvMx1createBy.MinWidth = 31;
             this.gvMx1createBy.Name = "gvMx1createBy";
             this.gvMx1createBy.Tag = "query_a.CREATE_BY";
             this.gvMx1createBy.Visible = true;
             this.gvMx1createBy.VisibleIndex = 6;
-            this.gvMx1createBy.Width = 94;
+            this.gvMx1createBy.Width = 117;
             // 
             // gvMx1lotDate
             // 
             this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
             this.gvMx1lotDate.FieldName = "createDate";
-            this.gvMx1lotDate.MinWidth = 25;
+            this.gvMx1lotDate.MinWidth = 31;
             this.gvMx1lotDate.Name = "gvMx1lotDate";
             this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
             this.gvMx1lotDate.Visible = true;
             this.gvMx1lotDate.VisibleIndex = 7;
-            this.gvMx1lotDate.Width = 94;
+            this.gvMx1lotDate.Width = 117;
             // 
             // gridColumn28
             // 
             this.gridColumn28.Caption = "鏄惁鍏ュ簱";
             this.gridColumn28.FieldName = "isRk";
-            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.MinWidth = 31;
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.Visible = true;
             this.gridColumn28.VisibleIndex = 8;
-            this.gridColumn28.Width = 94;
+            this.gridColumn28.Width = 117;
             // 
             // gridColumn29
             // 
             this.gridColumn29.Caption = "鍏ュ簱浜�";
             this.gridColumn29.FieldName = "rkUser";
-            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.MinWidth = 31;
             this.gridColumn29.Name = "gridColumn29";
             this.gridColumn29.Visible = true;
             this.gridColumn29.VisibleIndex = 9;
-            this.gridColumn29.Width = 94;
+            this.gridColumn29.Width = 117;
             // 
             // gridColumn30
             // 
             this.gridColumn30.Caption = "鍏ュ簱鏃ユ湡";
             this.gridColumn30.FieldName = "rkDate";
-            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.MinWidth = 31;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
             this.gridColumn30.VisibleIndex = 10;
-            this.gridColumn30.Width = 94;
+            this.gridColumn30.Width = 117;
             // 
             // gridColumn31
             // 
             this.gridColumn31.Caption = "鍏ュ簱浣�";
             this.gridColumn31.FieldName = "rkPositon";
-            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.MinWidth = 31;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 11;
-            this.gridColumn31.Width = 94;
-            // 
-            // gvBtnAlawys
-            // 
-            this.gvBtnAlawys.Caption = "閲嶆墦";
-            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
-            this.gvBtnAlawys.MinWidth = 25;
-            this.gvBtnAlawys.Name = "gvBtnAlawys";
-            this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 12;
-            this.gvBtnAlawys.Width = 94;
-            // 
-            // rptChongDa
-            // 
-            this.rptChongDa.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.rptChongDa.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)});
-            this.rptChongDa.Name = "rptChongDa";
-            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            this.gridColumn31.Width = 117;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(962, 40);
+            this.picCheckBox.Location = new System.Drawing.Point(1202, 49);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 451;
             this.picCheckBox.TabStop = false;
@@ -2269,12 +2339,13 @@
             // 
             // Frm_SalesReturnNotice
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1276, 682);
+            this.ClientSize = new System.Drawing.Size(1799, 834);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Frm_SalesReturnNotice";
             this.Text = "閿�鍞��璐х敵璇峰崟";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2296,46 +2367,49 @@
             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_fHasLinkRad.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_shUserName2.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_xgUserName1.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.txt_fHasLinkSource.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.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.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.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.layItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem100)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem101)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2376,8 +2450,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
@@ -2385,7 +2457,6 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -2421,53 +2492,28 @@
         private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
         private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
         private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
-        private UserControl.UcLookSales txt_salesOrderId;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_approvedDate;
-        private DevExpress.XtraEditors.TextEdit txt_approvedBy;
+        private DevExpress.XtraEditors.TextEdit txt_shUserName2;
         private DevExpress.XtraEditors.TextEdit txt_modifiedDate;
-        private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
+        private DevExpress.XtraEditors.TextEdit txt_xgUserName1;
         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;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialName;
@@ -2498,20 +2544,13 @@
         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.XtraEditors.RadioGroup txt_fHasLinkRad;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -2527,8 +2566,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
-        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
         private DevExpress.Utils.ToolTipController tips;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
         private DevExpress.XtraEditors.RadioGroup radOut;
@@ -2551,5 +2588,34 @@
         private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private UserControl.UcLookOrg txt_salesOrg;
+        private UserControl.UcLookDepartment txt_salesDept;
+        private UserControl.UcLookOrg txt_inventoryOrg;
+        private UserControl.UcLookCustomer txt_returnCustomer;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraEditors.SimpleButton btnSelect;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layItem4;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fHasLinkSource;
+        private DevExpress.XtraLayout.LayoutControlItem layItem100;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_xsms;
+        private DevExpress.XtraLayout.LayoutControlItem layItem101;
+        private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3