Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Entity/BookingEDIExt.cs

@@ -195,5 +195,11 @@ namespace Myshipping.Application.Entity
         /// </summary>
         [Description("辅助字段4")]
         public string ExRemark4 { get; set; }
+
+        /// <summary>
+        /// 第一层包装皮重
+        /// </summary>
+        [Description("第一层包装皮重")]
+        public decimal? KingTareweight { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -3107,6 +3107,9 @@ namespace Myshipping.Application
             primaryModel.cNCM = ediExtModel.CNCM;
             primaryModel.wNCM = ediExtModel.WNCM;
             primaryModel.ORDERREMARK = ediExtModel.OrderRemark;
+
+            primaryModel.KINGTAREWEIGHT = ediExtModel.KingTareweight.HasValue ? ediExtModel.KingTareweight.Value : 0;
+
             //箱信息
             var contaList = _repCtn.AsQueryable().Where(t => t.BILLID == order.Id).ToList();
 

Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs

@@ -161,5 +161,10 @@ namespace Myshipping.Application
         /// 辅助字段4
         /// </summary>
         public string ExRemark4 { get; set; }
+
+        /// <summary>
+        /// 第一层包装皮重
+        /// </summary>
+        public decimal? KingTareweight { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs

@@ -62,8 +62,9 @@ namespace Myshipping.Application
                 .Map(dest => dest.SHIPPERDOORADDR, src => src.SHIPPERDOORADDR)
                 .Map(dest => dest.SCACCODE, src => src.SCACCODE)
                 .Map(dest => dest.ISCONTAINERSOC, src => src.ISCONTAINERSOC)
-                .Map(dest => dest.FREIGHTPAYER, src => src.FREIGHTPAYER);
+                .Map(dest => dest.FREIGHTPAYER, src => src.FREIGHTPAYER)
-
+                .Map(dest => dest.PLACEDELIVERYID, src => src.PLACEDELIVERYID)
+                .Map(dest => dest.PLACEDELIVERY, src => src.PLACEDELIVERY);
 
             config.ForType<BookingCtn, MsOpSeaeCtnEDIBaseModel>()
                 .Map(dest => dest.CTNNUM, src => src.CTNNUM.HasValue? src.CTNNUM.Value:0)