diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 48be300a..7d002542 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1618,20 +1618,21 @@ namespace Myshipping.Application } - return t; - } - List tslist = new List(); - tslist.Add((long)input.BookingId); - var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault(); - if (!string.IsNullOrEmpty(itemcode)) - { - if (itemcode == "true") - await SendBookingOrder(tslist.ToArray()); - _logger.LogInformation(input.BookingId + "货物状态推送成功!"); + + + List tslist = new List(); + tslist.Add((long)input.BookingId); + var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault(); + if (!string.IsNullOrEmpty(itemcode)) + { + if (itemcode == "true") + await SendBookingOrder(tslist.ToArray()); + _logger.LogInformation(input.BookingId + "货物状态推送成功!"); + } + return t; } return null; - } @@ -2705,7 +2706,7 @@ namespace Myshipping.Application } } - if (name.Split('.')[0].ToLower() == "order" && name.Split('.')[1].ToLower() == "_pkgs" && _name== "pkgs") + if (name.Split('.')[0].ToLower() == "order" && name.Split('.')[1].ToLower() == "_pkgs" && _name == "pkgs") { ICell cell = row.GetCell(_cellNum - 1); @@ -4292,7 +4293,7 @@ namespace Myshipping.Application //这里除了TSL,订舱编号默认都对应到业务编号(订舱保存时自动生成) if (ediRouteEnum == EDIRouteEnum.TSL) { - if(string.IsNullOrWhiteSpace(order.CUSTNO)) + if (string.IsNullOrWhiteSpace(order.CUSTNO)) throw Oops.Bah($"船公司是{order.CARRIERID} 订舱编号不能为空"); primaryModel.ORDERNO = order.CUSTNO; @@ -4301,7 +4302,7 @@ namespace Myshipping.Application { primaryModel.ORDERNO = order.BOOKINGNO; } - + var curBasePkgs = basePkgsList.FirstOrDefault(p => p.Name.Equals(order.KINDPKGS, StringComparison.OrdinalIgnoreCase));