From 43ec43ba431e2ae06b2130f0f93aa4c237c41c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 16 Oct 2024 17:26:12 +0800
Subject: [PATCH] 1

---
 .../mes/wms/WmOneTimeInventoryController.cs   | 16 ++++++++++++++++
 .../mes/wms/WmPolishInventoryController.cs    | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
index 5f91866f..ae9f3c7d 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
@@ -104,6 +104,22 @@ namespace ZR.Admin.WebApi.Controllers
             return ToResponse(response);
         }
 
+        /// <summary>
+        /// 一次合格品仓库数据导出
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("export")]
+        [Log(Title = "一次合格品仓库数据导出", BusinessType = BusinessType.EXPORT)]
+        public IActionResult Export([FromQuery] WmOneTimeInventoryQueryDto parm)
+        {
+            parm.PageNum = 1;
+            parm.PageSize = 10000;
+            var list = _WmOneTimeInventoryService.GetList(parm);
+            var result = ExportExcelMini(list.Result, "onetime", "一次合格品仓库数据");
+            return ExportExcel(result.Item2, result.Item1);
+        }
+
         /// <summary>
         /// 一次合格品手动入库
         /// </summary>
diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
index f7a2aba2..69ce9135 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
@@ -1,8 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
+using ZR.Model;
 using ZR.Model.MES.wms;
 using ZR.Model.MES.wms.Dto;
+using ZR.Model.System.Dto;
 using ZR.Service.mes.wms;
 using ZR.Service.mes.wms.IService;
 
@@ -105,6 +107,23 @@ namespace ZR.Admin.WebApi.Controllers
             return ToResponse(response);
         }
 
+        /// <summary>
+        /// 抛光仓库数据导出
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("export")]
+        [Log(Title = "抛光仓库数据导出", BusinessType = BusinessType.EXPORT)]
+        public IActionResult Export([FromQuery] WmPolishInventoryQueryDto parm)
+        {
+            parm.PageNum = 1;
+            parm.PageSize = 10000;
+            var list = _WmPolishInventoryService.GetList(parm);
+
+            var result = ExportExcelMini(list.Result, "polish", "抛光仓库数据");
+            return ExportExcel(result.Item2, result.Item1);
+        }
+
         /// <summary>
         /// 物料下拉菜单查看
         /// </summary>