diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 50c370ee..831a4335 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -108,7 +108,7 @@ namespace Myshipping.Application ILogger logger, ISysCacheService cache, IDjyWebsiteAccountConfigService webAccountConfig, ISysDataUserMenu right, SqlSugarRepository repPrintTemplate, SqlSugarRepository repLetterYard, SqlSugarRepository repUser, SqlSugarRepository repOrderUrl, SqlSugarRepository repOrderContact, SqlSugarRepository repSampleBill, - SqlSugarRepository excelrep, SqlSugarRepository repUserMail, + SqlSugarRepository excelrep, SqlSugarRepository repUserMail, SqlSugarRepository repTenant, SqlSugarRepository repBookingStatus, SqlSugarRepository bookingEDIExt, IHttpContextAccessor httpContextAccessor) { @@ -1683,6 +1683,8 @@ namespace Myshipping.Application } var fileName = string.Empty; + + #region FastReport打印 if (printType == BookingPrintTemplateType.FastReport) { var bs = await GenPrintFile(bookingId, printTemplate, type); @@ -1715,6 +1717,9 @@ namespace Myshipping.Application var fullPath = Path.Combine(serverpath, fileName); await File.WriteAllBytesAsync(fullPath, bs); } + #endregion + + #region Excel模板打印 else if (printType == BookingPrintTemplateType.ExcelTemplate) { var opt = App.GetOptions(); @@ -1767,6 +1772,8 @@ namespace Myshipping.Application var filestream = new FileStream(Path.Combine(fileFullPath, fileName), FileMode.OpenOrCreate, FileAccess.ReadWrite); excelwork.Write(filestream); } + #endregion + //记录打印次数和时间,用于前端动态展示常用的打印类型 var printRecentListKey = $"{PrintRecentListTypeKey}_{printTemplate.CateCode}_{printType}";