diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 1823f0af..de1df513 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -3048,7 +3048,7 @@ namespace Myshipping.Application var primaryModel = order.Adapt(); //起运港是CNTAO并且船公司是太平需要判断场站EDI - if (order.PORTLOADID == "CNTAO" && ediRouteEnum == EDIRouteEnum.PIL) + if ((order.PORTLOADID == "CNTAO" && ediRouteEnum == EDIRouteEnum.PIL) || ediRouteEnum == EDIRouteEnum.WY) { //场站 var ediYardList = _cache.GetAllMappingYard().GetAwaiter().GetResult() @@ -3366,10 +3366,20 @@ namespace Myshipping.Application CancellationTokenSource cts = new CancellationTokenSource(); + string host = string.Empty; + string port = string.Empty; + + if(ediCfg.SERVERIP.IndexOf(":")>= 0) + { + host = ediCfg.SERVERIP.Split(new char[] { ':'}).FirstOrDefault().Trim(); + port = ediCfg.SERVERIP.Split(new char[] { ':' }).Last()?.Trim(); + } + //后续发送 var ftpPostObj = new { - host = ediCfg.SERVERIP, + host = host, + port = port, username = ediCfg.USERNAME, pwd = ediCfg.PASSWORD, path = ediCfg.FOLDERNAME