1

2024-11-15 18:51:05 +08:00
parent 8155905cb4
commit caee66b131
11 changed files with 184 additions and 79 deletions
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using MiniExcelLibs;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.MES.wms;
@@ -31,7 +32,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="parm"></param>
        /// <returns></returns>
        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")]
+        // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")]
        public IActionResult QueryWmOneTimeInventory([FromQuery] WmOneTimeInventoryQueryDto parm)
        {
            var response = _WmOneTimeInventoryService.GetList(parm);
@@ -44,7 +45,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="Id"></param>
        /// <returns></returns>
        [HttpGet("{Id}")]
-        [ActionPermissionFilter(Permission = "business:wmonetimeinventory:query")]
+        // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:query")]
        public IActionResult GetWmOneTimeInventory(string Id)
        {
            var response = _WmOneTimeInventoryService.GetInfo(Id);
@@ -58,7 +59,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost]
-        [ActionPermissionFilter(Permission = "business:wmonetimeinventory:add")]
+        // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:add")]
        [Log(Title = "一次合格品仓库", BusinessType = BusinessType.INSERT)]
        public IActionResult AddWmOneTimeInventory([FromBody] WmOneTimeInventoryDto parm)
        {
@@ -74,7 +75,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPut]
-        [ActionPermissionFilter(Permission = "business:wmonetimeinventory:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:edit")]
        [Log(Title = "一次合格品仓库", BusinessType = BusinessType.UPDATE)]
        public IActionResult UpdateWmOneTimeInventory([FromBody] WmOneTimeInventoryDto parm)
        {
@@ -89,7 +90,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpDelete("{ids}")]
-        [ActionPermissionFilter(Permission = "business:wmonetimeinventory:delete")]
+        // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:delete")]
        [Log(Title = "一次合格品仓库", BusinessType = BusinessType.DELETE)]
        public IActionResult DeleteWmOneTimeInventory(string ids)
        {
@@ -104,21 +105,7 @@ 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.GetExportList(parm);
-            var result = ExportExcelMini(list, "wm_one_time_inventory", "一次合格品仓库数据");
-            return ExportExcel(result.Item2, result.Item1);
-        }
+

        /// <summary>
        /// 一次合格品手动入库
@@ -191,5 +178,55 @@ namespace ZR.Admin.WebApi.Controllers
            var response = _WmOneTimeInventoryService.GetPartNumber();
            return SUCCESS(response);
        }
+
+
+        /// <summary>
+        /// 抛光导入模板下载
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("importTemplate")]
+        [Log(Title = "一次合格模板", BusinessType = BusinessType.EXPORT, IsSaveRequestData = true, IsSaveResponseData = false)]
+        [AllowAnonymous]
+        public IActionResult ImportTemplateExcel()
+        {
+            string fileName = "一次合格仓库盘点模板";
+            (string, string) result = DownloadImportTemplate(fileName);
+            return ExportExcel(result.Item2, result.Item1);
+        }
+
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="formFile">使用IFromFile必须使用name属性否则获取不到文件</param>
+        /// <returns></returns>
+        [HttpPost("importData")]
+        [Log(Title = "一次合格盘点导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = true)]
+        [AllowAnonymous]
+        public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
+        {
+            List<WmOneTimeInventoryExportDto> importList = new();
+            using (var stream = formFile.OpenReadStream())
+            {
+                importList = stream.Query<WmOneTimeInventoryExportDto>(startCell: "A1").ToList();
+            }
+
+            return SUCCESS(_WmOneTimeInventoryService.ImportExcel(importList));
+        }
+
+        /// <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.GetExportList(parm);
+            var result = ExportExcelMini(list, "wm_one_time_inventory", "一次合格品仓库数据");
+            return ExportExcel(result.Item2, result.Item1);
+        }
    }
 }
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeRecordController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeRecordController.cs
@@ -30,7 +30,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="parm"></param>
        /// <returns></returns>
        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "business:wmonetimerecord:list")]
+        //[ActionPermissionFilter(Permission = "business:wmonetimerecord:list")]
        public IActionResult QueryWmOneTimeRecord([FromQuery] WmOneTimeRecordQueryDto parm)
        {
            var response = _WmOneTimeRecordService.GetList(parm);
@@ -43,7 +43,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="Id"></param>
        /// <returns></returns>
        [HttpGet("{Id}")]
-        [ActionPermissionFilter(Permission = "business:wmonetimerecord:query")]
+        //[ActionPermissionFilter(Permission = "business:wmonetimerecord:query")]
        public IActionResult GetWmOneTimeRecord(string Id)
        {
            var response = _WmOneTimeRecordService.GetInfo(Id);
@@ -57,7 +57,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost]
-        [ActionPermissionFilter(Permission = "business:wmonetimerecord:add")]
+        //[ActionPermissionFilter(Permission = "business:wmonetimerecord:add")]
        [Log(Title = "一次合格品仓库记录表", BusinessType = BusinessType.INSERT)]
        public IActionResult AddWmOneTimeRecord([FromBody] WmOneTimeRecordDto parm)
        {
@@ -73,7 +73,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPut]
-        [ActionPermissionFilter(Permission = "business:wmonetimerecord:edit")]
+        //[ActionPermissionFilter(Permission = "business:wmonetimerecord:edit")]
        [Log(Title = "一次合格品仓库记录表", BusinessType = BusinessType.UPDATE)]
        public IActionResult UpdateWmOneTimeRecord([FromBody] WmOneTimeRecordDto parm)
        {
@@ -88,7 +88,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpDelete("{ids}")]
-        [ActionPermissionFilter(Permission = "business:wmonetimerecord:delete")]
+        //[ActionPermissionFilter(Permission = "business:wmonetimerecord:delete")]
        [Log(Title = "一次合格品仓库记录表", BusinessType = BusinessType.DELETE)]
        public IActionResult DeleteWmOneTimeRecord(string ids)
        {
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
@@ -39,7 +39,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="parm"></param>
        /// <returns></returns>
        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:list")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:list")]
        public IActionResult QueryWmPolishInventory([FromQuery] WmPolishInventoryQueryDto parm)
        {
            var response = _WmPolishInventoryService.GetList(parm);
@@ -52,7 +52,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="Id"></param>
        /// <returns></returns>
        [HttpGet("{Id}")]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:query")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:query")]
        public IActionResult GetWmPolishInventory(string Id)
        {
            var response = _WmPolishInventoryService.GetInfo(Id);
@@ -66,7 +66,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:add")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:add")]
        [Log(Title = "抛光 库存表", BusinessType = BusinessType.INSERT)]
        public IActionResult AddWmPolishInventory([FromBody] WmPolishInventoryDto parm)
        {
@@ -82,7 +82,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPut]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
        [Log(Title = "抛光 库存表", BusinessType = BusinessType.UPDATE)]
        public IActionResult UpdateWmPolishInventory([FromBody] WmPolishInventoryDto parm)
        {
@@ -97,7 +97,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpDelete("{ids}")]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:delete")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:delete")]
        [Log(Title = "抛光 库存表", BusinessType = BusinessType.DELETE)]
        public IActionResult DeleteWmPolishInventory(string ids)
        {
@@ -112,22 +112,7 @@ 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.GetExportList(parm);
-
-            var result = ExportExcelMini(list, "wm_polish_inventory", "抛光仓库数据");
-            return ExportExcel(result.Item2, result.Item1);
-        }
+ 

        /// <summary>
        /// 物料下拉菜单查看
@@ -152,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost("doWmPolishWarehousing")]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
        [Log(Title = "抛光手动入库", BusinessType = BusinessType.UPDATE)]
        public IActionResult DoWmPolishWarehousing([FromBody] WmPolishInventoryDto parm)
        {
@@ -173,7 +158,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost("doWmPolishRetrieval")]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
        [Log(Title = "抛光手动出库", BusinessType = BusinessType.UPDATE)]
        public IActionResult DoWmPolishRetrieval([FromBody] WmPolishInventoryDto parm)
        {
@@ -194,7 +179,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost("doWmPolishStocktaking")]
-        [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
        [Log(Title = "抛光仓库盘点", BusinessType = BusinessType.INSERT)]
        public IActionResult DoWmPolishStocktaking([FromBody] WmPolishInventoryDto parm)
        {
@@ -255,5 +240,22 @@ namespace ZR.Admin.WebApi.Controllers

            return SUCCESS(_WmPolishInventoryService.ImportExcel(importList));
        }
+
+        /// <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.GetExportList(parm);
+
+            var result = ExportExcelMini(list, "wm_polish_inventory", "抛光仓库数据");
+            return ExportExcel(result.Item2, result.Item1);
+        }
    }
 }
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishQualityStatisticsController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishQualityStatisticsController.cs
@@ -34,7 +34,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="parm"></param>
        /// <returns></returns>
        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:list")]
+         // [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:list")]
        public IActionResult QueryWmPolishQualityStatistics(
            [FromQuery] WmPolishQualityStatisticsQueryDto parm
        )
@@ -66,7 +66,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="Id"></param>
        /// <returns></returns>
        [HttpGet("{Id}")]
-        [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:query")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:query")]
        public IActionResult GetWmPolishQualityStatistics(string Id)
        {
            var response = _WmPolishQualityStatisticsService.GetInfo(Id);
@@ -80,7 +80,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost]
-        [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:add")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:add")]
        [Log(Title = "抛光管理-质量统计", BusinessType = BusinessType.INSERT)]
        public IActionResult AddWmPolishQualityStatistics(
            [FromBody] WmPolishQualityStatisticsDto parm
@@ -107,7 +107,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPut]
-        [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:edit")]
        [Log(Title = "抛光管理-质量统计", BusinessType = BusinessType.UPDATE)]
        public IActionResult UpdateWmPolishQualityStatistics(
            [FromBody] WmPolishQualityStatisticsDto parm
@@ -132,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpDelete("{ids}")]
-        [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:delete")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:delete")]
        [Log(Title = "抛光管理-质量统计", BusinessType = BusinessType.DELETE)]
        public IActionResult DeleteWmPolishQualityStatistics(string ids)
        {
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishRecordController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishRecordController.cs
@@ -31,7 +31,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="parm"></param>
        /// <returns></returns>
        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "business:wmpolishrecord:list")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishrecord:list")]
        public IActionResult QueryWmPolishRecord([FromQuery] WmPolishRecordQueryDto parm)
        {
            var response = _WmPolishRecordService.GetList(parm);
@@ -44,7 +44,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <param name="Id"></param>
        /// <returns></returns>
        [HttpGet("{Id}")]
-        [ActionPermissionFilter(Permission = "business:wmpolishrecord:query")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishrecord:query")]
        public IActionResult GetWmPolishRecord(string Id)
        {
            var response = _WmPolishRecordService.GetInfo(Id);
@@ -58,7 +58,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost]
-        [ActionPermissionFilter(Permission = "business:wmpolishrecord:add")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishrecord:add")]
        [Log(Title = "工艺路线-抛光 库存变动表", BusinessType = BusinessType.INSERT)]
        public IActionResult AddWmPolishRecord([FromBody] WmPolishRecordDto parm)
        {
@@ -74,7 +74,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPut]
-        [ActionPermissionFilter(Permission = "business:wmpolishrecord:edit")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishrecord:edit")]
        [Log(Title = "工艺路线-抛光 库存变动表", BusinessType = BusinessType.UPDATE)]
        public IActionResult UpdateWmPolishRecord([FromBody] WmPolishRecordDto parm)
        {
@@ -89,7 +89,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpDelete("{ids}")]
-        [ActionPermissionFilter(Permission = "business:wmpolishrecord:delete")]
+        // [ActionPermissionFilter(Permission = "business:wmpolishrecord:delete")]
        [Log(Title = "工艺路线-抛光 库存变动表", BusinessType = BusinessType.DELETE)]
        public IActionResult DeleteWmPolishRecord(string ids)
        {