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.cs |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 7b572bf..78f5ba8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -53,7 +53,7 @@
                 if (string.IsNullOrEmpty(_sqGuid))
                     return;
                 txt_custName.Text = txt_salesOrderId.GetSalesCusName();
-                txt_salesOrg.Text = txt_salesOrderId.GetSalesOrgName();
+                txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
                 System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
                 var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
                 var json = JsonConvert.SerializeObject(_obj);
@@ -250,6 +250,7 @@
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                 gvList.Add(gvMx1);
+                gvList.Add(gvMx2);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
         }
@@ -264,8 +265,10 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
             List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gridViews.Add(gvMx1);
+            gridViews.Add(gvMx2);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
 
         }
         /// <summary>
@@ -353,6 +356,7 @@
                     toolBarMenu1.isSetBtn = true;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
+                    gvList.Add(gvMx2);
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
                 }
@@ -442,6 +446,7 @@
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
+                    gvList.Add(gvMx2);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
@@ -568,11 +573,12 @@
         {
             SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
             DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
-            //gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
-             gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString());
-            //gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
-            //gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
+            gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
+            gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
+             gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
+             gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString());
             //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
+            gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString());
             gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
             gvMx1.CloseEditor();
             gvMx1.UpdateCurrentRow();
@@ -626,12 +632,12 @@
                 DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                 lbMxGuid.Text = row["guid"].ToString();
                 ucBtnPrint1.guidKey = row["guid"].ToString();
-                //txtWlid.Text = row["qd002"].ToString();
-                //txtWlgg.Text = row["qd004"].ToString();
-                //txtWlmc.Text = row["qd003"].ToString();
-                //txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
-                //txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
-                //txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
+                txtWlid.Text = row["itemId"].ToString();
+                txtWlgg.Text = row["itemNo"].ToString();
+                txtWlmc.Text = row["itemName"].ToString();
+                txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺
+                txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+                txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
             }
         }
     }

--
Gitblit v1.9.3