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 /// public string Remark { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 修改时间 - /// - public DateTime? ModifyTime { get; set; } - - /// - /// 创建人 - /// - public string CreateUser { get; set; } - - /// - /// 修改人 - /// - 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 @@ 备注 - - - 创建时间 - - - - - 修改时间 - - - - - 创建人 - - - - - 修改人 - - 代码 - - - 名称 - - 模块