From 996c97938290f83b37d8a7a82844cd990a99c97b Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Fri, 11 Nov 2022 16:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=AE=B1=E5=B0=8F=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       |  6 ++---
 Myshipping.Core/Entity/CommonDB/CodeYard.cs   | 21 ----------------
 Myshipping.Core/Myshipping.Core.xml           | 25 -------------------
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index e8418844..fb5bfc11 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -873,10 +873,10 @@ namespace Myshipping.Application
             {
                 SystemCode = "djy_hechuan",
                 CarrierCode = order.CARRIERID,
-                billOrderId = order.Id,
+                billOrderId = order.Id.ToString(),
                 sendOrderCode = order.MBLNO,
                 userId = UserManager.DjyUserId,
-                customerId = order.CUSTOMERID,
+                customerId = order.CUSTOMERID.ToString(),
                 // userName = currUser.CODENAME,
                 //userPassword = currUser.PASSWORD,
                 operatorName = UserManager.Name,
@@ -891,7 +891,7 @@ namespace Myshipping.Application
                 {
                     return new
                     {
-                        boxType = ctnMapping.First(x => x.Code == c.CTNCODE),
+                        boxType = ctnMapping.First(x => x.Code == c.CTNCODE).MapCode,
                         boxCount = c.CTNNUM.Value
                     };
                 }),
diff --git a/Myshipping.Core/Entity/CommonDB/CodeYard.cs b/Myshipping.Core/Entity/CommonDB/CodeYard.cs
index c82c5547..059fe7fb 100644
--- a/Myshipping.Core/Entity/CommonDB/CodeYard.cs
+++ b/Myshipping.Core/Entity/CommonDB/CodeYard.cs
@@ -32,27 +32,6 @@ namespace Myshipping.Core.Entity
         /// </summary>
         public string Remark { get; set; }
 
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? ModifyTime { get; set; }
-
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public string CreateUser { get; set; }
-
-        /// <summary>
-        /// 修改人
-        /// </summary>
-        public string ModifyUser { get; set; }
-
-
     }
 
 
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index b916bb80..d121ee34 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -1242,36 +1242,11 @@
             备注
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.CreateTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.ModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.CreateUser">
-            <summary>
-            创建人
-            </summary>
-        </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.ModifyUser">
-            <summary>
-            修改人
-            </summary>
-        </member>
         <member name="P:Myshipping.Core.Entity.MappingYard.Code">
             <summary>
             代码
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Entity.MappingYard.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
         <member name="P:Myshipping.Core.Entity.MappingYard.Module">
             <summary>
             模块