From 41c86f9ebdccbf05228b3520b78238a10dea910c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Sat, 15 Jul 2023 13:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0DomainService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/{ => BQ}/Managers/CAN_SA_MNG.cs | 18 +++++++-------- .../Entities/{ => BQ}/Managers/INV_MNG.cs | 12 +++++----- .../Entities/{ => BQ}/Managers/NOT_SA_MNG.cs | 22 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) rename code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/{ => BQ}/Managers/CAN_SA_MNG.cs (87%) rename code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/{ => BQ}/Managers/INV_MNG.cs (95%) rename code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/{ => BQ}/Managers/NOT_SA_MNG.cs (80%) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs similarity index 87% rename from code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/CAN_SA_MNG.cs rename to code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs index c2dd1f15..62780fd0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/CAN_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs @@ -16,9 +16,9 @@ using Win.Sfs.SettleAccount.Entities.Materials; using Win.Sfs.SettleAccount.MaterialRelationships; using Win.Sfs.Shared.RepositoryBase; -namespace Win.Sfs.SettleAccount.Entities.Managers +namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { - public class CAN_SA_MNG : DomainService + public class CAN_SA_MNG : DomainService where TEntity : SA_CAN_BASE_MAIN where TEntityDetail : SA_CAN_BASE { @@ -30,10 +30,10 @@ namespace Win.Sfs.SettleAccount.Entities.Managers INormalEfCoreRepository detailRepository ) { - _repository= repository; - _detailRepository= detailRepository; + _repository = repository; + _detailRepository = detailRepository; } - public virtual async Task SetState(TEntity p_entiy,SettleBillState state) + public virtual async Task SetState(TEntity p_entiy, SettleBillState state) { switch (p_entiy.State) { @@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.Managers } else { - throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); + throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); } break; case SettleBillState.商务已审核: @@ -77,12 +77,12 @@ namespace Win.Sfs.SettleAccount.Entities.Managers throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); } break; - } + } await _repository.UpdateAsync(p_entiy); return true; } - + } @@ -93,5 +93,5 @@ namespace Win.Sfs.SettleAccount.Entities.Managers - + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs similarity index 95% rename from code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/INV_MNG.cs rename to code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index f07ae541..6fc3d034 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -10,19 +10,19 @@ using Volo.Abp; using Volo.Abp.Domain.Services; using Win.Sfs.Shared.RepositoryBase; -namespace Win.Sfs.SettleAccount.Entities.Managers +namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { - public class INV_MNG:DomainService + public class INV_MNG : DomainService { private readonly INormalEfCoreRepository _repository; private readonly INormalEfCoreRepository _groupRepository; private readonly INormalEfCoreRepository _detailRepository; private readonly INormalEfCoreRepository _notRepository; - + public INV_MNG ( - + INormalEfCoreRepository repository, INormalEfCoreRepository groupRepository, INormalEfCoreRepository detailRepository, @@ -35,7 +35,7 @@ namespace Win.Sfs.SettleAccount.Entities.Managers _groupRepository = groupRepository; _notRepository = notRepository; } - public virtual async Task SetForwardState(INVOICE_GRP p_entiy,InvoiceBillState p_State) + public virtual async Task SetForwardState(INVOICE_GRP p_entiy, InvoiceBillState p_State) { var state = p_State; switch (p_entiy.State) @@ -78,7 +78,7 @@ namespace Win.Sfs.SettleAccount.Entities.Managers public virtual async Task Reject(INVOICE_GRP p_entity) { - + if (p_entity.State == InvoiceBillState.财务已审核 || p_entity.State == InvoiceBillState.已开票 || p_entity.State == InvoiceBillState.商务已审核) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/NOT_SA_MNG.cs similarity index 80% rename from code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/NOT_SA_MNG.cs rename to code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/NOT_SA_MNG.cs index d81d6836..82e78356 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/NOT_SA_MNG.cs @@ -10,7 +10,7 @@ using Win.Sfs.Shared.RepositoryBase; using Win.Sfs.SettleAccount.Bases; using EFCore.BulkExtensions; -namespace Win.Sfs.SettleAccount.Entities.Managers +namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { /// /// 不能結算管理 @@ -18,10 +18,10 @@ namespace Win.Sfs.SettleAccount.Entities.Managers /// /// /// - public class NOT_SA_MNG : DomainService - where TEntity : SA_CAN_BASE_MAIN,new() - where TEntityDetail : SA_CAN_BASE,new() - where TNOTDetail:SA_NOT_BASE + public class NOT_SA_MNG : DomainService + where TEntity : SA_CAN_BASE_MAIN, new() + where TEntityDetail : SA_CAN_BASE, new() + where TNOTDetail : SA_NOT_BASE { private readonly INormalEfCoreRepository _repository; private readonly INormalEfCoreRepository _detailRepository; @@ -37,19 +37,19 @@ namespace Win.Sfs.SettleAccount.Entities.Managers _detailRepository = detailRepository; _notRepository = notRepository; } - public virtual async Task GenerateSettlementOrder(List p_list,Action> p_action=null) + public virtual async Task GenerateSettlementOrder(List p_list, Action> p_action = null) { var billNumber = OrderNumberGenerator.GenerateOrderNumber("N"); - TEntity _entity = new TEntity(); + var _entity = new TEntity(); _entity.BillNum = billNumber; _entity.InvGroupNum = billNumber; - _entity.Version=DateTime.Now.Year+DateTime.Now.Month; - _entity.State =SettleBillState.未结状态; + _entity.Version = DateTime.Now.Year + DateTime.Now.Month; + _entity.State = SettleBillState.未结状态; _entity.SettleBillNum = string.Empty; - List _entityList = new List(); + var _entityList = new List(); foreach (var itm in p_list) { - TEntityDetail _detailEntity = new TEntityDetail(); + var _detailEntity = new TEntityDetail(); { _detailEntity.SettleBillNum = itm.SettleBillNum; _detailEntity.BillNum = billNumber;