From 0249c31d8a31f1dfb94915915b177ec4a3074d60 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 七月 2025 16:44:44 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 1215 +++++++++++++++++++++++----------------------------------
 1 files changed, 485 insertions(+), 730 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 49a5767..3d52a0e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -29,25 +29,21 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -79,6 +75,7 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup();
             this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
@@ -99,16 +96,14 @@
             this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
             this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            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.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -116,8 +111,13 @@
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -141,6 +141,7 @@
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1salesUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1salesQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -148,31 +149,11 @@
             this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
-            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
-            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
-            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -185,11 +166,12 @@
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -209,6 +191,7 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
@@ -226,16 +209,14 @@
             ((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.Root)).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.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -243,8 +224,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -256,23 +242,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
-            this.panelMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -286,7 +259,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -297,7 +270,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -307,12 +280,13 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -326,25 +300,24 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
-            this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1274, 570);
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1274, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
             // 
             // gridView1
             // 
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_id,
@@ -377,7 +350,6 @@
             // 
             // gv_id
             // 
-            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_id.AppearanceCell.Options.UseFont = true;
             this.gv_id.Caption = "涓婚敭GUID";
             this.gv_id.FieldName = "id";
@@ -409,8 +381,8 @@
             // 
             // gridColumn27
             // 
-            this.gridColumn27.Caption = "鏄惁鏈夋簮";
-            this.gridColumn27.FieldName = "isLink";
+            this.gridColumn27.Caption = "婧愬崟鏍囪瘑";
+            this.gridColumn27.FieldName = "fIsLink";
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
@@ -419,7 +391,6 @@
             // 
             // gv_billType
             // 
-            this.gv_billType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billType.AppearanceCell.Options.UseFont = true;
             this.gv_billType.Caption = "鍗曟嵁绫诲瀷 ";
             this.gv_billType.FieldName = "billType";
@@ -433,7 +404,6 @@
             // 
             // gv_billNo
             // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
             this.gv_billNo.FieldName = "billNo";
@@ -447,7 +417,6 @@
             // 
             // gv_salesOrg
             // 
-            this.gv_salesOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_salesOrg.AppearanceCell.Options.UseFont = true;
             this.gv_salesOrg.Caption = "閿�鍞粍缁� ";
             this.gv_salesOrg.FieldName = "xsOrgName";
@@ -461,7 +430,6 @@
             // 
             // gv_salesDept
             // 
-            this.gv_salesDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_salesDept.AppearanceCell.Options.UseFont = true;
             this.gv_salesDept.Caption = "閿�鍞儴闂� ";
             this.gv_salesDept.FieldName = "saleDeptName";
@@ -475,7 +443,6 @@
             // 
             // gv_salesPerson
             // 
-            this.gv_salesPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_salesPerson.AppearanceCell.Options.UseFont = true;
             this.gv_salesPerson.Caption = "閿�鍞憳 ";
             this.gv_salesPerson.FieldName = "salerName";
@@ -489,7 +456,6 @@
             // 
             // gv_returnReason
             // 
-            this.gv_returnReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_returnReason.AppearanceCell.Options.UseFont = true;
             this.gv_returnReason.Caption = "閫�璐у師鍥� ";
             this.gv_returnReason.FieldName = "thyy";
@@ -503,7 +469,6 @@
             // 
             // gv_createdBy
             // 
-            this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createdBy.AppearanceCell.Options.UseFont = true;
             this.gv_createdBy.Caption = "鍒涘缓浜� ";
             this.gv_createdBy.FieldName = "createdBy";
@@ -517,7 +482,6 @@
             // 
             // gv_createdDate
             // 
-            this.gv_createdDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createdDate.AppearanceCell.Options.UseFont = true;
             this.gv_createdDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createdDate.FieldName = "createdDate";
@@ -531,7 +495,6 @@
             // 
             // gv_modifiedBy
             // 
-            this.gv_modifiedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_modifiedBy.AppearanceCell.Options.UseFont = true;
             this.gv_modifiedBy.Caption = "淇敼浜� ";
             this.gv_modifiedBy.FieldName = "modifiedBy";
@@ -545,7 +508,6 @@
             // 
             // gv_modifiedDate
             // 
-            this.gv_modifiedDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_modifiedDate.AppearanceCell.Options.UseFont = true;
             this.gv_modifiedDate.Caption = "淇敼鏃堕棿 ";
             this.gv_modifiedDate.FieldName = "modifiedDate";
@@ -559,7 +521,6 @@
             // 
             // gv_approvedBy
             // 
-            this.gv_approvedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
             this.gv_approvedBy.Caption = "瀹℃牳浜� ";
             this.gv_approvedBy.FieldName = "approvedBy";
@@ -573,7 +534,6 @@
             // 
             // gv_approvedDate
             // 
-            this.gv_approvedDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_approvedDate.AppearanceCell.Options.UseFont = true;
             this.gv_approvedDate.Caption = "瀹℃牳鏃ユ湡 ";
             this.gv_approvedDate.FieldName = "approvedDate";
@@ -597,7 +557,6 @@
             // 
             // gv_customerOrderNo
             // 
-            this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
             this.gv_customerOrderNo.Caption = "婧愰攢鍞鍗�";
             this.gv_customerOrderNo.FieldName = "xsNo";
@@ -645,7 +604,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1274, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -653,7 +612,7 @@
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -672,12 +631,14 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 171;
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1274, 570);
+            this.splitMx1.SplitterPosition = 184;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.txt_fIsLink);
             this.layoutMx1.Controls.Add(this.txt_fstockid);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_wjStatus);
@@ -700,22 +661,37 @@
             this.layoutMx1.Controls.Add(this.txt_createdBy);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem19});
+            this.layoutControlItem19,
+            this.layoutControlItem1});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(834, 92, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 171);
+            this.layoutMx1.Size = new System.Drawing.Size(1274, 184);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_fIsLink
+            // 
+            this.txt_fIsLink.EditValue = "1";
+            this.txt_fIsLink.Location = new System.Drawing.Point(84, 42);
+            this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_fIsLink.Name = "txt_fIsLink";
+            this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
+            this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.txt_fIsLink.Size = new System.Drawing.Size(237, 33);
+            this.txt_fIsLink.StyleController = this.layoutMx1;
+            this.txt_fIsLink.TabIndex = 534;
             // 
             // txt_fstockid
             // 
             this.txt_fstockid.IsReadly = false;
-            this.txt_fstockid.Location = new System.Drawing.Point(90, 131);
+            this.txt_fstockid.Location = new System.Drawing.Point(84, 110);
             this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fstockid.Name = "txt_fstockid";
-            this.txt_fstockid.Size = new System.Drawing.Size(189, 28);
+            this.txt_fstockid.Size = new System.Drawing.Size(237, 24);
             this.txt_fstockid.TabIndex = 454;
             // 
             // lbGuid
@@ -728,20 +704,20 @@
             // 
             // txt_wjStatus
             // 
-            this.txt_wjStatus.Location = new System.Drawing.Point(554, 131);
+            this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);
             this.txt_wjStatus.Name = "txt_wjStatus";
             this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
-            this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
+            this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);
             this.txt_wjStatus.StyleController = this.layoutMx1;
             this.txt_wjStatus.TabIndex = 453;
             this.txt_wjStatus.Tag = "readonly";
             // 
             // txt_chkStatus
             // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(825, 131);
+            this.txt_chkStatus.Location = new System.Drawing.Point(951, 143);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
+            this.txt_chkStatus.Size = new System.Drawing.Size(311, 24);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 452;
             this.txt_chkStatus.Tag = "readonly";
@@ -749,32 +725,31 @@
             // txt_billType
             // 
             this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
-            this.txt_billType.Location = new System.Drawing.Point(361, 99);
+            this.txt_billType.Location = new System.Drawing.Point(397, 110);
             this.txt_billType.Name = "txt_billType";
             this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.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(189, 24);
+            this.txt_billType.Size = new System.Drawing.Size(237, 24);
             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(90, 67);
+            this.txt_salesOrderId.Location = new System.Drawing.Point(84, 77);
             this.txt_salesOrderId.Name = "txt_salesOrderId";
-            this.txt_salesOrderId.Size = new System.Drawing.Size(189, 28);
+            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(903, 99);
+            this.txt_approvedDate.Location = new System.Drawing.Point(1023, 110);
             this.txt_approvedDate.Name = "txt_approvedDate";
-            this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_approvedDate.Size = new System.Drawing.Size(190, 28);
+            this.txt_approvedDate.Size = new System.Drawing.Size(239, 24);
             this.txt_approvedDate.StyleController = this.layoutMx1;
             this.txt_approvedDate.TabIndex = 378;
             this.txt_approvedDate.Tag = "readonly";
@@ -783,369 +758,130 @@
             // 
             this.txt_id.Location = new System.Drawing.Point(90, 3);
             this.txt_id.Name = "txt_id";
-            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_id.Properties.Appearance.Options.UseFont = true;
-            this.txt_id.Size = new System.Drawing.Size(189, 28);
+            this.txt_id.Size = new System.Drawing.Size(189, 24);
             this.txt_id.StyleController = this.layoutMx1;
             this.txt_id.TabIndex = 210;
             this.txt_id.Tag = "readonly";
             // 
             // txt_approvedBy
             // 
-            this.txt_approvedBy.Location = new System.Drawing.Point(903, 67);
+            this.txt_approvedBy.Location = new System.Drawing.Point(1023, 77);
             this.txt_approvedBy.Name = "txt_approvedBy";
-            this.txt_approvedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_approvedBy.Size = new System.Drawing.Size(190, 28);
+            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(361, 3);
+            this.txt_xsOrgName.Location = new System.Drawing.Point(397, 12);
             this.txt_xsOrgName.Name = "txt_xsOrgName";
-            this.txt_xsOrgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
-            this.txt_xsOrgName.Size = new System.Drawing.Size(189, 28);
+            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(632, 3);
+            this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12);
             this.txt_inventoryOrg.Name = "txt_inventoryOrg";
-            this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_inventoryOrg.Size = new System.Drawing.Size(189, 28);
+            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";
             // 
             // txt_modifiedDate
             // 
-            this.txt_modifiedDate.Location = new System.Drawing.Point(903, 35);
+            this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44);
             this.txt_modifiedDate.Name = "txt_modifiedDate";
-            this.txt_modifiedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifiedDate.Size = new System.Drawing.Size(190, 28);
+            this.txt_modifiedDate.Size = new System.Drawing.Size(239, 24);
             this.txt_modifiedDate.StyleController = this.layoutMx1;
             this.txt_modifiedDate.TabIndex = 336;
             this.txt_modifiedDate.Tag = "readonly";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(90, 35);
+            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
             this.txt_billNo.Name = "txt_billNo";
-            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(189, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(237, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readonly";
             // 
             // txt_salerName
             // 
-            this.txt_salerName.Location = new System.Drawing.Point(361, 35);
+            this.txt_salerName.Location = new System.Drawing.Point(397, 44);
             this.txt_salerName.Name = "txt_salerName";
-            this.txt_salerName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_salerName.Properties.Appearance.Options.UseFont = true;
-            this.txt_salerName.Size = new System.Drawing.Size(189, 28);
+            this.txt_salerName.Size = new System.Drawing.Size(237, 24);
             this.txt_salerName.StyleController = this.layoutMx1;
             this.txt_salerName.TabIndex = 267;
             this.txt_salerName.Tag = "readonly";
             // 
             // txt_modifiedBy
             // 
-            this.txt_modifiedBy.Location = new System.Drawing.Point(903, 3);
+            this.txt_modifiedBy.Location = new System.Drawing.Point(1023, 12);
             this.txt_modifiedBy.Name = "txt_modifiedBy";
-            this.txt_modifiedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifiedBy.Size = new System.Drawing.Size(190, 28);
+            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";
             // 
             // txt_saleDeptName
             // 
-            this.txt_saleDeptName.Location = new System.Drawing.Point(361, 67);
+            this.txt_saleDeptName.Location = new System.Drawing.Point(397, 77);
             this.txt_saleDeptName.Name = "txt_saleDeptName";
-            this.txt_saleDeptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleDeptName.Size = new System.Drawing.Size(189, 28);
+            this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24);
             this.txt_saleDeptName.StyleController = this.layoutMx1;
             this.txt_saleDeptName.TabIndex = 222;
             this.txt_saleDeptName.Tag = "readonly";
             // 
             // txt_custName
             // 
-            this.txt_custName.Location = new System.Drawing.Point(632, 35);
+            this.txt_custName.Location = new System.Drawing.Point(710, 44);
             this.txt_custName.Name = "txt_custName";
-            this.txt_custName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_custName.Properties.Appearance.Options.UseFont = true;
-            this.txt_custName.Size = new System.Drawing.Size(189, 28);
+            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(632, 99);
+            this.txt_createdDate.Location = new System.Drawing.Point(710, 110);
             this.txt_createdDate.Name = "txt_createdDate";
-            this.txt_createdDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createdDate.Size = new System.Drawing.Size(189, 28);
+            this.txt_createdDate.Size = new System.Drawing.Size(237, 24);
             this.txt_createdDate.StyleController = this.layoutMx1;
             this.txt_createdDate.TabIndex = 319;
             this.txt_createdDate.Tag = "readonly";
             // 
             // txt_returnReason
             // 
-            this.txt_returnReason.Location = new System.Drawing.Point(90, 99);
+            this.txt_returnReason.Location = new System.Drawing.Point(84, 143);
             this.txt_returnReason.Name = "txt_returnReason";
-            this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_returnReason.Size = new System.Drawing.Size(189, 28);
+            this.txt_returnReason.Size = new System.Drawing.Size(550, 24);
             this.txt_returnReason.StyleController = this.layoutMx1;
             this.txt_returnReason.TabIndex = 235;
             // 
             // txt_createdBy
             // 
-            this.txt_createdBy.Location = new System.Drawing.Point(632, 67);
+            this.txt_createdBy.Location = new System.Drawing.Point(710, 77);
             this.txt_createdBy.Name = "txt_createdBy";
-            this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createdBy.Size = new System.Drawing.Size(189, 28);
+            this.txt_createdBy.Size = new System.Drawing.Size(237, 24);
             this.txt_createdBy.StyleController = this.layoutMx1;
             this.txt_createdBy.TabIndex = 312;
             this.txt_createdBy.Tag = "readonly";
-            // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem2,
-            this.layoutControlItem3,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
-            this.layoutControlItem11,
-            this.layoutControlItem12,
-            this.layoutControlItem13,
-            this.layoutControlItem14,
-            this.layoutControlItem15,
-            this.layoutControlItem16,
-            this.layoutControlItem20,
-            this.layoutControlItem17,
-            this.layoutControlItem18});
-            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.Root.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8,
-            rowDefinition9,
-            rowDefinition10});
-            this.Root.Size = new System.Drawing.Size(1105, 180);
-            this.Root.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_id;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem1.Text = "涓婚敭GUID";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_xsOrgName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem2.Text = "閿�鍞粍缁�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_inventoryOrg;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_billNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem4.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_salesOrderId;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem5.Text = "閿�鍞鍗�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_salerName;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem6.Text = "閿�鍞憳";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_saleDeptName;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem7.Text = "閿�鍞儴闂�";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_custName;
-            this.layoutControlItem8.Location = new System.Drawing.Point(542, 32);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_returnReason;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem9.Text = "閫�璐у師鍥�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_billType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(271, 96);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_createdBy;
-            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem11.Text = "鍒涘缓浜�";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_createdDate;
-            this.layoutControlItem12.Location = new System.Drawing.Point(542, 96);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_modifiedBy;
-            this.layoutControlItem13.Location = new System.Drawing.Point(813, 0);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem13.Text = "淇敼浜�";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_modifiedDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(813, 32);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem14.Text = "淇敼鏃堕棿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_approvedBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(813, 64);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem15.Text = "瀹℃牳浜�";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_approvedDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(66, 18);
             // 
             // layoutControlItem19
             // 
@@ -1159,15 +895,277 @@
             this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem19.TextVisible = false;
             // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_id;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Text = "涓婚敭GUID";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem12,
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem15,
+            this.layoutControlItem16,
+            this.layoutControlItem17,
+            this.layoutControlItem18,
+            this.layoutControlItem4,
+            this.layoutControlItem9,
+            this.layoutControlItem20,
+            this.layoutControlItem5,
+            this.layoutControlItem21});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5});
+            this.Root.Size = new System.Drawing.Size(1274, 184);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_xsOrgName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(313, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem2.Text = "閿�鍞粍缁�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_inventoryOrg;
+            this.layoutControlItem3.Location = new System.Drawing.Point(626, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_salerName;
+            this.layoutControlItem6.Location = new System.Drawing.Point(313, 32);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem6.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_saleDeptName;
+            this.layoutControlItem7.Location = new System.Drawing.Point(313, 65);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem7.Text = "閿�鍞儴闂�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_custName;
+            this.layoutControlItem8.Location = new System.Drawing.Point(626, 32);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_billType;
+            this.layoutControlItem10.Location = new System.Drawing.Point(313, 98);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_createdBy;
+            this.layoutControlItem11.Location = new System.Drawing.Point(626, 65);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_createdDate;
+            this.layoutControlItem12.Location = new System.Drawing.Point(626, 98);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_modifiedBy;
+            this.layoutControlItem13.Location = new System.Drawing.Point(939, 0);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(315, 32);
+            this.layoutControlItem13.Text = "淇敼浜哄憳";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_modifiedDate;
+            this.layoutControlItem14.Location = new System.Drawing.Point(939, 32);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem14.Text = "淇敼鏃堕棿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_approvedBy;
+            this.layoutControlItem15.Location = new System.Drawing.Point(939, 65);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem15.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_approvedDate;
+            this.layoutControlItem16.Location = new System.Drawing.Point(939, 98);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem16.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_chkStatus;
+            this.layoutControlItem17.Location = new System.Drawing.Point(939, 131);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem17.Size = new System.Drawing.Size(315, 33);
+            this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_wjStatus;
+            this.layoutControlItem18.Location = new System.Drawing.Point(626, 131);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem18.TextVisible = false;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_billNo;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem4.Text = "鐢宠鍗曞彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_returnReason;
+            this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 131);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem9.Size = new System.Drawing.Size(626, 33);
+            this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_fstockid;
-            this.layoutControlItem20.Location = new System.Drawing.Point(0, 128);
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 98);
             this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem20.Size = new System.Drawing.Size(313, 33);
             this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_salesOrderId;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 65);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem5.Text = "閿�鍞鍗�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_fIsLink;
+            this.layoutControlItem21.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
+            this.layoutControlItem21.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem21.Text = "鏈夋棤婧愬崟";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
             // 
             // tabMx
             // 
@@ -1175,7 +1173,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 387);
+            this.tabMx.Size = new System.Drawing.Size(1274, 374);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1184,15 +1182,14 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
-            this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 355);
+            this.tabMxPage1.Size = new System.Drawing.Size(1272, 342);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 102);
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
@@ -1200,14 +1197,13 @@
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1,
             this.repositoryItemDateEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 253);
+            this.gcMx1.Size = new System.Drawing.Size(1272, 342);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
             // 
             // gvMx1
             // 
-            this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn2,
@@ -1218,12 +1214,12 @@
             this.gridColumn20,
             this.gvMx1salesUnitId,
             this.gvMx1salesQuantity,
+            this.gridColumn32,
             this.gvMx1note,
             this.gridColumn13,
             this.gvMx1returnDate,
             this.gvMx1isFree,
             this.gvMx1returnType,
-            this.gvMx1inventoryUnit,
             this.gridColumn12,
             this.gridColumn21,
             this.gridColumn22,
@@ -1338,22 +1334,17 @@
             this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid";
             this.gridColumn11.FieldName = "ckmxGuid";
             this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 7;
             // 
             // gridColumn23
             // 
             this.gridColumn23.Caption = "鐗╂枡ID";
             this.gridColumn23.FieldName = "itemId";
             this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 8;
             // 
             // gvMx1id
             // 
-            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "GUID";
+            this.gvMx1id.Caption = "涓婚敭GUID";
             this.gvMx1id.FieldName = "guid";
             this.gvMx1id.MinWidth = 50;
             this.gvMx1id.Name = "gvMx1id";
@@ -1362,20 +1353,16 @@
             // 
             // gvMx1materialId
             // 
-            this.gvMx1materialId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
             this.gvMx1materialId.Caption = "鐗╂枡ID ";
             this.gvMx1materialId.FieldName = "itemId";
             this.gvMx1materialId.MinWidth = 50;
             this.gvMx1materialId.Name = "gvMx1materialId";
             this.gvMx1materialId.Tag = "query_a.MATERIAL_ID";
-            this.gvMx1materialId.Visible = true;
-            this.gvMx1materialId.VisibleIndex = 1;
             this.gvMx1materialId.Width = 94;
             // 
             // gvMx1materialName
             // 
-            this.gvMx1materialName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1materialName.AppearanceCell.Options.UseFont = true;
             this.gvMx1materialName.Caption = "鐗╂枡鍚嶇О ";
             this.gvMx1materialName.FieldName = "itemName";
@@ -1383,12 +1370,11 @@
             this.gvMx1materialName.Name = "gvMx1materialName";
             this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
             this.gvMx1materialName.Visible = true;
-            this.gvMx1materialName.VisibleIndex = 2;
+            this.gvMx1materialName.VisibleIndex = 1;
             this.gvMx1materialName.Width = 94;
             // 
             // gvMx1materialSpecification
             // 
-            this.gvMx1materialSpecification.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;
             this.gvMx1materialSpecification.Caption = "鐗╂枡瑙勬牸 ";
             this.gvMx1materialSpecification.FieldName = "itemModel";
@@ -1396,7 +1382,7 @@
             this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
             this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
             this.gvMx1materialSpecification.Visible = true;
-            this.gvMx1materialSpecification.VisibleIndex = 3;
+            this.gvMx1materialSpecification.VisibleIndex = 2;
             this.gvMx1materialSpecification.Width = 94;
             // 
             // gridColumn20
@@ -1406,25 +1392,23 @@
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 4;
+            this.gridColumn20.VisibleIndex = 3;
             this.gridColumn20.Width = 94;
             // 
             // gvMx1salesUnitId
             // 
-            this.gvMx1salesUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;
             this.gvMx1salesUnitId.Caption = "閿�鍞崟浣� ";
-            this.gvMx1salesUnitId.FieldName = "salesUnitId";
+            this.gvMx1salesUnitId.FieldName = "xxDw";
             this.gvMx1salesUnitId.MinWidth = 50;
             this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
             this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
             this.gvMx1salesUnitId.Visible = true;
-            this.gvMx1salesUnitId.VisibleIndex = 5;
+            this.gvMx1salesUnitId.VisibleIndex = 4;
             this.gvMx1salesUnitId.Width = 94;
             // 
             // gvMx1salesQuantity
             // 
-            this.gvMx1salesQuantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1salesQuantity.Caption = "閿�鍞暟閲� ";
             this.gvMx1salesQuantity.FieldName = "salesQuantity";
@@ -1432,12 +1416,21 @@
             this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
             this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
             this.gvMx1salesQuantity.Visible = true;
-            this.gvMx1salesQuantity.VisibleIndex = 6;
+            this.gvMx1salesQuantity.VisibleIndex = 5;
             this.gvMx1salesQuantity.Width = 94;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "鍙戣揣鎬婚噺";
+            this.gridColumn32.FieldName = "fhQuantity";
+            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 13;
+            this.gridColumn32.Width = 94;
             // 
             // gvMx1note
             // 
-            this.gvMx1note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1note.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1note.AppearanceCell.Options.UseFont = true;
             this.gvMx1note.AppearanceCell.Options.UseForeColor = true;
@@ -1464,12 +1457,11 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "yz_quantity_0_edit";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 8;
+            this.gridColumn13.VisibleIndex = 6;
             this.gridColumn13.Width = 94;
             // 
             // gvMx1returnDate
             // 
-            this.gvMx1returnDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1returnDate.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1returnDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1returnDate.AppearanceCell.Options.UseForeColor = true;
@@ -1482,7 +1474,7 @@
             this.gvMx1returnDate.Name = "gvMx1returnDate";
             this.gvMx1returnDate.Tag = "edit";
             this.gvMx1returnDate.Visible = true;
-            this.gvMx1returnDate.VisibleIndex = 9;
+            this.gvMx1returnDate.VisibleIndex = 8;
             this.gvMx1returnDate.Width = 94;
             // 
             // repositoryItemDateEdit1
@@ -1496,10 +1488,9 @@
             // 
             // gvMx1isFree
             // 
-            this.gvMx1isFree.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
             this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
-            this.gvMx1isFree.FieldName = "isFree";
+            this.gvMx1isFree.FieldName = "isFreeChk";
             this.gvMx1isFree.MinWidth = 50;
             this.gvMx1isFree.Name = "gvMx1isFree";
             this.gvMx1isFree.Tag = "query_a.IS_FREE";
@@ -1509,7 +1500,6 @@
             // 
             // gvMx1returnType
             // 
-            this.gvMx1returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1returnType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1returnType.AppearanceCell.Options.UseFont = true;
             this.gvMx1returnType.AppearanceCell.Options.UseForeColor = true;
@@ -1522,7 +1512,7 @@
             this.gvMx1returnType.Name = "gvMx1returnType";
             this.gvMx1returnType.Tag = "edit";
             this.gvMx1returnType.Visible = true;
-            this.gvMx1returnType.VisibleIndex = 11;
+            this.gvMx1returnType.VisibleIndex = 9;
             this.gvMx1returnType.Width = 94;
             // 
             // repositoryItemComboBox1
@@ -1538,22 +1528,9 @@
             this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
             this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
-            // gvMx1inventoryUnit
-            // 
-            this.gvMx1inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true;
-            this.gvMx1inventoryUnit.Caption = "搴撳瓨鍗曚綅 ";
-            this.gvMx1inventoryUnit.FieldName = "inventoryUnit";
-            this.gvMx1inventoryUnit.MinWidth = 50;
-            this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
-            this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
-            this.gvMx1inventoryUnit.Visible = true;
-            this.gvMx1inventoryUnit.VisibleIndex = 12;
-            this.gvMx1inventoryUnit.Width = 94;
-            // 
             // gridColumn12
             // 
-            this.gridColumn12.Caption = "閫�璐ф槑缁唃uid";
+            this.gridColumn12.Caption = "閫佽揣鏄庣粏guid";
             this.gridColumn12.FieldName = "deliveDetailGuid";
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
@@ -1566,7 +1543,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 13;
+            this.gridColumn21.VisibleIndex = 11;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -1576,7 +1553,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 14;
+            this.gridColumn22.VisibleIndex = 12;
             this.gridColumn22.Width = 94;
             // 
             // gvMxDel
@@ -1586,215 +1563,26 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 15;
+            this.gvMxDel.VisibleIndex = 14;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // panelMx1
-            // 
-            this.panelMx1.Controls.Add(this.ucBtnPrint1);
-            this.panelMx1.Controls.Add(this.lbMxGuid);
-            this.panelMx1.Controls.Add(this.txt_iCount_1);
-            this.panelMx1.Controls.Add(this.labelControl14);
-            this.panelMx1.Controls.Add(this.txt_psnQty_1);
-            this.panelMx1.Controls.Add(this.labelControl12);
-            this.panelMx1.Controls.Add(this.txtKdy);
-            this.panelMx1.Controls.Add(this.labelControl13);
-            this.panelMx1.Controls.Add(this.txtYdy);
-            this.panelMx1.Controls.Add(this.labelControl1);
-            this.panelMx1.Controls.Add(this.txtQuantity);
-            this.panelMx1.Controls.Add(this.labelControl10);
-            this.panelMx1.Controls.Add(this.txtWlgg);
-            this.panelMx1.Controls.Add(this.labelControl9);
-            this.panelMx1.Controls.Add(this.txtWlmc);
-            this.panelMx1.Controls.Add(this.labelControl8);
-            this.panelMx1.Controls.Add(this.txtWlid);
-            this.panelMx1.Controls.Add(this.labelControl7);
-            this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelMx1.Location = new System.Drawing.Point(0, 0);
-            this.panelMx1.Name = "panelMx1";
-            this.panelMx1.Size = new System.Drawing.Size(1124, 102);
-            this.panelMx1.TabIndex = 3;
-            // 
-            // ucBtnPrint1
-            // 
-            this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65);
-            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
-            this.ucBtnPrint1.Name = "ucBtnPrint1";
-            this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 31);
-            this.ucBtnPrint1.TabIndex = 230;
-            // 
-            // lbMxGuid
-            // 
-            this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
-            this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
-            this.lbMxGuid.TabIndex = 229;
-            this.lbMxGuid.Text = "lbMxGuid";
-            this.lbMxGuid.Visible = false;
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_iCount_1.TabIndex = 228;
-            // 
-            // labelControl14
-            // 
-            this.labelControl14.Location = new System.Drawing.Point(543, 39);
-            this.labelControl14.Name = "labelControl14";
-            this.labelControl14.Size = new System.Drawing.Size(105, 18);
-            this.labelControl14.TabIndex = 227;
-            this.labelControl14.Text = "鎵撳嵃鏉$爜寮犳暟锛�";
-            // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_psnQty_1.TabIndex = 226;
-            // 
-            // labelControl12
-            // 
-            this.labelControl12.Location = new System.Drawing.Point(543, 9);
-            this.labelControl12.Name = "labelControl12";
-            this.labelControl12.Size = new System.Drawing.Size(105, 18);
-            this.labelControl12.TabIndex = 225;
-            this.labelControl12.Text = "姣忓紶鏉$爜鏁伴噺锛�";
-            // 
-            // txtKdy
-            // 
-            this.txtKdy.Location = new System.Drawing.Point(430, 65);
-            this.txtKdy.Name = "txtKdy";
-            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txtKdy.Properties.Appearance.Options.UseFont = true;
-            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
-            this.txtKdy.Properties.ReadOnly = true;
-            this.txtKdy.Size = new System.Drawing.Size(96, 28);
-            this.txtKdy.TabIndex = 224;
-            // 
-            // labelControl13
-            // 
-            this.labelControl13.Location = new System.Drawing.Point(346, 70);
-            this.labelControl13.Name = "labelControl13";
-            this.labelControl13.Size = new System.Drawing.Size(80, 18);
-            this.labelControl13.TabIndex = 223;
-            this.labelControl13.Text = "鍙墦鍗版�绘暟:";
-            // 
-            // txtYdy
-            // 
-            this.txtYdy.Location = new System.Drawing.Point(430, 34);
-            this.txtYdy.Name = "txtYdy";
-            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtYdy.Properties.Appearance.Options.UseFont = true;
-            this.txtYdy.Properties.ReadOnly = true;
-            this.txtYdy.Size = new System.Drawing.Size(96, 28);
-            this.txtYdy.TabIndex = 222;
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Location = new System.Drawing.Point(346, 39);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(80, 18);
-            this.labelControl1.TabIndex = 221;
-            this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
-            // 
-            // txtQuantity
-            // 
-            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
-            this.txtQuantity.Name = "txtQuantity";
-            this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
-            this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(96, 28);
-            this.txtQuantity.TabIndex = 220;
-            // 
-            // labelControl10
-            // 
-            this.labelControl10.Location = new System.Drawing.Point(331, 9);
-            this.labelControl10.Name = "labelControl10";
-            this.labelControl10.Size = new System.Drawing.Size(95, 18);
-            this.labelControl10.TabIndex = 219;
-            this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
-            // 
-            // txtWlgg
-            // 
-            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
-            this.txtWlgg.Name = "txtWlgg";
-            this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
-            this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(236, 28);
-            this.txtWlgg.TabIndex = 218;
-            // 
-            // labelControl9
-            // 
-            this.labelControl9.Location = new System.Drawing.Point(20, 70);
-            this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(65, 18);
-            this.labelControl9.TabIndex = 217;
-            this.labelControl9.Text = "鐗╂枡瑙勬牸:";
-            // 
-            // txtWlmc
-            // 
-            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
-            this.txtWlmc.Name = "txtWlmc";
-            this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
-            this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(236, 28);
-            this.txtWlmc.TabIndex = 216;
-            // 
-            // labelControl8
-            // 
-            this.labelControl8.Location = new System.Drawing.Point(20, 39);
-            this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(65, 18);
-            this.labelControl8.TabIndex = 215;
-            this.labelControl8.Text = "鐗╂枡鍚嶇О:";
-            // 
-            // txtWlid
-            // 
-            this.txtWlid.Location = new System.Drawing.Point(90, 4);
-            this.txtWlid.Name = "txtWlid";
-            this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlid.Properties.Appearance.Options.UseFont = true;
-            this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(236, 28);
-            this.txtWlid.TabIndex = 214;
-            // 
-            // labelControl7
-            // 
-            this.labelControl7.Location = new System.Drawing.Point(20, 9);
-            this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(65, 18);
-            this.labelControl7.TabIndex = 213;
-            this.labelControl7.Text = "鐗╂枡缂栫爜:";
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 355);
-            this.tabMxPage2.Text = "鎵爜鏄庣粏";
+            this.tabMxPage2.Size = new System.Drawing.Size(1272, 342);
+            this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
             // 
             // gcMx2
             // 
@@ -1802,16 +1590,13 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit2});
-            this.gcMx2.Size = new System.Drawing.Size(1124, 355);
+            this.gcMx2.Size = new System.Drawing.Size(1272, 342);
             this.gcMx2.TabIndex = 3;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
             // 
             // gvMx2
             // 
-            this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2.Appearance.Row.Options.UseFont = true;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn3,
@@ -1823,7 +1608,10 @@
             this.gridColumn17,
             this.gvMx1createBy,
             this.gvMx1lotDate,
-            this.gvBtnAlawys});
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1832,7 +1620,6 @@
             // 
             // gridColumn3
             // 
-            this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn3.AppearanceCell.Options.UseFont = true;
             this.gridColumn3.Caption = "guid";
             this.gridColumn3.FieldName = "guid";
@@ -1843,7 +1630,6 @@
             // 
             // gvMx1itemBarcode
             // 
-            this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
@@ -1886,7 +1672,6 @@
             // 
             // gvMx1quantity
             // 
-            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
@@ -1909,7 +1694,6 @@
             // 
             // gvMx1createBy
             // 
-            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
             this.gvMx1createBy.Caption = "鍒涘缓浜�";
             this.gvMx1createBy.FieldName = "createBy";
@@ -1922,7 +1706,6 @@
             // 
             // gvMx1lotDate
             // 
-            this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
             this.gvMx1lotDate.FieldName = "createDate";
@@ -1933,25 +1716,45 @@
             this.gvMx1lotDate.VisibleIndex = 7;
             this.gvMx1lotDate.Width = 94;
             // 
-            // gvBtnAlawys
+            // gridColumn28
             // 
-            this.gvBtnAlawys.Caption = "绉诲嚭";
-            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gvBtnAlawys.MinWidth = 25;
-            this.gvBtnAlawys.Name = "gvBtnAlawys";
-            this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 8;
-            this.gvBtnAlawys.Width = 94;
+            this.gridColumn28.Caption = "鏄惁鍏ュ簱";
+            this.gridColumn28.FieldName = "isRk";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 8;
+            this.gridColumn28.Width = 94;
             // 
-            // repositoryItemButtonEdit2
+            // gridColumn29
             // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.gridColumn29.Caption = "鍏ュ簱浜�";
+            this.gridColumn29.FieldName = "rkUser";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 9;
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn30.FieldName = "rkDate";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 10;
+            this.gridColumn30.Width = 94;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "鍏ュ簱浣�";
+            this.gridColumn31.FieldName = "rkPositon";
+            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 11;
+            this.gridColumn31.Width = 94;
             // 
             // picCheckBox
             // 
@@ -1964,35 +1767,11 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_chkStatus;
-            this.layoutControlItem17.Location = new System.Drawing.Point(813, 128);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(272, 32);
-            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(542, 128);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem18.TextVisible = false;
-            // 
             // Frm_SalesReturnNotice
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1276, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
@@ -2017,6 +1796,7 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
@@ -2034,16 +1814,14 @@
             ((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.Root)).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.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -2051,8 +1829,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2064,24 +1847,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
-            this.panelMx1.ResumeLayout(false);
-            this.panelMx1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2137,12 +1906,9 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
@@ -2179,30 +1945,27 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnType;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraEditors.PanelControl panelMx1;
-        private UserControl.UcBtnPrint ucBtnPrint1;
-        private DevExpress.XtraEditors.LabelControl lbMxGuid;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
-        private DevExpress.XtraEditors.LabelControl labelControl14;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
-        private DevExpress.XtraEditors.LabelControl labelControl12;
-        private DevExpress.XtraEditors.TextEdit txtKdy;
-        private DevExpress.XtraEditors.LabelControl labelControl13;
-        private DevExpress.XtraEditors.TextEdit txtYdy;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit txtQuantity;
-        private DevExpress.XtraEditors.LabelControl labelControl10;
-        private DevExpress.XtraEditors.TextEdit txtWlgg;
-        private DevExpress.XtraEditors.LabelControl labelControl9;
-        private DevExpress.XtraEditors.TextEdit txtWlmc;
-        private DevExpress.XtraEditors.LabelControl labelControl8;
-        private DevExpress.XtraEditors.TextEdit txtWlid;
-        private DevExpress.XtraEditors.LabelControl labelControl7;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private UserControl.UcLookCk txt_fstockid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -2214,19 +1977,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
-        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.XtraLayout.LayoutControlItem layoutControlItem20;
-        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.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3