diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index b79b0302..b58baf89 100644 --- a/ZR.Admin.WebApi/Controllers/BaseController.cs +++ b/ZR.Admin.WebApi/Controllers/BaseController.cs @@ -54,21 +54,21 @@ namespace ZR.Admin.WebApi.Controllers /// 完整文件路径 /// 带扩展文件名 /// - //protected IActionResult ExportExcel(string path, string fileName) - //{ - // //var webHostEnvironment = App.WebHostEnvironment; - // if (!Path.Exists(path)) - // { - // throw new CustomException(fileName + "文件不存在"); - // } - // var stream = Io.File.OpenRead(path); //创建文件流 - - // Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition"); - // return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName)); - // // return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",fileName); - //} - protected IActionResult ExportExcel(string path, string fileName) + { + //var webHostEnvironment = App.WebHostEnvironment; + if (!Path.Exists(path)) + { + throw new CustomException(fileName + "文件不存在"); + } + var stream = Io.File.OpenRead(path); //创建文件流 + + Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition"); + return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName)); + // return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",fileName); + } + + protected IActionResult ExportExcel2(string path, string fileName) { if (!Path.Exists(path)) { diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs index 6707adde..9c7252bd 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs @@ -59,7 +59,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro public IActionResult ImportTemplateExcel() { (string, string) result = DownloadImportTemplate("日生产计划模板");//返回文件名和路径 - return ExportExcel(result.Item2, result.Item1); + return ExportExcel2(result.Item2, result.Item1); } @@ -145,7 +145,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro if (item.PreviousNumber != null && item.PreviousNumber > 0 && item.PQualifiedNum != null && item.PQualifiedNum > 0) { decimal rate = (decimal)item.PQualifiedNum / (decimal)item.PreviousNumber; - item.PQualifiedRate = Math.Round(rate, 2); + item.PQualifiedRate = Math.Round(rate, 4); } else { diff --git a/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104344.xlsx b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104344.xlsx new file mode 100644 index 00000000..14e7280e Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104344.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104356.xlsx b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104356.xlsx new file mode 100644 index 00000000..b272b07d Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104356.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104917.xlsx b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104917.xlsx new file mode 100644 index 00000000..723e3ff5 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-104917.xlsx differ