[CI SKIP]

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs

@@ -33,7 +33,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     {
 
         private readonly INormalEfCoreRepository<PriceList, Guid> _priceRepository;
-
+        private readonly INormalEfCoreRepository<BBAC_PD, Guid> _pdRepository;
         private readonly INormalEfCoreRepository<MaterialRelationship, Guid> _relationRepository;
 
         private readonly ADJ_SERVICE _adjservice;
@@ -46,7 +46,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository,
             INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository,
             INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> adjRepository,
-
+            INormalEfCoreRepository<BBAC_PD, Guid> pdRepository,
             INormalEfCoreRepository<MaterialRelationship, Guid> relationRepository,
 
             BBAC_CAN_SA_MNG bbacMng,
@@ -76,6 +76,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             _relationRepository = relationRepository;
             _priceRepository = priceRepository;
             _adjservice = adjservice;
+            _pdRepository = pdRepository;
         }
 
         /// <summary>
@@ -221,6 +222,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
+
+           
+
+
             var version = int.Parse(DateTime.Now.ToString("yyyymm"));
             var inv = await GetInvoiceGroupByInvBillNum(invbillnum).ConfigureAwait(false);
             var settle = await _bbacMng.GetMainAsync(inv.InvGroupNum).ConfigureAwait(false);
@@ -358,6 +363,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
+            var count = _pdRepository.Count(p => p.BillNum == invbillnum);
+            if (count > 0)
+            {
+                throw new UserFriendlyException($"单号{invbillnum}在待扣减单里已存在,请在待扣减单退回", "400");
+            }
             //var mappingList = await GetMapGroupAsync(invbillnum);//发票对应结算分组
             //if (mappingList != null && mappingList.Count() > 0)
             //{
@@ -381,10 +391,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             {
                 throw new UserFriendlyException($"发票只有在财务已审核、客户已收票、已扣减、已提交QAD状态下可以报废!", "400");
             }
-
-
-
-
             var settle = await _bbacMng.GetMainAsync(inv.InvGroupNum).ConfigureAwait(false);
 
             if (settle == null)
@@ -517,6 +523,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
+
+            var count = _pdRepository.Count(p => p.BillNum == invbillnum);
+            if (count > 0)
+            {
+                throw new UserFriendlyException($"单号{invbillnum}在待扣减单里已存在,请在待扣减单退回", "400");
+            }
+
+
             //var mappingList = await GetMapGroupAsync(invbillnum);//发票对应结算分组
             //if (mappingList != null && mappingList.Count() > 0)
             //{
@@ -524,6 +538,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             //var gList = mappingList.Select(p => p.SettleGroupNum).ToList();//获取发票所有结算分组
             var inv = await GetInvoiceGroupByInvBillNum(invbillnum).ConfigureAwait(false);
 
+            
+
+
             if (inv == null)
             {
                 throw new UserFriendlyException($"无原发票记录!", "400");

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs

@@ -29,6 +29,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     public class HBPO_BA_SERVICE : BA_SERVICE
     {
         private readonly INormalEfCoreRepository<MaterialRelationship, Guid> _relationRepository;
+        private readonly INormalEfCoreRepository<HBPO_PD, Guid> _pdRepository;
         private readonly INormalEfCoreRepository<PriceList, Guid> _priceRepository;
         private readonly ADJ_SERVICE _adjservice;
 
@@ -39,13 +40,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             BaseDomainService baseservice,
             INormalEfCoreRepository<PriceList, Guid> priceRepository,
             ADJ_SERVICE adjservice,
-             INormalEfCoreRepository<MaterialRelationship, Guid> relationRepository
+             INormalEfCoreRepository<MaterialRelationship, Guid> relationRepository,
+             INormalEfCoreRepository<HBPO_PD, Guid> pdRepository
             )
             : base(excelImportService, snowflakeIdGenerator, commonManager, repository, wRepository, sRepository, mRepository, adjRepository, bbacMng, hbpoMng, pubMng, invMng, service, baseservice)
         {
             _priceRepository = priceRepository;
             _adjservice = adjservice;
             _relationRepository = relationRepository;
+            _pdRepository = pdRepository;
         }
         /// <summary>
         /// 发票重开
@@ -323,6 +326,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
+
+            var count = _pdRepository.Count(p => p.BillNum == invbillnum);
+            if (count > 0)
+            {
+                throw new UserFriendlyException($"单号{invbillnum}在待扣减单里已存在,请在待扣减单退回", "400");
+            }
+
+
+
             var version = int.Parse(DateTime.Now.ToString("yyyymm"));
             var inv = await GetInvoiceGroupByInvBillNum(invbillnum).ConfigureAwait(false);
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs

@@ -32,14 +32,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         private readonly INormalEfCoreRepository<PriceListBJ, Guid> _pricebjRepository;
         private readonly ADJ_SERVICE _adjservice;
         private readonly INormalEfCoreRepository<MaterialRelationship, Guid> _relationRepository;
-
+        private readonly INormalEfCoreRepository<PUB_PD, Guid> _pdRepository;
         public PUB_BA_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> pubRepository, INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository, INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, INormalEfCoreRepository<PUB_ADJ_DETAIL, Guid> adjRepository, BBAC_CAN_SA_MNG bbacMng, HBPO_CAN_SA_MNG hbpoMng, PUB_CAN_SA_MNG pubMng, INV_MNG invMng,
             TaskJobService service,
             BaseDomainService baseservice,
             INormalEfCoreRepository<PriceList, Guid> priceRepository,
             INormalEfCoreRepository<PriceListBJ, Guid> pricebjRepository,
             ADJ_SERVICE adjservice,
-            INormalEfCoreRepository<MaterialRelationship, Guid> relationRepository
+            INormalEfCoreRepository<MaterialRelationship, Guid> relationRepository,
+            INormalEfCoreRepository<PUB_PD, Guid> pdRepository
 
             ) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, wRepository, sRepository, mRepository, adjRepository, bbacMng, hbpoMng, pubMng, invMng, service, baseservice)
         {
@@ -47,6 +48,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             _pricebjRepository = pricebjRepository;
             _adjservice = adjservice;
             _relationRepository = relationRepository;
+            _pdRepository = pdRepository;
         }
 
         /// <summary>
@@ -336,6 +338,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
+            var count = _pdRepository.Count(p => p.BillNum == invbillnum);
+            if (count > 0)
+            {
+                throw new UserFriendlyException($"单号{invbillnum}在待扣减单里已存在,请在待扣减单退回", "400");
+            }
+
+
             var invBilllist = new List<INVOICE_REPEAT_DTO>();
             List<INVOICE_WAIT_DETAIL_DTO> ls = new List<INVOICE_WAIT_DETAIL_DTO>();
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
@@ -531,6 +540,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
+
+            var count = _pdRepository.Count(p => p.BillNum == invbillnum);
+            if (count > 0)
+            {
+                throw new UserFriendlyException($"单号{invbillnum}在待扣减单里已存在,请在待扣减单退回", "400");
+            }
+
             var invBilllist = new List<INVOICE_WAIT_DETAIL_DTO>();
             List<INVOICE_WAIT_DETAIL_DTO> ls = new List<INVOICE_WAIT_DETAIL_DTO>();
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);