From 07b02f1610c50282a80b92054d567a7ff44b50d6 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 28 Feb 2023 11:13:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E8=88=B1EDI=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5=E2=80=9C?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=B1=82=E5=8C=85=E8=A3=85=E7=9A=AE=E9=87=8D?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/Entity/BookingEDIExt.cs | 6 ++++++ .../Service/BookingOrder/BookingOrderService.cs | 3 +++ .../Service/BookingOrder/Dto/BookingEDIMapper.cs | 1 + 3 files changed, 10 insertions(+) diff --git a/Myshipping.Application/Entity/BookingEDIExt.cs b/Myshipping.Application/Entity/BookingEDIExt.cs index 1a681b9d..d440402d 100644 --- a/Myshipping.Application/Entity/BookingEDIExt.cs +++ b/Myshipping.Application/Entity/BookingEDIExt.cs @@ -195,5 +195,11 @@ namespace Myshipping.Application.Entity /// [Description("辅助字段4")] public string ExRemark4 { get; set; } + + /// + /// 第一层包装皮重 + /// + [Description("第一层包装皮重")] + public decimal? KingTareweight { get; set; } } } diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index a66032f1..df550ce4 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/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(); diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs index 14e44484..333f15f0 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs @@ -63,6 +63,7 @@ namespace Myshipping.Application .Map(dest => dest.SCACCODE, src => src.SCACCODE) .Map(dest => dest.ISCONTAINERSOC, src => src.ISCONTAINERSOC) .Map(dest => dest.FREIGHTPAYER, src => src.FREIGHTPAYER); + config.ForType() From ea631a389a887b6367a048a756af7a81dc5c805e Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 28 Feb 2023 11:43:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9EDI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/Dto/BookingEDIExtDto.cs | 5 +++++ .../Service/BookingOrder/Dto/BookingEDIMapper.cs | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs index 45265da0..d3053342 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIExtDto.cs @@ -161,5 +161,10 @@ namespace Myshipping.Application /// 辅助字段4 /// public string ExRemark4 { get; set; } + + /// + /// 第一层包装皮重 + /// + public decimal? KingTareweight { get; set; } } } diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs index 333f15f0..85c34898 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs @@ -62,9 +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() .Map(dest => dest.CTNNUM, src => src.CTNNUM.HasValue? src.CTNNUM.Value:0)