diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 9c6069a9..a0a110f5 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -922,7 +922,7 @@ namespace Myshipping.Application } } await SaveLog(entity, mlist); - if (!string.IsNullOrEmpty(entity.MBLNO) && (entity.MBLNO != mlist.MBLNO||entity.YARDID!=mlist.YARDID||entity.CARRIERID!=mlist.CARRIERID)) + if (!string.IsNullOrEmpty(entity.MBLNO) && (entity.MBLNO != mlist.MBLNO || entity.YARDID != mlist.YARDID || entity.CARRIERID != mlist.CARRIERID)) { //更改提单号 await UpdateMblno(entity); @@ -2156,14 +2156,22 @@ namespace Myshipping.Application var allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "txxp_carrier_list").Select(x => x.Code).ToList(); if (allowCarrier.Contains(order.CARRIERID)) { - var txxpLink = await TxxpLink(input.BookingId); + try + { + var txxpLink = await TxxpLink(input.BookingId); + } + catch { } } //vgm链接 allowCarrier = _cache.GetAllDictData().Result.Where(x => x.TypeCode == "vgm_carrier_list").Select(x => x.Code).ToList(); if (allowCarrier.Contains(order.CARRIERID)) { - await VgmLink(input.BookingId); + try + { + await VgmLink(input.BookingId); + } + catch { } } await SendLetterYard(input.BookingId); diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index fcea781f..394b60df 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -2386,7 +2386,7 @@ namespace Myshipping.Application &&x.IsDeleted==false && x.TenantId == UserManager.TENANT_ID && (x.Voyno != null && x.Voyno != "") - && x.ETD < DateTime.Today.AddDays(20)) //2023年7月19日,根据吴悦蓉反馈,查询3周左右的即可,再远的无效,而且也会产生无效提醒 + && x.ETD < DateTime.Today.AddDays(15)) //2023年7月19日,根据吴悦蓉反馈,查询3周左右的即可,再远的无效,而且也会产生无效提醒;2023年7月25日,改为2周 .Select(x => new { Vessel = x.Vessel,