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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -970,7 +970,7 @@ namespace Myshipping.Application
                 input.CNTRTOTAL = string.Join(" / ", groupList);
             }
             
-            if (!string.IsNullOrWhiteSpace(input.MBLNO))
+            if (!string.IsNullOrWhiteSpace(input.MBLNO)&& input.ParentId==0)
             {
                 var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.MBLNO == input.MBLNO && x.TenantId == UserManager.TENANT_ID && x.ParentId == 0 && x.Id != input.Id).FirstAsync();
                 if (et != null)
@@ -978,7 +978,7 @@ namespace Myshipping.Application
                     throw Oops.Bah("当前主提单号已存在,请勿重复录入!");
                 }
             }
-            if (!string.IsNullOrWhiteSpace(input.HBLNO)&& !string.IsNullOrWhiteSpace(input.MBLNO))
+            if (!string.IsNullOrWhiteSpace(input.HBLNO)&& !string.IsNullOrWhiteSpace(input.MBLNO) && input.ParentId != 0)
             {
                 var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false&&x.MBLNO == input.MBLNO && x.HBLNO == input.HBLNO && x.TenantId == UserManager.TENANT_ID && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync();
                 if (et != null)