From c44db78a811710d5551372e92af2681c8b306015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 19 Sep 2023 11:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bases/BA_SERVICE.cs | 2 +- .../Bases/PD_SERVICE.cs | 38 +++++++++---------- .../Entities/BQ/BBAC_PD_SERVICE.cs | 26 ++----------- .../Entities/BQ/HBPO_PD_SERVICE.cs | 19 +--------- .../Entities/BQ/INVOICE_SERVICE.cs | 16 ++++---- .../Entities/BQ/PUB_PD_SERVICE.cs | 20 +--------- 6 files changed, 34 insertions(+), 87 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index adbcadde..544ae483 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -188,7 +188,7 @@ namespace Win.Sfs.SettleAccount.Bases PRICE = itm.PRICE, Qty = itm.Qty, Amt = itm.Amt, - BussiessType = itm.BussiessType, + Extend1 = itm.Extend1, BeginDate = itm.BeginDate, EndDate = itm.EndDate, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index 0ef02157..3c537c2d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -2,6 +2,7 @@ using DocumentFormat.OpenXml.Bibliography; using DocumentFormat.OpenXml.Drawing.Charts; using DocumentFormat.OpenXml.Office2010.Excel; +using EFCore.BulkExtensions; using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Csv; using Magicodes.ExporterAndImporter.Excel; @@ -19,7 +20,9 @@ using System.Text; using System.Threading.Tasks; using TaskJob.EventArgs; using TaskJob.Services; +using Volo.Abp; using Volo.Abp.Application.Dtos; +using Volo.Abp.Uow; using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.CommonManagers; @@ -28,6 +31,7 @@ using Win.Sfs.SettleAccount.Entities.BQ; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; using Win.Sfs.SettleAccount.Entities.BQ.Syncs; using Win.Sfs.SettleAccount.Entities.BQ.Vmi; +using Win.Sfs.SettleAccount.Entities.TaskJobs; using Win.Sfs.SettleAccount.ExcelImporter; using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.Shared.RepositoryBase; @@ -50,7 +54,7 @@ namespace Win.Sfs.SettleAccount.Bases protected readonly INormalEfCoreRepository _bbacSecRepository; protected readonly INormalEfCoreRepository _hbpoSecRepository; protected readonly INormalEfCoreRepository _pubSecRepository; - + private readonly TaskJobService _service; public PD_SERVICE( INormalEfCoreRepository bbacSecRepository, @@ -61,9 +65,11 @@ namespace Win.Sfs.SettleAccount.Bases ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, - INormalEfCoreRepository detailRepository + INormalEfCoreRepository detailRepository, + TaskJobService service ) : base(excelImportService, snowflakeIdGenerator, commonManager) { + _service = service; _vimservice = vimservice; _repository = repository; _detailRepository = detailRepository; @@ -127,18 +133,17 @@ namespace Win.Sfs.SettleAccount.Bases return _fileName; } [HttpPost] - //[Route("generateinvoice")] + [UnitOfWork(false)] public virtual async Task ApprovalPassed(List p_list) { - - - - - - - return ApplicationConsts.SuccessStr; + return await InvokePD(p_list, _service, false); + } + [HttpPost] + [UnitOfWork(false)] + public virtual async Task RejectAsync(List p_list) + { + return await InvokePD(p_list, _service, true); } - protected async Task InvokePD(List p_list, TaskJobService p_service, bool isback=false) @@ -214,16 +219,7 @@ namespace Win.Sfs.SettleAccount.Bases var dtos = ObjectMapper.Map, List>(entitys); return new PagedResultDto(totalCount, dtos); } - /// - /// 退回 - /// - /// - /// - [HttpPost] - public virtual async Task RejectAsync(List p_list) - { - return ApplicationConsts.SuccessStr; - } + protected virtual async Task GetMainAsync([FromBody] string billNum) { return await _repository.Where(p => p.InvGroupNum == billNum).FirstOrDefaultAsync().ConfigureAwait(false); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs index cea46314..d61b8516 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -31,29 +31,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ BBAC_PD_DETAIL_REQ_DTO, BBAC_PD_DETAIL_EXP_DTO> { - private readonly TaskJobService _service; - public BBAC_PD_SERVICE(INormalEfCoreRepository bbacSecRepository, INormalEfCoreRepository hbpoSecRepository, INormalEfCoreRepository pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, - INormalEfCoreRepository detailRepository, - TaskJobService service - ) : - base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository) - { - _service = service; - } - [UnitOfWork(false)] - public override async Task ApprovalPassed(List p_list) - { - return await InvokePD(p_list, _service, false); - - } - [UnitOfWork(false)] - public override async Task RejectAsync(List p_list) - { - return await InvokePD(p_list, _service, true); - } //[HttpPost] //public virtual async Task RejectAsync(List p_list) //{ @@ -79,6 +59,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ // return _taskid; //} - + public BBAC_PD_SERVICE(INormalEfCoreRepository bbacSecRepository, INormalEfCoreRepository hbpoSecRepository, INormalEfCoreRepository pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, INormalEfCoreRepository detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository, service) + { + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs index a98edfe6..44c215a4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -25,23 +25,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ HBPO_PD_DETAIL, HBPO_PD_DETAIL_DTO, HBPO_PD_REQ_DTO, HBPO_PD_DETAIL_REQ_DTO, HBPO_PD_DETAIL_EXP_DTO> { - private readonly TaskJobService _service; - public HBPO_PD_SERVICE(INormalEfCoreRepository bbacSecRepository, INormalEfCoreRepository hbpoSecRepository, INormalEfCoreRepository pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, INormalEfCoreRepository detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository) + public HBPO_PD_SERVICE(INormalEfCoreRepository bbacSecRepository, INormalEfCoreRepository hbpoSecRepository, INormalEfCoreRepository pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, INormalEfCoreRepository detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository, service) { - _service = service; } - - [UnitOfWork(false)] - public override async Task ApprovalPassed(List p_list) - { - return await InvokePD(p_list, _service, false); - } - [UnitOfWork(false)] - public override async Task RejectAsync(List p_list) - { - return await InvokePD(p_list, _service, true); - } - - } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index e395127a..e6e6a762 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -199,14 +199,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ bj.PartCode = itm.PartCode; bj.PRICE = itm.PRICE; - bj.InvGroupNum = itm.InvGroupNum; - bj.DeliveryNumber= itm.GetProperty("DeliveryNumber", "");//交货号 - bj.InvbillNum = itm.GetProperty("InvoiceNumber", "");//发票号 - bj.VendorCode = itm.GetProperty("VendorCode", "");//供应商代码 - bj.VendorName = itm.GetProperty("VendorName", "");//供应商名称 - bj.PurchaseOrderNumber = itm.GetProperty("PurchaseOrderNumber", "");//采购订单号 - bj.DeliveryIndexNumber = itm.GetProperty("DeliveryIndexNumber", "");//交付索引号 - bj.PartName = itm.GetProperty("PartName", "");//零件名称 + //bj.InvGroupNum = itm.InvGroupNum; + //bj.DeliveryNumber= itm.GetProperty("DeliveryNumber", "");//交货号 + //bj.InvbillNum = itm.GetProperty("InvoiceNumber", "");//发票号 + //bj.VendorCode = itm.GetProperty("VendorCode", "");//供应商代码 + //bj.VendorName = itm.GetProperty("VendorName", "");//供应商名称 + //bj.PurchaseOrderNumber = itm.GetProperty("PurchaseOrderNumber", "");//采购订单号 + //bj.DeliveryIndexNumber = itm.GetProperty("DeliveryIndexNumber", "");//交付索引号 + //bj.PartName = itm.GetProperty("PartName", "");//零件名称 } //var BMap = ObjectMapper.Map, List>(B); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs index c35aea7c..1244d5d0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -26,24 +26,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ PUB_PD_DETAIL, PUB_PD_DETAIL_DTO, PUB_PD_REQ_DTO, PUB_PD_DETAIL_REQ_DTO, PUB_PD_DETAIL_EXP_DTO> { - private readonly TaskJobService _service; - public PUB_PD_SERVICE(INormalEfCoreRepository bbacSecRepository, INormalEfCoreRepository hbpoSecRepository, INormalEfCoreRepository pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, INormalEfCoreRepository detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository) + public PUB_PD_SERVICE(INormalEfCoreRepository bbacSecRepository, INormalEfCoreRepository hbpoSecRepository, INormalEfCoreRepository pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository repository, VmiAppService vimservice, INormalEfCoreRepository detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository, service) { - _service = service; - } - [UnitOfWork(false)] - public override async Task ApprovalPassed(List p_list) - { - return await InvokePD(p_list, _service, false); - } - [UnitOfWork(false)] - public override async Task RejectAsync(List p_list) - { - return await InvokePD(p_list, _service, true); - } - - - } } }