diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index b58baf89..b79b0302 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 16b471f6..6707adde 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 ExportExcel2(result.Item2, result.Item1); + return ExportExcel(result.Item2, result.Item1); } diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218152757日生产计划模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218152757日生产计划模板.xlsx new file mode 100644 index 00000000..29f7c84e Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218152757日生产计划模板.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218153054日生产计划模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218153054日生产计划模板.xlsx new file mode 100644 index 00000000..29f7c84e Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218153054日生产计划模板.xlsx differ