From 22c06fbc51c48c71b3c33655c7aa1ed21f1b8abf Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Fri, 30 Jun 2023 15:27:18 +0800
Subject: [PATCH] 1

---
 .../BookingOrder/BookingOrderService.cs       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 6be622f3..3b1c63a0 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -969,27 +969,38 @@ namespace Myshipping.Application
                 var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}");
                 input.CNTRTOTAL = string.Join(" / ", groupList);
             }
+            
             if (!string.IsNullOrWhiteSpace(input.MBLNO))
             {
-                var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.MBLNO == input.MBLNO && x.TenantId == UserManager.TENANT_ID && x.HBLNO == input.HBLNO && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync();
+                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)
                 {
-                    throw Oops.Bah("当前提单号已存在,请勿重复录入!");
+                    throw Oops.Bah("当前主提单号已存在,请勿重复录入!");
                 }
             }
+            if (!string.IsNullOrWhiteSpace(input.HBLNO)&& !string.IsNullOrWhiteSpace(input.MBLNO))
+            {
+                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)
+                {
+                    throw Oops.Bah("当前分提单号已存在,请勿重复录入!");
+                }
+            }
+
             //陈冠宇提订舱编号不允许重复
             if (!string.IsNullOrWhiteSpace(input.CUSTNO))
             {
-                var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.CUSTNO == input.CUSTNO && x.TenantId == UserManager.TENANT_ID && x.HBLNO == input.HBLNO && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync();
+                var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.CUSTNO == input.CUSTNO && x.TenantId == UserManager.TENANT_ID  && x.ParentId == 0&& x.Id != input.Id).FirstAsync();
                 if (et != null)
                 {
                     throw Oops.Bah("当前订舱编号已存在,请勿重复录入!");
                 }
             }
+
             //孙晓飞提PONO不允许重复
             if (!string.IsNullOrWhiteSpace(input.PONO))
             {
-                var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.PONO == input.PONO && x.TenantId == UserManager.TENANT_ID && x.HBLNO == input.HBLNO && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync();
+                var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.PONO == input.PONO && x.TenantId == UserManager.TENANT_ID  && x.ParentId == 0 && x.Id != input.Id).FirstAsync();
                 if (et != null)
                 {
                     throw Oops.Bah("当前PONO已存在,请勿重复录入!");