From e9262bf23e28663750b52d148935de9531634b57 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Tue, 25 Jul 2023 11:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A6=82=E6=9E=9C=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=97=B6=EF=BC=8C=E7=94=9F=E6=88=90=E5=B0=8F=E7=A5=A8?=
 =?UTF-8?q?=E6=88=96VGM=E9=93=BE=E6=8E=A5=E5=A4=B1=E8=B4=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/BookingOrder/BookingOrderService.cs    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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);