From d725206e10ef1095df7b0fb236de6398b569a30e Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Thu, 5 Jan 2023 14:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Myshipping.Application.xml     | 11 ++++++-----
 .../Service/BookingOrder/BookingOrderService.cs       |  8 ++++----
 .../Dto/BookingPrintTemplateInput.cs                  |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index f6de0a57..bd1db98c 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -6249,13 +6249,14 @@
             <param name="fileName">文件名</param>
             <returns></returns>
         </member>
-        <member name="M:Myshipping.Application.BookingOrderService.PrintFastReport(System.Int64,System.Int64,System.Int32)">
+        <member name="M:Myshipping.Application.BookingOrderService.PrintOrder(System.Int64,System.Int64,System.Int32,Myshipping.Application.BookingPrintTemplateType)">
             <summary>
-            FastReport打印（返回文件名）
+            订舱打印（返回文件名）
             </summary>
             <param name="bookingId">订舱Id</param>
             <param name="templateId">打印模板ID</param>
             <param name="type">类型，1：pdf、2：xlsx、3：docx</param>
+            <param name="printType">打印类型，10：FastReport、20：Excel模板</param>
             <returns></returns>
         </member>
         <member name="M:Myshipping.Application.BookingOrderService.ViewPrintPdf(System.String)">
@@ -6276,7 +6277,7 @@
             获取订舱打印模板列表（带有当前用户打印历史排序）
             </summary>
             <param name="cateCode">分类代码（使用字典【booking_template_category】中的代码）</param>
-            <param name="printType">打印分类</param>
+            <param name="printType">打印分类，10：FastReport、20：Excel模板</param>
             <returns></returns>
         </member>
         <member name="M:Myshipping.Application.BookingOrderService.SendXHZ(System.Int64)">
@@ -9747,12 +9748,12 @@
         </member>
         <member name="P:Myshipping.Application.QueryBookingPrintTemplateInput.IsMain">
             <summary>
-            主单
+            主单（准备作废）
             </summary>
         </member>
         <member name="P:Myshipping.Application.QueryBookingPrintTemplateInput.IsSub">
             <summary>
-            分单
+            分单（准备作废）
             </summary>
         </member>
         <member name="P:Myshipping.Application.QueryBookingPrintTemplateInput.DisplayName">
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index b5a82175..162840db 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -1657,15 +1657,15 @@ namespace Myshipping.Application
         }
 
         /// <summary>
-        /// FastReport打印（返回文件名）
+        /// 订舱打印（返回文件名）
         /// </summary>
         /// <param name="bookingId">订舱Id</param>
         /// <param name="templateId">打印模板ID</param>
         /// <param name="type">类型，1：pdf、2：xlsx、3：docx</param>
         /// <param name="printType">打印类型，10：FastReport、20：Excel模板</param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/PrintFastReport")]
-        public async Task<string> PrintFastReport(long bookingId, long templateId, int type = 1, BookingPrintTemplateType printType = BookingPrintTemplateType.FastReport)
+        [HttpGet("/BookingOrder/PrintOrder")]
+        public async Task<string> PrintOrder(long bookingId, long templateId, int type = 1, BookingPrintTemplateType printType = BookingPrintTemplateType.FastReport)
         {
             var printTemplate = await _repPrintTemplate.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == templateId);
             if (printTemplate == null)
@@ -1953,7 +1953,7 @@ namespace Myshipping.Application
         }
 
         /// <summary>
-        /// 获取样单pdf
+        /// 获取样单pdf（准备作废，后期使用打印相关api）
         /// </summary>
         /// <param name="bookingId"></param>
         /// <returns></returns>
diff --git a/Myshipping.Application/Service/BookingPrintTemplate/Dto/BookingPrintTemplateInput.cs b/Myshipping.Application/Service/BookingPrintTemplate/Dto/BookingPrintTemplateInput.cs
index a73d4378..bb0be0b9 100644
--- a/Myshipping.Application/Service/BookingPrintTemplate/Dto/BookingPrintTemplateInput.cs
+++ b/Myshipping.Application/Service/BookingPrintTemplate/Dto/BookingPrintTemplateInput.cs
@@ -124,11 +124,11 @@ namespace Myshipping.Application
         public string TenantName { get; set; }
 
         /// <summary>
-        /// 主单
+        /// 主单（准备作废）
         /// </summary>
         public bool? IsMain { get; set; }
         /// <summary>
-        /// 分单
+        /// 分单（准备作废）
         /// </summary>
         public bool? IsSub { get; set; }