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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -810,7 +810,7 @@ namespace Myshipping.Application
                     CreatedUserId = UserManager.UserId,
                     CreatedUserName = UserManager.Name
                 });
-                if (!string.IsNullOrEmpty(entity.MBLNO))
+                if (!string.IsNullOrEmpty(entity.MBLNO)&& !string.IsNullOrEmpty(entity.YARDID))
                 {
                     await UpdateMblno(entity);
                 }
@@ -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) && !string.IsNullOrEmpty(entity.YARDID) && (entity.MBLNO != mlist.MBLNO || entity.YARDID != mlist.YARDID || entity.CARRIERID != mlist.CARRIERID))
                 {
                     //更改提单号
                     await UpdateMblno(entity);