From 998beaf2c2a107209ab20bbe43bf54dc581e003c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 28 Sep 2023 13:10:23 +0800 Subject: [PATCH] [CI SKIP] --- .../Entities/BQ/BBAC_BA_SERVICE.cs | 29 +++++++++++++++---- .../Entities/BQ/HBPO_BA_SERVICE.cs | 16 ++++++++-- .../Entities/BQ/PUB_BA_SERVICE.cs | 20 +++++++++++-- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 41a811c8..8e4fc7b2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/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 _priceRepository; - + private readonly INormalEfCoreRepository _pdRepository; private readonly INormalEfCoreRepository _relationRepository; private readonly ADJ_SERVICE _adjservice; @@ -46,7 +46,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ INormalEfCoreRepository sRepository, INormalEfCoreRepository mRepository, INormalEfCoreRepository adjRepository, - + INormalEfCoreRepository pdRepository, INormalEfCoreRepository relationRepository, BBAC_CAN_SA_MNG bbacMng, @@ -76,6 +76,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _relationRepository = relationRepository; _priceRepository = priceRepository; _adjservice = adjservice; + _pdRepository = pdRepository; } /// @@ -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"); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs index f5627800..5be99f06 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs +++ b/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 _relationRepository; + private readonly INormalEfCoreRepository _pdRepository; private readonly INormalEfCoreRepository _priceRepository; private readonly ADJ_SERVICE _adjservice; @@ -39,13 +40,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ BaseDomainService baseservice, INormalEfCoreRepository priceRepository, ADJ_SERVICE adjservice, - INormalEfCoreRepository relationRepository + INormalEfCoreRepository relationRepository, + INormalEfCoreRepository pdRepository ) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, wRepository, sRepository, mRepository, adjRepository, bbacMng, hbpoMng, pubMng, invMng, service, baseservice) { _priceRepository = priceRepository; _adjservice = adjservice; - _relationRepository = relationRepository; + _relationRepository = relationRepository; + _pdRepository = pdRepository; } /// /// 发票重开 @@ -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); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index ec2e4791..15b5aa62 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/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 _pricebjRepository; private readonly ADJ_SERVICE _adjservice; private readonly INormalEfCoreRepository _relationRepository; - + private readonly INormalEfCoreRepository _pdRepository; public PUB_BA_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository pubRepository, INormalEfCoreRepository repository, INormalEfCoreRepository wRepository, INormalEfCoreRepository sRepository, INormalEfCoreRepository mRepository, INormalEfCoreRepository adjRepository, BBAC_CAN_SA_MNG bbacMng, HBPO_CAN_SA_MNG hbpoMng, PUB_CAN_SA_MNG pubMng, INV_MNG invMng, TaskJobService service, BaseDomainService baseservice, INormalEfCoreRepository priceRepository, INormalEfCoreRepository pricebjRepository, ADJ_SERVICE adjservice, - INormalEfCoreRepository relationRepository + INormalEfCoreRepository relationRepository, + INormalEfCoreRepository 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; } /// @@ -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(); List ls = new List(); var adjlist = ObjectMapper.Map, List>(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(); List ls = new List(); var adjlist = ObjectMapper.Map, List>(p_list);