From 1da389fe433e26e20bdda252add7871c53372900 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Wed, 4 Jan 2023 17:40:28 +0800
Subject: [PATCH] xml

---
 .../Myshipping.Application.xml                | 101 +++++-------------
 1 file changed, 28 insertions(+), 73 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 1a574dc3..276d1971 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -2391,46 +2391,31 @@
             </summary>
         </member>
         <member name="T:Myshipping.Application.Entity.BookingExcelTemplate">
-            <summary>
-            EXCEl打印模板
-            </summary>
-        </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Name">
-            <summary>
-            模板名称
-            </summary>
-        </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Type">
-            <summary>
-            分类
-            </summary>
-        </member>
-        <member name="T:Myshipping.Application.Entity.BookingExcelTemplateSub">
             <summary>
             订舱状态
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Pid">
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Pid">
             <summary>
             父键
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Field">
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Field">
             <summary>
             字段名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Row">
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Row">
             <summary>
             行
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Column">
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Column">
             <summary>
             列 
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Entity.BookingExcelTemplateSub.Describe">
+        <member name="P:Myshipping.Application.Entity.BookingExcelTemplate.Describe">
             <summary>
             默认内容
             </summary>
@@ -6269,13 +6254,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.PrintFastReport(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)">
@@ -6296,7 +6282,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)">
@@ -6470,6 +6456,12 @@
             <param name="name"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Application.BookingOrderService.GetFieldName">
+            <summary>
+            下拉获取字段名称
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:Myshipping.Application.Service.BookingOrder.Dto.BatchUpdate">
             <summary>
             批量编辑
@@ -7420,21 +7412,6 @@
             人员id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto.Id">
-            <summary>
-            业务id
-            </summary>
-        </member>
-        <member name="P:Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto.Name">
-            <summary>
-            模板名称
-            </summary>
-        </member>
-        <member name="P:Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto.Type">
-            <summary>
-            分类
-            </summary>
-        </member>
         <member name="T:Myshipping.Application.BookingEDIExtDto">
             <summary>
             EDI扩展
@@ -9660,6 +9637,20 @@
             <param name="Ids"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Application.BookingPrintTemplateService.AddOrUpdateExcelTemplate(Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto)">
+            <summary>
+            新增编辑excel模板
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Myshipping.Application.BookingPrintTemplateService.BookingExcelTemplateList(System.Int64)">
+            <summary>
+            获取excel模板详情
+            </summary>
+            <param name="Id">模板ID</param>
+            <returns></returns>
+        </member>
         <member name="T:Myshipping.Application.BookingPrintTemplateInput">
             <summary>
             订舱打印模板输入参数
@@ -9830,42 +9821,6 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Myshipping.Application.BookingTemplateService.GetFieldName">
-            <summary>
-            下拉获取字段名称
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Myshipping.Application.BookingTemplateService.AddOrUpdateExcelTemplate(Myshipping.Application.Service.BookingTemplate.Dto.BookingExcelTemplateDto)">
-            <summary>
-            新增编辑excel模板
-            </summary>
-            <param name="dto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Myshipping.Application.BookingTemplateService.BookingExcelTemplateList(System.String)">
-            <summary>
-            获取excel模板
-            </summary>
-            <param name="Name">模板名称</param>
-            <returns></returns>
-        </member>
-        <member name="M:Myshipping.Application.BookingTemplateService.BookingExcelTemplateDetailList(System.Int64)">
-            <summary>
-            获取excel模板详情
-            </summary>
-            <param name="Id">模板名称</param>
-            <returns></returns>
-        </member>
-        <member name="M:Myshipping.Application.BookingTemplateService.ExportExcel(System.Int64,System.Int64,System.Int64)">
-            <summary>
-            导出excel
-            </summary>
-            <param name="bookingId"></param>
-            <param name="excelTemplateId"></param>
-            <param name="printTemplateId"></param>
-            <returns></returns>
-        </member>
         <member name="T:Myshipping.Application.BookingTemplateInput">
             <summary>
             订舱模板输入参数