From e77cc2b8f2a713b3c414a59bfa3a4a78960c5799 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期六, 13 十二月 2025 08:56:14 +0800
Subject: [PATCH] 11

---
 StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs |  144 ++++++++++++------------------------------------
 1 files changed, 36 insertions(+), 108 deletions(-)

diff --git a/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs b/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
index 6415181..7c73129 100644
--- a/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
+++ b/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
@@ -1,3 +1,4 @@
+using MES.Service.Dto.webApi;
 using MES.Service.util;
 using MES.Service.service.Warehouse;
 using Microsoft.AspNetCore.Mvc;
@@ -14,15 +15,45 @@
     private readonly SalesPalletManager _manager = new();
 
     /// <summary>
-    ///     鑾峰彇閿�鍞墭鐩樹俊鎭�
+    /// 鑾峰彇閿�鍞墭鐩樺垎椤垫暟鎹�
     /// </summary>
-    /// <returns>閿�鍞墭鐩樹俊鎭垪琛�</returns>
-    [HttpPost("GetSalesPalletInfo")]
-    public ResponseResult GetSalesPalletInfo()
+    /// <param name="request">鏌ヨ璇锋眰鍙傛暟</param>
+    /// <returns>鍒嗛〉缁撴灉</returns>
+    [HttpPost("GetSalesPalletPage")]
+    public ResponseResult GetSalesPalletPage(
+        [FromBody] SalesPalletSearchDto request)
     {
         try
         {
-            var result = _manager.GetSalesPalletInfo();
+            var (items, totalCount) = _manager.GetSalesPalletPage(request);
+
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = items,
+                TotalCount = totalCount
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    /// <summary>
+    /// 鑾峰彇閿�鍞墭鐩樻槑缁嗘暟鎹�
+    /// </summary>
+    /// <param name="request">鏌ヨ璇锋眰鍙傛暟</param>
+    /// <returns>鏄庣粏鍒楄〃</returns>
+    [HttpPost("GetSalesPalletDetail")]
+    public ResponseResult GetSalesPalletDetail(
+        [FromBody] SalesPalletDetailQueryDto request)
+    {
+        try
+        {
+            var result = _manager.GetSalesPalletDetail(request);
+
             return new ResponseResult
             {
                 status = 0,
@@ -35,107 +66,4 @@
             return ResponseResult.ResponseError(ex);
         }
     }
-
-    /// <summary>
-    ///     鏍规嵁鏉′欢鑾峰彇閿�鍞墭鐩樹俊鎭�
-    /// </summary>
-    /// <param name="request">鏌ヨ鏉′欢</param>
-    /// <returns>閿�鍞墭鐩樹俊鎭垪琛�</returns>
-    [HttpPost("GetSalesPalletInfoByCondition")]
-    public ResponseResult GetSalesPalletInfoByCondition([FromBody] SalesPalletQueryRequest request)
-    {
-        try
-        {
-            var result = _manager.GetSalesPalletInfo(request.BillNo, request.ItemId, request.Status);
-            return new ResponseResult
-            {
-                status = 0,
-                message = "鏌ヨ鎴愬姛",
-                data = result
-            };
-        }
-        catch (Exception ex)
-        {
-            return ResponseResult.ResponseError(ex);
-        }
-    }
-
-    /// <summary>
-    ///     鑾峰彇閿�鍞墭鐩樻槑缁嗕俊鎭�
-    /// </summary>
-    /// <returns>閿�鍞墭鐩樻槑缁嗕俊鎭垪琛�</returns>
-    [HttpPost("GetSalesPalletDetailInfo")]
-    public ResponseResult GetSalesPalletDetailInfo()
-    {
-        try
-        {
-            var result = _manager.GetSalesPalletDetailInfo();
-            return new ResponseResult
-            {
-                status = 0,
-                message = "鏌ヨ鎴愬姛",
-                data = result
-            };
-        }
-        catch (Exception ex)
-        {
-            return ResponseResult.ResponseError(ex);
-        }
-    }
-
-    /// <summary>
-    ///     鏍规嵁鏍堟澘鐮佽幏鍙栭攢鍞墭鐩樻槑缁嗕俊鎭�
-    /// </summary>
-    /// <param name="request">鏌ヨ鏉′欢</param>
-    /// <returns>閿�鍞墭鐩樻槑缁嗕俊鎭垪琛�</returns>
-    [HttpPost("GetSalesPalletDetailInfoByStackcode")]
-    public ResponseResult GetSalesPalletDetailInfoByStackcode([FromBody] SalesPalletDetailQueryRequest request)
-    {
-        try
-        {
-            var result = _manager.GetSalesPalletDetailInfo(request.Stackcode);
-            return new ResponseResult
-            {
-                status = 0,
-                message = "鏌ヨ鎴愬姛",
-                data = result
-            };
-        }
-        catch (Exception ex)
-        {
-            return ResponseResult.ResponseError(ex);
-        }
-    }
-}
-
-/// <summary>
-///     閿�鍞墭鐩樻煡璇㈣姹�
-/// </summary>
-public class SalesPalletQueryRequest
-{
-    /// <summary>
-    ///     鍗曟嵁缂栧彿
-    /// </summary>
-    public string? BillNo { get; set; }
-
-    /// <summary>
-    ///     鐗╂枡ID
-    /// </summary>
-    public decimal? ItemId { get; set; }
-
-    /// <summary>
-    ///     瀹℃牳鐘舵��
-    /// </summary>
-    public decimal? Status { get; set; }
-}
-
-/// <summary>
-///     閿�鍞墭鐩樻槑缁嗘煡璇㈣姹�
-/// </summary>
-public class SalesPalletDetailQueryRequest
-{
-    /// <summary>
-    ///     鏍堟澘鐮�
-    /// </summary>
-    public string? Stackcode { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3