From 10124bde644708f25eb73ac0d0eac7897ae223c9 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 21 Mar 2023 11:42:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9EDI=20=E5=8E=BB=E6=8E=89=20PI?= =?UTF-8?q?L=E5=85=B3=E4=BA=8E=E5=9C=BA=E7=AB=99EDI=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/EDI/PILEdiHelper.cs | 11 ++++++----- .../Service/BookingOrder/BookingOrderService.cs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Myshipping.Application/EDI/PILEdiHelper.cs b/Myshipping.Application/EDI/PILEdiHelper.cs index 16add742..548bf5de 100644 --- a/Myshipping.Application/EDI/PILEdiHelper.cs +++ b/Myshipping.Application/EDI/PILEdiHelper.cs @@ -385,11 +385,12 @@ namespace Myshipping.Application.EDI.PIL if (string.IsNullOrEmpty(bill.ORDERNO)) { error = error + "|订舱单号不能为空"; } - if (bill.PORTLOADID == "CNTAO") - { - if (string.IsNullOrEmpty(bill.YARD) || string.IsNullOrEmpty(bill.YARDEDICODE)) - { error = error + "|场站和场站EDI代码不能为空"; } - } + //2023-03-21 跟韩工确认PIL不需要判断场站EDI去掉验证 + //if (bill.PORTLOADID == "CNTAO") + //{ + // if (string.IsNullOrEmpty(bill.YARD) || string.IsNullOrEmpty(bill.YARDEDICODE)) + // { error = error + "|场站和场站EDI代码不能为空"; } + //} if (string.IsNullOrEmpty(bill.MBLNO)) { error = error + "|主提单号不能为空"; } diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 8b7a27ff..07e34dc1 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -3532,7 +3532,7 @@ namespace Myshipping.Application } //起运港是CNTAO并且船公司是太平需要判断场站EDI - if ((order.PORTLOADID == "CNTAO" && ediRouteEnum == EDIRouteEnum.PIL) || ediRouteEnum == EDIRouteEnum.WY) + if (ediRouteEnum == EDIRouteEnum.WY) { //场站 var ediYardList = _cache.GetAllMappingYard().GetAwaiter().GetResult()