From 6f9e6f9bace9783797408e7e28037d1d5a25b79c Mon Sep 17 00:00:00 2001 From: wanghaomei Date: Tue, 10 Jan 2023 09:40:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=89=93=E5=8D=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 5 +++-- Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 57a8447c..77b4060d 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1671,11 +1671,12 @@ namespace Myshipping.Application /// /// 订舱Id /// 打印模板ID + /// 分类代码(使用字典【booking_template_category】中的代码) /// 类型,1:pdf、2:xlsx、3:docx /// 打印类型,10:FastReport、20:Excel模板 /// [HttpGet("/BookingOrder/PrintOrder")] - public async Task PrintOrder(long bookingId, long templateId, int type = 1, BookingPrintTemplateType printType = BookingPrintTemplateType.FastReport) + public async Task PrintOrder(long bookingId, long templateId, string cateCode, int type = 1, BookingPrintTemplateType printType = BookingPrintTemplateType.FastReport) { var printTemplate = await _repPrintTemplate.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == templateId); if (printTemplate == null) @@ -1777,7 +1778,7 @@ namespace Myshipping.Application //记录打印次数和时间,用于前端动态展示常用的打印类型 - var printRecentListKey = $"{PrintRecentListTypeKey}_{printTemplate.CateCode}_{printType}"; + var printRecentListKey = $"{PrintRecentListTypeKey}_{cateCode}_{printType}"; var usrCfg = _repUserConfig.AsQueryable().First(x => x.CreatedUserId == UserManager.UserId && x.Type == printRecentListKey); if (usrCfg == null) { diff --git a/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs b/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs index 3485fbbe..88a3a9bd 100644 --- a/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs +++ b/Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs @@ -51,7 +51,7 @@ namespace Myshipping.Core.Service /// /// /// - [HttpPost("/DjyApiAuth/sava")] + [HttpPost("/DjyApiAuth/save")] public async Task Save(SaveDjyApiAuthInput input) { DjyApiAuth entity = null;