From ca0d8bbc67478a0d715a7ecb7543989545c6dd11 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Tue, 10 Jan 2023 14:57:47 +0800
Subject: [PATCH] ATD

---
 Myshipping.Application/Myshipping.Application.xml         | 3 ++-
 .../Service/BookingOrder/BookingOrderService.cs           | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index df53b3f7..392e3151 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -6356,12 +6356,13 @@
             <param name="fileName">文件名</param>
             <returns></returns>
         </member>
-        <member name="M:Myshipping.Application.BookingOrderService.PrintOrder(System.Int64,System.Int64,System.Int32,Myshipping.Application.BookingPrintTemplateType)">
+        <member name="M:Myshipping.Application.BookingOrderService.PrintOrder(System.Int64,System.Int64,System.String,System.Int32,Myshipping.Application.BookingPrintTemplateType)">
             <summary>
             订舱打印（返回文件名）
             </summary>
             <param name="bookingId">订舱Id</param>
             <param name="templateId">打印模板ID</param>
+            <param name="cateCode">分类代码（使用字典【booking_template_category】中的代码）</param>
             <param name="type">类型，1：pdf、2：xlsx、3：docx</param>
             <param name="printType">打印类型，10：FastReport、20：Excel模板</param>
             <returns></returns>
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index d6d25417..716e376b 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -1165,8 +1165,8 @@ namespace Myshipping.Application
                             BookingId = item.BookingId,
                             TenantId = o.TenantId,
                             CreatedTime = DateTime.Now,
-                            CreatedUserId = UserManager.UserId,
-                            CreatedUserName = UserManager.Name
+                            CreatedUserId = o.CreatedUserId,
+                            CreatedUserName = "系统管理员"
                         });
                         await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
                         {
@@ -1192,8 +1192,8 @@ namespace Myshipping.Application
                                     BookingId = it.Id,
                                     TenantId = it.TenantId,
                                     CreatedTime = DateTime.Now,
-                                    CreatedUserId = UserManager.UserId,
-                                    CreatedUserName = UserManager.Name
+                                    CreatedUserId = o.CreatedUserId,
+                                    CreatedUserName = "系统管理员"
                                 });
                                 await _bookinglogdetail.InsertReturnSnowflakeIdAsync(new BookingLogDetail
                                 {