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

---
 service/Warehouse/MesXsckManager.cs        |   42 ++++++++++++++++++++++++++++++++++--------
 Controllers/Warehouse/MesXsckController.cs |    6 +++---
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/Controllers/Warehouse/MesXsckController.cs b/Controllers/Warehouse/MesXsckController.cs
index bd252cf..8ea3e24 100644
--- a/Controllers/Warehouse/MesXsckController.cs
+++ b/Controllers/Warehouse/MesXsckController.cs
@@ -12,7 +12,7 @@
 /// </summary>
 [Route("api/[controller]")]
 [ApiController]
-public class MesXsckController : ControllerBase
+public class MesXsckController : BaseController
 {
     private readonly MesXsckManager _manager = new();
 
@@ -231,7 +231,7 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = _manager.GetFHTZBillNo(query);
+            resultInfos.tbBillList = _manager.GetFHTZBillNo(query, RequestInfo);
             return new ResponseResult
             {
                 status = 0,
@@ -266,7 +266,7 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = _manager.GetMesItemFHTZetailByBillNo(query);
+            resultInfos.tbBillList = _manager.GetMesItemFHTZetailByBillNo(query, RequestInfo);
             return new ResponseResult
             {
                 status = 0,
diff --git a/service/Warehouse/MesXsckManager.cs b/service/Warehouse/MesXsckManager.cs
index 6f52fa2..df9f864 100644
--- a/service/Warehouse/MesXsckManager.cs
+++ b/service/Warehouse/MesXsckManager.cs
@@ -20,20 +20,40 @@
     ///     鑾峰彇鐢熶骇鍙戣揣閫氱煡鍗曞彿鍒楄〃
     /// </summary>
     /// <returns>鍙戣揣閫氱煡鍗曞彿鍒楄〃</returns>
-    public List<string> GetFHTZBillNo(WarehouseQuery query)
+    public dynamic GetFHTZBillNo(dynamic query, dynamic RequestInfo)
     {
-        var list = Db.Queryable<SalesDeliver>()
-            .Where(s => (s.FApproverStatus ?? false) == true)
-            .Select(s => s.BillNo)
-            .ToList();
-        return list;
+        var orgId = RequestInfo.OrgId;
+
+        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
+        {
+            // 杩斿洖鍗曞彿瀛楃涓插垪琛℅et_Qt_ck_List
+            var blDetails = Db.Ado.SqlQuery<string>(
+                "EXEC prc_pda_xsck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+            return blDetails;
+        }
+        catch (Exception ex)
+        {
+            throw new Exception($"{ex.Message}");
+        }
     }
 
     /// <summary>
     ///     鏍规嵁鍙戣揣閫氱煡鍗曡幏鍙栧搴斾唬鍙戣揣鏄庣粏  prc_rf_pda_scan_zout_showbl
     /// </summary>
     /// <returns>鍙戣揣閫氱煡鍗曟槑缁嗗垪琛�</returns>
-    public dynamic GetMesItemFHTZetailByBillNo(dynamic query)
+    public dynamic GetMesItemFHTZetailByBillNo(dynamic query, dynamic RequestInfo)
     {
         if (string.IsNullOrEmpty(query.billNo))
             throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -44,10 +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",orgId),
         new SugarParameter("@inP1", null),
         new SugarParameter("@inP2", null),
         new SugarParameter("@inP3", null),
@@ -56,7 +82,7 @@
         try
         {
             List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
-                "EXEC Get_Mes_Item_FHTZetail_By_BillNo @billNo,@inP1,@inP2,@inP3,@inP4", parameters);
+                "EXEC prc_pda_xsck_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