From 2a55c57a5311ab86eed3f32ef4f1c1a3b1556faa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 05 三月 2025 15:47:31 +0800
Subject: [PATCH] 退货申请

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs |  131 ++++++++++++++++++++++++++++---------------
 1 files changed, 84 insertions(+), 47 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 2917450..2d76e05 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -84,13 +84,13 @@
             this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
             this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_salesOrg = new DevExpress.XtraEditors.TextEdit();
+            this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit();
             this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit();
             this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_salesPerson = new DevExpress.XtraEditors.TextEdit();
+            this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
             this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_salesDept = new DevExpress.XtraEditors.TextEdit();
+            this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
             this.txt_custName = new DevExpress.XtraEditors.TextEdit();
             this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
@@ -130,6 +130,7 @@
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -146,6 +147,8 @@
             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();
@@ -207,13 +210,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesPerson.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
@@ -651,13 +654,13 @@
             this.layoutMx1.Controls.Add(this.txt_approvedDate);
             this.layoutMx1.Controls.Add(this.txt_id);
             this.layoutMx1.Controls.Add(this.txt_approvedBy);
-            this.layoutMx1.Controls.Add(this.txt_salesOrg);
+            this.layoutMx1.Controls.Add(this.txt_xsOrgName);
             this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
             this.layoutMx1.Controls.Add(this.txt_modifiedDate);
             this.layoutMx1.Controls.Add(this.txt_billNo);
-            this.layoutMx1.Controls.Add(this.txt_salesPerson);
+            this.layoutMx1.Controls.Add(this.txt_salerName);
             this.layoutMx1.Controls.Add(this.txt_modifiedBy);
-            this.layoutMx1.Controls.Add(this.txt_salesDept);
+            this.layoutMx1.Controls.Add(this.txt_saleDeptName);
             this.layoutMx1.Controls.Add(this.txt_custName);
             this.layoutMx1.Controls.Add(this.txt_createdDate);
             this.layoutMx1.Controls.Add(this.txt_returnReason);
@@ -754,16 +757,16 @@
             this.txt_approvedBy.TabIndex = 370;
             this.txt_approvedBy.Tag = "readonly";
             // 
-            // txt_salesOrg
+            // txt_xsOrgName
             // 
-            this.txt_salesOrg.Location = new System.Drawing.Point(361, 12);
-            this.txt_salesOrg.Name = "txt_salesOrg";
-            this.txt_salesOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesOrg.Size = new System.Drawing.Size(189, 28);
-            this.txt_salesOrg.StyleController = this.layoutMx1;
-            this.txt_salesOrg.TabIndex = 219;
-            this.txt_salesOrg.Tag = "readonly";
+            this.txt_xsOrgName.Location = new System.Drawing.Point(361, 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.StyleController = this.layoutMx1;
+            this.txt_xsOrgName.TabIndex = 219;
+            this.txt_xsOrgName.Tag = "readonly";
             // 
             // txt_inventoryOrg
             // 
@@ -798,16 +801,16 @@
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readonly";
             // 
-            // txt_salesPerson
+            // txt_salerName
             // 
-            this.txt_salesPerson.Location = new System.Drawing.Point(361, 44);
-            this.txt_salesPerson.Name = "txt_salesPerson";
-            this.txt_salesPerson.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesPerson.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesPerson.Size = new System.Drawing.Size(189, 28);
-            this.txt_salesPerson.StyleController = this.layoutMx1;
-            this.txt_salesPerson.TabIndex = 267;
-            this.txt_salesPerson.Tag = "readonly";
+            this.txt_salerName.Location = new System.Drawing.Point(361, 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.StyleController = this.layoutMx1;
+            this.txt_salerName.TabIndex = 267;
+            this.txt_salerName.Tag = "readonly";
             // 
             // txt_modifiedBy
             // 
@@ -820,16 +823,16 @@
             this.txt_modifiedBy.TabIndex = 327;
             this.txt_modifiedBy.Tag = "readonly";
             // 
-            // txt_salesDept
+            // txt_saleDeptName
             // 
-            this.txt_salesDept.Location = new System.Drawing.Point(361, 76);
-            this.txt_salesDept.Name = "txt_salesDept";
-            this.txt_salesDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_salesDept.Properties.Appearance.Options.UseFont = true;
-            this.txt_salesDept.Size = new System.Drawing.Size(189, 28);
-            this.txt_salesDept.StyleController = this.layoutMx1;
-            this.txt_salesDept.TabIndex = 222;
-            this.txt_salesDept.Tag = "readonly";
+            this.txt_saleDeptName.Location = new System.Drawing.Point(361, 76);
+            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.StyleController = this.layoutMx1;
+            this.txt_saleDeptName.TabIndex = 222;
+            this.txt_saleDeptName.Tag = "readonly";
             // 
             // txt_custName
             // 
@@ -943,7 +946,7 @@
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.txt_salesOrg;
+            this.layoutControlItem2.Control = this.txt_xsOrgName;
             this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -983,7 +986,7 @@
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txt_salesPerson;
+            this.layoutControlItem6.Control = this.txt_salerName;
             this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -994,7 +997,7 @@
             // 
             // layoutControlItem7
             // 
-            this.layoutControlItem7.Control = this.txt_salesDept;
+            this.layoutControlItem7.Control = this.txt_saleDeptName;
             this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1190,6 +1193,8 @@
             this.gvMx1returnType,
             this.gvMx1inventoryUnit,
             this.gridColumn12,
+            this.gridColumn21,
+            this.gridColumn22,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -1233,7 +1238,8 @@
             this.gridColumn8,
             this.gridColumn9,
             this.gridColumn10,
-            this.gridColumn11});
+            this.gridColumn11,
+            this.gridColumn23});
             this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
             this.gridView2.Name = "gridView2";
             this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1302,6 +1308,14 @@
             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
             // 
@@ -1514,6 +1528,26 @@
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Width = 94;
             // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鍙墦鍗版暟閲�";
+            this.gridColumn21.FieldName = "kdy";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 13;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "宸叉墦鍗版暟閲�";
+            this.gridColumn22.FieldName = "ydy";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 14;
+            this.gridColumn22.Width = 94;
+            // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
@@ -1521,7 +1555,7 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 13;
+            this.gvMxDel.VisibleIndex = 15;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -1931,13 +1965,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesPerson.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
@@ -2032,12 +2066,12 @@
         private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
         private DevExpress.XtraEditors.TextEdit txt_createdDate;
         private DevExpress.XtraEditors.TextEdit txt_createdBy;
-        private DevExpress.XtraEditors.TextEdit txt_salesPerson;
+        private DevExpress.XtraEditors.TextEdit txt_salerName;
         private DevExpress.XtraEditors.TextEdit txt_custName;
         private DevExpress.XtraEditors.TextEdit txt_inventoryOrg;
         private DevExpress.XtraEditors.TextEdit txt_returnReason;
-        private DevExpress.XtraEditors.TextEdit txt_salesDept;
-        private DevExpress.XtraEditors.TextEdit txt_salesOrg;
+        private DevExpress.XtraEditors.TextEdit txt_saleDeptName;
+        private DevExpress.XtraEditors.TextEdit txt_xsOrgName;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraEditors.TextEdit txt_id;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -2127,5 +2161,8 @@
         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;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3