From defcac44117c17ad729e71dc3d54b087d5b46cf9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 28 八月 2025 17:40:49 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.Designer.cs |   32 +--
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs      |  181 ++++++++++++++-----
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.cs          |    2 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs        |  323 ++++++++++++++---------------------
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs  |    2 
 5 files changed, 276 insertions(+), 264 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index ff922cb..4386cc3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -30,30 +30,30 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            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.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            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.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();
@@ -81,6 +81,7 @@
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -107,8 +108,6 @@
             this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
             this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
             this.txt_fHasLinkSource = new DevExpress.XtraEditors.ComboBoxEdit();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -116,8 +115,6 @@
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -129,8 +126,6 @@
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -208,7 +203,8 @@
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -243,8 +239,6 @@
             ((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.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -252,8 +246,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
@@ -265,8 +257,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
@@ -320,6 +310,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -669,6 +661,16 @@
             this.gridColumn26.VisibleIndex = 15;
             this.gridColumn26.Width = 94;
             // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鏁版嵁鏉ユ簮";
+            this.gridColumn2.FieldName = "fHasLinkSource";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 18;
+            this.gridColumn2.Width = 94;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -733,8 +735,6 @@
             this.layoutMx1.Controls.Add(this.txt_createdDate);
             this.layoutMx1.Controls.Add(this.txt_returnReason);
             this.layoutMx1.Controls.Add(this.txt_createdBy);
-            this.layoutMx1.Controls.Add(this.textEdit1);
-            this.layoutMx1.Controls.Add(this.textEdit2);
             this.layoutMx1.Controls.Add(this.txt_fHasLinkSource);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -743,9 +743,7 @@
             this.layoutControlItem12,
             this.layoutControlItem11,
             this.layoutControlItem18,
-            this.layoutControlItem6,
-            this.layoutControlItem13,
-            this.layoutControlItem14});
+            this.layoutControlItem6});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
@@ -893,10 +891,10 @@
             // 
             // txt_modifiedDate
             // 
-            this.txt_modifiedDate.Location = new System.Drawing.Point(1008, 42);
+            this.txt_modifiedDate.Location = new System.Drawing.Point(782, 44);
             this.txt_modifiedDate.Name = "txt_modifiedDate";
             this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifiedDate.Size = new System.Drawing.Size(233, 24);
+            this.txt_modifiedDate.Size = new System.Drawing.Size(273, 24);
             this.txt_modifiedDate.StyleController = this.layoutMx1;
             this.txt_modifiedDate.TabIndex = 336;
             this.txt_modifiedDate.Tag = "readonly";
@@ -923,10 +921,10 @@
             // 
             // txt_modifiedBy
             // 
-            this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 10);
+            this.txt_modifiedBy.Location = new System.Drawing.Point(782, 12);
             this.txt_modifiedBy.Name = "txt_modifiedBy";
             this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifiedBy.Size = new System.Drawing.Size(233, 24);
+            this.txt_modifiedBy.Size = new System.Drawing.Size(273, 24);
             this.txt_modifiedBy.StyleController = this.layoutMx1;
             this.txt_modifiedBy.TabIndex = 327;
             this.txt_modifiedBy.Tag = "readonly";
@@ -970,24 +968,6 @@
             this.txt_createdBy.TabIndex = 312;
             this.txt_createdBy.Tag = "readonly";
             // 
-            // textEdit1
-            // 
-            this.textEdit1.Location = new System.Drawing.Point(782, 12);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Size = new System.Drawing.Size(273, 24);
-            this.textEdit1.StyleController = this.layoutMx1;
-            this.textEdit1.TabIndex = 542;
-            this.textEdit1.Tag = "readonly";
-            // 
-            // textEdit2
-            // 
-            this.textEdit2.Location = new System.Drawing.Point(782, 44);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Size = new System.Drawing.Size(273, 24);
-            this.textEdit2.StyleController = this.layoutMx1;
-            this.textEdit2.TabIndex = 543;
-            this.textEdit2.Tag = "readonly";
-            // 
             // txt_fHasLinkSource
             // 
             this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
@@ -996,8 +976,8 @@
             this.txt_fHasLinkSource.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_fHasLinkSource.Properties.Items.AddRange(new object[] {
-            "閿�鍞嚭搴撳崟(SAL OUTSTOCK)",
-            "閿�鍞鍗�(SAL SaleOrder)"});
+            "閿�鍞嚭搴撳崟(SAL_OUTSTOCK)",
+            "閿�鍞鍗�(SAL_SaleOrder)"});
             this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_fHasLinkSource.Size = new System.Drawing.Size(273, 24);
             this.txt_fHasLinkSource.StyleController = this.layoutMx1;
@@ -1069,27 +1049,6 @@
             this.layoutControlItem6.Text = "閿�鍞憳鍚�";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_modifiedBy;
-            this.layoutControlItem13.Location = new System.Drawing.Point(924, 0);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(309, 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(924, 32);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(309, 32);
-            this.layoutControlItem14.Text = "淇敼鏃堕棿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1105,44 +1064,44 @@
             this.layoutControlItem21,
             this.layoutControlItem9,
             this.layoutControlItem7,
-            this.layoutControlItem2,
-            this.layoutControlItem5,
             this.layoutControlItem10,
             this.layItem2,
             this.layItem3,
             this.layItem4,
-            this.layItem100});
+            this.layItem100,
+            this.layoutControlItem13,
+            this.layoutControlItem14});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition11.Width = 100D;
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
-            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition13.Width = 100D;
-            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition14.Width = 100D;
+            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[] {
-            columnDefinition11,
-            columnDefinition12,
-            columnDefinition13,
-            columnDefinition14});
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            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[] {
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5});
             this.Root.Size = new System.Drawing.Size(1416, 180);
             this.Root.TextVisible = false;
             // 
@@ -1258,27 +1217,6 @@
             this.layoutControlItem7.Size = new System.Drawing.Size(349, 32);
             this.layoutControlItem7.Text = "閿�鍞儴闂�";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.textEdit1;
-            this.layoutControlItem2.Location = new System.Drawing.Point(698, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(349, 32);
-            this.layoutControlItem2.Text = "淇敼浜哄憳";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.textEdit2;
-            this.layoutControlItem5.Location = new System.Drawing.Point(698, 32);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(349, 32);
-            this.layoutControlItem5.Text = "淇敼鏃堕棿";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
@@ -1444,17 +1382,17 @@
             this.layoutControlItem34});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "layoutControlGroup2";
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition15,
-            columnDefinition16});
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition15});
+            rowDefinition6});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);
             this.layoutControlGroup2.TextVisible = false;
@@ -1613,29 +1551,29 @@
             this.layoutControlItem32});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition19.Width = 100D;
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19,
-            columnDefinition20});
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10});
+            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;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition16,
-            rowDefinition17,
-            rowDefinition18});
+            rowDefinition7,
+            rowDefinition8,
+            rowDefinition9});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -2024,10 +1962,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2222,15 +2160,26 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gridColumn2
+            // layoutControlItem13
             // 
-            this.gridColumn2.Caption = "鏁版嵁鏉ユ簮";
-            this.gridColumn2.FieldName = "鏁版嵁鏉ユ簮";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 18;
-            this.gridColumn2.Width = 94;
+            this.layoutControlItem13.Control = this.txt_modifiedBy;
+            this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(349, 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(698, 32);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
+            this.layoutControlItem14.Text = "淇敼鏃堕棿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
             // 
             // Frm_SalesReturnNotice
             // 
@@ -2276,8 +2225,6 @@
             ((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.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -2285,8 +2232,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
@@ -2298,8 +2243,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
@@ -2353,6 +2296,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2404,8 +2349,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2498,13 +2441,9 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraLayout.LayoutControlItem layItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
-        private DevExpress.XtraEditors.TextEdit textEdit2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layItem2;
         private DevExpress.XtraLayout.LayoutControlItem layItem3;
@@ -2512,5 +2451,7 @@
         private DevExpress.XtraEditors.ComboBoxEdit txt_fHasLinkSource;
         private DevExpress.XtraLayout.LayoutControlItem layItem100;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
index 4fd483d..78807c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
@@ -60,6 +60,8 @@
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.bandedGridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -126,6 +128,10 @@
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.txt_fHasLinkTxt = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fHasLinkSource = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -188,6 +194,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -277,7 +287,9 @@
             this.gv_checkUser,
             this.gv_checkDate,
             this.bandedGridColumn3,
-            this.gv_guid});
+            this.gv_guid,
+            this.gridColumn8,
+            this.gridColumn9});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -480,6 +492,26 @@
             this.gv_guid.Tag = "query_a.GUID";
             this.gv_guid.Width = 94;
             // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鏁版嵁鏉ユ簮";
+            this.gridColumn8.FieldName = "fHasLinkSource";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 15;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "婧愬崟绫诲瀷";
+            this.gridColumn9.FieldName = "fHasLinkTxt";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 14;
+            this.gridColumn9.Width = 94;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -539,6 +571,8 @@
             this.layoutMx1.Controls.Add(this.txt_ckNo);
             this.layoutMx1.Controls.Add(this.txt_xsNo);
             this.layoutMx1.Controls.Add(this.txt_custName);
+            this.layoutMx1.Controls.Add(this.txt_fHasLinkTxt);
+            this.layoutMx1.Controls.Add(this.txt_fHasLinkSource);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem19});
@@ -560,91 +594,91 @@
             // 
             // txt_ckName
             // 
-            this.txt_ckName.Location = new System.Drawing.Point(430, 43);
+            this.txt_ckName.Location = new System.Drawing.Point(415, 43);
             this.txt_ckName.Name = "txt_ckName";
             this.txt_ckName.Properties.Appearance.Options.UseFont = true;
-            this.txt_ckName.Size = new System.Drawing.Size(240, 24);
+            this.txt_ckName.Size = new System.Drawing.Size(255, 24);
             this.txt_ckName.StyleController = this.layoutMx1;
             this.txt_ckName.TabIndex = 609;
             // 
             // txt_sqRemark
             // 
-            this.txt_sqRemark.Location = new System.Drawing.Point(99, 136);
+            this.txt_sqRemark.Location = new System.Drawing.Point(84, 136);
             this.txt_sqRemark.Name = "txt_sqRemark";
             this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_sqRemark.Size = new System.Drawing.Size(571, 24);
+            this.txt_sqRemark.Size = new System.Drawing.Size(586, 24);
             this.txt_sqRemark.StyleController = this.layoutMx1;
             this.txt_sqRemark.TabIndex = 240;
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(1092, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(1077, 12);
             this.txt_checkUser.Name = "txt_checkUser";
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(242, 24);
+            this.txt_checkUser.Size = new System.Drawing.Size(257, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 608;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(761, 43);
+            this.txt_createDate.Location = new System.Drawing.Point(746, 43);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(240, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(255, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 222;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(255, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_abtNo
             // 
-            this.txt_abtNo.Location = new System.Drawing.Point(430, 12);
+            this.txt_abtNo.Location = new System.Drawing.Point(415, 12);
             this.txt_abtNo.Name = "txt_abtNo";
             this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_abtNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_abtNo.Size = new System.Drawing.Size(255, 24);
             this.txt_abtNo.StyleController = this.layoutMx1;
             this.txt_abtNo.TabIndex = 507;
             // 
             // txt_djlx
             // 
-            this.txt_djlx.Location = new System.Drawing.Point(430, 105);
+            this.txt_djlx.Location = new System.Drawing.Point(415, 105);
             this.txt_djlx.Name = "txt_djlx";
             this.txt_djlx.Properties.Appearance.Options.UseFont = true;
-            this.txt_djlx.Size = new System.Drawing.Size(240, 24);
+            this.txt_djlx.Size = new System.Drawing.Size(255, 24);
             this.txt_djlx.StyleController = this.layoutMx1;
             this.txt_djlx.TabIndex = 598;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(761, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(746, 12);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(240, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(255, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 219;
             // 
             // txt_kcOrg
             // 
-            this.txt_kcOrg.Location = new System.Drawing.Point(99, 43);
+            this.txt_kcOrg.Location = new System.Drawing.Point(84, 43);
             this.txt_kcOrg.Name = "txt_kcOrg";
             this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_kcOrg.Size = new System.Drawing.Size(240, 24);
+            this.txt_kcOrg.Size = new System.Drawing.Size(255, 24);
             this.txt_kcOrg.StyleController = this.layoutMx1;
             this.txt_kcOrg.TabIndex = 593;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(1092, 43);
+            this.txt_checkDate.Location = new System.Drawing.Point(1077, 43);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(242, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(257, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 587;
             // 
@@ -659,43 +693,43 @@
             // 
             // txt_lastupdateBy
             // 
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(761, 74);
+            this.txt_lastupdateBy.Location = new System.Drawing.Point(746, 74);
             this.txt_lastupdateBy.Name = "txt_lastupdateBy";
             this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(240, 24);
+            this.txt_lastupdateBy.Size = new System.Drawing.Size(255, 24);
             this.txt_lastupdateBy.StyleController = this.layoutMx1;
             this.txt_lastupdateBy.TabIndex = 610;
             // 
             // txt_lastupdateDate
             // 
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(761, 105);
+            this.txt_lastupdateDate.Location = new System.Drawing.Point(746, 105);
             this.txt_lastupdateDate.Name = "txt_lastupdateDate";
             this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(240, 24);
+            this.txt_lastupdateDate.Size = new System.Drawing.Size(255, 24);
             this.txt_lastupdateDate.StyleController = this.layoutMx1;
             this.txt_lastupdateDate.TabIndex = 611;
             // 
             // txt_ckNo
             // 
-            this.txt_ckNo.Location = new System.Drawing.Point(430, 74);
+            this.txt_ckNo.Location = new System.Drawing.Point(415, 74);
             this.txt_ckNo.Name = "txt_ckNo";
-            this.txt_ckNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_ckNo.Size = new System.Drawing.Size(255, 24);
             this.txt_ckNo.StyleController = this.layoutMx1;
             this.txt_ckNo.TabIndex = 613;
             // 
             // txt_xsNo
             // 
-            this.txt_xsNo.Location = new System.Drawing.Point(99, 105);
+            this.txt_xsNo.Location = new System.Drawing.Point(84, 105);
             this.txt_xsNo.Name = "txt_xsNo";
-            this.txt_xsNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_xsNo.Size = new System.Drawing.Size(255, 24);
             this.txt_xsNo.StyleController = this.layoutMx1;
             this.txt_xsNo.TabIndex = 614;
             // 
             // txt_custName
             // 
-            this.txt_custName.Location = new System.Drawing.Point(99, 74);
+            this.txt_custName.Location = new System.Drawing.Point(84, 74);
             this.txt_custName.Name = "txt_custName";
-            this.txt_custName.Size = new System.Drawing.Size(240, 24);
+            this.txt_custName.Size = new System.Drawing.Size(255, 24);
             this.txt_custName.StyleController = this.layoutMx1;
             this.txt_custName.TabIndex = 615;
             // 
@@ -731,7 +765,9 @@
             this.layoutControlItem11,
             this.layoutControlItem15,
             this.layoutControlItem17,
-            this.layoutControlItem18});
+            this.layoutControlItem18,
+            this.layoutControlItem13,
+            this.layoutControlItem10});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -773,7 +809,7 @@
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem2
             // 
@@ -783,7 +819,7 @@
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem2.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem4
             // 
@@ -793,7 +829,7 @@
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem4.Size = new System.Drawing.Size(333, 31);
             this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem5
             // 
@@ -803,7 +839,7 @@
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem5.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
@@ -814,7 +850,7 @@
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem8.Size = new System.Drawing.Size(333, 31);
             this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem12
             // 
@@ -837,7 +873,7 @@
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem16.Size = new System.Drawing.Size(662, 32);
             this.layoutControlItem16.Text = "澶囨敞";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem14
             // 
@@ -848,7 +884,7 @@
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem14.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem6
             // 
@@ -859,7 +895,7 @@
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem6.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem6.Text = "浠撳簱缂栧彿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
@@ -869,7 +905,7 @@
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem9.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem9.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem7
             // 
@@ -879,7 +915,7 @@
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem7.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem7.Text = "閿�鍞崟鍙�";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
@@ -890,7 +926,7 @@
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem3.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem11
             // 
@@ -900,7 +936,7 @@
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem15
             // 
@@ -911,18 +947,19 @@
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem15.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_lastupdateBy;
+            this.layoutControlItem17.CustomizationFormText = "鏇存柊浜哄憳";
             this.layoutControlItem17.Location = new System.Drawing.Point(662, 62);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem17.Size = new System.Drawing.Size(331, 31);
-            this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem17.Text = "鏇存柊浜哄憳";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
@@ -933,7 +970,7 @@
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem18.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem18.Text = "鏇存柊鏃堕棿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
             // tabMx
             // 
@@ -1236,6 +1273,44 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // txt_fHasLinkTxt
+            // 
+            this.txt_fHasLinkTxt.Location = new System.Drawing.Point(1077, 105);
+            this.txt_fHasLinkTxt.Name = "txt_fHasLinkTxt";
+            this.txt_fHasLinkTxt.Size = new System.Drawing.Size(257, 24);
+            this.txt_fHasLinkTxt.StyleController = this.layoutMx1;
+            this.txt_fHasLinkTxt.TabIndex = 616;
+            // 
+            // txt_fHasLinkSource
+            // 
+            this.txt_fHasLinkSource.Location = new System.Drawing.Point(1077, 136);
+            this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
+            this.txt_fHasLinkSource.Size = new System.Drawing.Size(257, 24);
+            this.txt_fHasLinkSource.StyleController = this.layoutMx1;
+            this.txt_fHasLinkSource.TabIndex = 617;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_fHasLinkSource;
+            this.layoutControlItem13.Location = new System.Drawing.Point(993, 124);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem13.Size = new System.Drawing.Size(333, 32);
+            this.layoutControlItem13.Text = "鏁版嵁鏉ユ簮";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_fHasLinkTxt;
+            this.layoutControlItem10.Location = new System.Drawing.Point(993, 93);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(333, 31);
+            this.layoutControlItem10.Text = "婧愬崟绫诲瀷";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // Frm_SalesReturnNoticeDj
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1308,6 +1383,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1400,5 +1479,11 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.Utils.ToolTipController tips;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraEditors.TextEdit txt_fHasLinkTxt;
+        private DevExpress.XtraEditors.TextEdit txt_fHasLinkSource;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
index 0ea0a37..907f261 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
@@ -272,7 +272,7 @@
             this.MinimizeBox = false;
             this.Name = "Frm_SalesReturnNoticeSelect";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "閿�鍞��璐х敵璇峰崟锛堟湁婧愬崟锛岄�夋嫨閿�鍞彂璐у崟鏄庣粏锛�";
+            this.Text = "閿�鍞��璐х敵璇峰崟锛堟湁婧愬崟锛岄�夋嫨閿�鍞嚭搴撳崟鏄庣粏锛�";
             this.TopMost = true;
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.Designer.cs
index 5f143fa..1d31327 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.Designer.cs
@@ -32,7 +32,6 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -71,7 +70,6 @@
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.colChkInt,
             this.gv_guid,
-            this.gridColumn4,
             this.gv_billNo,
             this.gv_supplierItemCode,
             this.gv_supplierItemName,
@@ -112,28 +110,17 @@
             this.gv_guid.Tag = "query_a.guid";
             this.gv_guid.Width = 94;
             // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "鍙戣揣鍗曞彿";
-            this.gridColumn4.FieldName = "outNo";
-            this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 1;
-            this.gridColumn4.Width = 94;
-            // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "閿�鍞崟鍙�";
-            this.gv_billNo.FieldName = "xsHno";
+            this.gv_billNo.FieldName = "billNo";
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.OptionsColumn.ReadOnly = true;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 7;
+            this.gv_billNo.VisibleIndex = 3;
             this.gv_billNo.Width = 110;
             // 
             // gv_supplierItemCode
@@ -147,7 +134,7 @@
             this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
             this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
             this.gv_supplierItemCode.Visible = true;
-            this.gv_supplierItemCode.VisibleIndex = 2;
+            this.gv_supplierItemCode.VisibleIndex = 1;
             this.gv_supplierItemCode.Width = 100;
             // 
             // gv_supplierItemName
@@ -161,7 +148,7 @@
             this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
             this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
             this.gv_supplierItemName.Visible = true;
-            this.gv_supplierItemName.VisibleIndex = 3;
+            this.gv_supplierItemName.VisibleIndex = 2;
             this.gv_supplierItemName.Width = 120;
             // 
             // gridColumn5
@@ -181,7 +168,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.VisibleIndex = 5;
             this.gridColumn6.Width = 50;
             // 
             // gridColumn7
@@ -193,7 +180,7 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.VisibleIndex = 6;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn9
@@ -205,7 +192,7 @@
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.VisibleIndex = 7;
             this.gridColumn9.Width = 50;
             // 
             // gv_purchaseUnit
@@ -236,7 +223,7 @@
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 8;
+            this.gridColumn2.VisibleIndex = 4;
             this.gridColumn2.Width = 94;
             // 
             // panelControl1
@@ -272,7 +259,7 @@
             this.MinimizeBox = false;
             this.Name = "Frm_SalesReturnNoticeSelect2";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "閿�鍞��璐х敵璇峰崟锛堟湁婧愬崟锛岄�夋嫨閿�鍞崟鏄庣粏锛�";
+            this.Text = "閿�鍞��璐х敵璇峰崟锛堟湁婧愬崟锛岄�夋嫨閿�鍞崟璁㈠崟鏄庣粏锛�";
             this.TopMost = true;
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -285,7 +272,6 @@
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
         private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.cs
index 8f69f8b..8c370c7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect2.cs
@@ -102,7 +102,7 @@
             try
             {
                 var strReturn = UtilityHelper.HttpPost("",
-                    "SalesManager/SelectFormFhMx", json);
+                    "SalesManager/SelectFormFhMxSales", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 var dt = dd.rtnData.list;
                 gcMain.BindingContext = new BindingContext();

--
Gitblit v1.9.3