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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -8056,6 +8056,7 @@ namespace Myshipping.Application
             {
                 await _rep.AsUpdateable(order).IgnoreColumns().ExecuteCommandAsync();
                 await SendBookingOrder(new long[] { Id });
+                if (!string.IsNullOrEmpty(order.VESSEL)&&!string.IsNullOrEmpty(order.VOYNO)) {
                     var orderlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID && x.CARRIERID == order.CARRIERID && x.VESSEL == order.VESSEL && x.VOYNO == order.VOYNO && x.Id != order.Id)
                    .WhereIF(!string.IsNullOrEmpty(order.VOYNOINNER), x => x.VOYNOINNER == order.VOYNOINNER).ToListAsync();
                     foreach (var i in orderlist)
@@ -8067,10 +8068,8 @@ namespace Myshipping.Application
                         await _rep.AsUpdateable(i).IgnoreColumns().ExecuteCommandAsync();
                         await SendBookingOrder(new long[] { i.Id });
                     }
-
                 }
-
+            }
-
             return order;
         }