From 054f057e14b14044fe6547d56c2ec97b5c7e9003 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 15:09:57 +0800
Subject: [PATCH] 销售退货

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 78f5ba8..e2bbb5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -16,6 +16,7 @@
     {
         string _webServiceName = "SalesReturnManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
+        string _ucCk = "";//鍙戞枡浠撳簱
         public Frm_SalesReturnNotice()
         {
             InitializeComponent();
@@ -54,6 +55,8 @@
                     return;
                 txt_custName.Text = txt_salesOrderId.GetSalesCusName();
                 txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
+                string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
+                txt_fstockid.getSuppler(_xsOrgFid,_ucCk);
                 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);
@@ -282,6 +285,7 @@
             string djlx = txt_billType.Text.ToString();
             string FNote = txt_returnReason.Text.ToString();
             string _sqGuid = txt_salesOrderId.GetId();
+            string ckId = txt_fstockid.GetId();
             if (string.IsNullOrEmpty(_sqGuid))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
@@ -294,12 +298,19 @@
                 txt_billType.Focus();
                 return;
             }
+            if (string.IsNullOrEmpty(ckId))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+                txt_fstockid.Focus();
+                return;
+            }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 djlx = djlx,//鍗曟嵁绫诲瀷
                 salesId = _sqGuid,//閿�鍞崟鍙�
                 inRemark = FNote.Trim(),//澶囨敞
+                ckId = ckId,
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -443,11 +454,13 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    _ucCk = dy.fstockid;
                     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);
+                    _ucCk = "";
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
@@ -575,8 +588,8 @@
             DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
             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("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());

--
Gitblit v1.9.3