diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index bd98b5b8..d81461c8 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1786,9 +1786,7 @@ namespace Myshipping.Application - //fileName = $"{dicCate.Value}_{order.MBLNO}_{DateTime.Now.Ticks}{fileType}";//名称 - - fileName = $"{order.MBLNO}_{DateTime.Now.Ticks}{fileType}";//名称 + fileName = $"{dicCate.Value}_{order.MBLNO}_{DateTime.Now.Ticks}{fileType}";//名称 var opt = App.GetOptions().Path; var serverpath = Path.Combine(App.WebHostEnvironment.WebRootPath, opt);//服务器路径 if (!Directory.Exists(serverpath)) @@ -1888,7 +1886,7 @@ namespace Myshipping.Application { Directory.CreateDirectory(fileFullPath); } - fileName = $"{dicCate.Value}_{order.MBLNO}_{DateTime.Now.Ticks}" + ".xls";//名称 + fileName = $"{dicCate.Value}_{order.MBLNO}_{printTemplate.DisplayName}_{DateTime.Now.Ticks}" + ".xls";//名称 _logger.LogInformation("导出excel:" + Path.Combine(fileFullPath, fileName)); var filestream = new FileStream(Path.Combine(fileFullPath, fileName), FileMode.OpenOrCreate, FileAccess.ReadWrite); excelwork.Write(filestream); @@ -3663,7 +3661,7 @@ namespace Myshipping.Application /// /// [HttpGet("/BookingOrder/GetFieldName")] - public async Task GetFieldName() + public async Task GetFieldName() { BookingOrder order = new BookingOrder(); BookingCtn ctn = new BookingCtn();