Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -2155,16 +2155,24 @@ 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))
+            {
+                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))
+            {
+                try
                 {
                     await VgmLink(input.BookingId);
                 }
+                catch { }
+            }
 
             await SendLetterYard(input.BookingId);
             return rtnId;

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,