From d4769b70611aeb95ebd26ba83a3851f693f88998 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 九月 2025 15:00:17 +0800
Subject: [PATCH] 销售退货修改为存储过程

---
 Controllers/Warehouse/MesXsthController.cs |    6 +++---
 service/Warehouse/MesXsthManager.cs        |   41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/Controllers/Warehouse/MesXsthController.cs b/Controllers/Warehouse/MesXsthController.cs
index 3241ac0..6b6e66f 100644
--- a/Controllers/Warehouse/MesXsthController.cs
+++ b/Controllers/Warehouse/MesXsthController.cs
@@ -12,7 +12,7 @@
 /// </summary>
 [Route("api/[controller]")]
 [ApiController]
-public class MesXsthController : ControllerBase
+public class MesXsthController : BaseController
 {
     private readonly MesXsthManager _manager = new();
 
@@ -176,7 +176,7 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = _manager.GetXsthBillNo(query);
+            resultInfos.tbBillList = _manager.GetXsthBillNo(query, RequestInfo);
             return new ResponseResult
             {
                 status = 0,
@@ -202,7 +202,7 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query);
+            resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query, RequestInfo);
 
             if (resultInfos.tbBillList.Count < 1)
             {
diff --git a/service/Warehouse/MesXsthManager.cs b/service/Warehouse/MesXsthManager.cs
index 1358863..27d063f 100644
--- a/service/Warehouse/MesXsthManager.cs
+++ b/service/Warehouse/MesXsthManager.cs
@@ -19,13 +19,33 @@
     ///     鑾峰彇閿�鍞��璐х敵璇峰垪琛�
     /// </summary>
     /// <returns>閿�鍞��璐х敵璇峰垪琛�</returns>
-    public List<string> GetXsthBillNo(WarehouseQuery query)
+    public dynamic GetXsthBillNo(WarehouseQuery query,dynamic RequestInfo)
     {
-        var list = Db.Queryable<SalesReturnNotice>()
-            .Where(s => s.CheckStatus == true)
-            .Select(s => s.BillNo).ToList();
+        var orgId = RequestInfo.OrgId;
 
-        return list;
+        if (orgId == null)
+            throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+        // 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
+        var parameters = new[]
+        {
+        new SugarParameter("@pi_orgId", orgId),
+        new SugarParameter("@inP1", null),
+        new SugarParameter("@inP2", null),
+        new SugarParameter("@inP3", null),
+        new SugarParameter("@inP4", null)
+        };
+        try
+        {
+            // 杩斿洖鍗曞彿瀛楃涓插垪琛�
+            var blDetails = Db.Ado.SqlQuery<string>(
+                "EXEC prc_pda_xsth_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+            return blDetails;
+        }
+        catch (Exception ex)
+        {
+            throw new Exception($"{ex.Message}");
+        }
     }
 
     /// <summary>
@@ -33,7 +53,7 @@
     /// </summary>
     /// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
     /// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
-    public dynamic GetMesItemDetailByBillNo(dynamic query)
+    public dynamic GetMesItemDetailByBillNo(dynamic query, dynamic RequestInfo)
     {
         if (string.IsNullOrEmpty(query.billNo))
             throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -44,11 +64,16 @@
         if (string.IsNullOrEmpty(query.billNo?.ToString()))
             throw new ArgumentException("鍗曟嵁鍙蜂笉鑳戒负绌�", nameof(query.billNo));
 
+        var orgId = RequestInfo.OrgId;
+
+        if (orgId == null)
+            throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
         // 鑾峰彇鏈畬鎴愮殑閿�鍞��璐ф槑缁�
         var parameters = new[]
 {
         new SugarParameter("@billNo", query.billNo),
-        new SugarParameter("@pi_orgId",null),
+        new SugarParameter("@pi_orgId",orgId),
         new SugarParameter("@inP1", null),
         new SugarParameter("@inP2", null),
         new SugarParameter("@inP3", null),
@@ -57,7 +82,7 @@
         try
         {
             List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
-                "EXEC Get_Mes_Item_Detail_By_BillNo @billNo,@inP1,@inP2,@inP3,@inP4", parameters);
+                "EXEC prc_pda_xsth_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
             var items = blDetails.Where(x => x.DSQty > 0).ToList();    // 寰呮壂鐗╂枡
             var ysitems = blDetails.Where(x => x.SQty > 0).ToList();   // 宸叉壂鐗╂枡
             return new

--
Gitblit v1.9.3