From 09070ebafbe8af19b64958a04b39f932a4ae9c07 Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 2 Mar 2022 10:14:54 +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 --- .gitignore | 4 ++ .../SettleAccounts/SettleAccountAppService.cs | 6 +-- .../ReportServices/ReportMakeService.cs | 23 ++++++++++ .../Report/FisUpdateStateDapperRepository.cs | 43 +++++++++++++++++++ .../Services/Report/FisUpdateExportService.cs | 37 ++++++++++++++++ .../SettleAccountImportService.cs | 10 ++--- .../SettleAccountJobModule.cs | 4 ++ 7 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/FisUpdateStateDapperRepository.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisUpdateExportService.cs diff --git a/.gitignore b/.gitignore index 4fdf4d4c..04ba0ad0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ /*.rar +/src/Shared +/.vs/Win.Sfs.SmartSettlementSystem.PG/v17/.suo +/src/.vs/SettleAccount/v17/.suo +/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220226.txt diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs index 547b9a41..68c0790f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs @@ -300,6 +300,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _taskid = await _service.ImportEnqueueAsync(files, "结算数据", CurrentUser, typeof(SettleAccountImportService), customConditionList, (rs) => { + }); @@ -700,13 +701,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts { var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, input.SkipCount, true); - var totalCount = await GetCountAsync(input); var dtos = ObjectMapper.Map, List>(entities); - - - - return new PagedResultDto(totalCount, dtos); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index dce65dea..30511034 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -933,6 +933,29 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices + [HttpPost] + [Route("FisUpdateExportService")] + [DisableRequestSizeLimit] + public async Task FisUpdateExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + var _taskid = await _service.ExportEnqueueAsync("Fis发货数据更新状态", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(FisUpdateExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + + + + + + diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/FisUpdateStateDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/FisUpdateStateDapperRepository.cs new file mode 100644 index 00000000..3d5ddd2e --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/FisUpdateStateDapperRepository.cs @@ -0,0 +1,43 @@ +using Dapper; +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories.Dapper; +using Volo.Abp.EntityFrameworkCore; +using Win.Sfs.SettleAccount.Entities; +using Win.Sfs.SettleAccount.Entities.Materials; +using Win.Sfs.SettleAccount.Entities.Prices; +using Win.Sfs.SettleAccount.Reports; + +namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report +{ + + + + + /// + /// 主数据Dapper表 + /// + public class FisUpdateDapperRepository : DapperRepository, ITransientDependency + { + public FisUpdateDapperRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + + } + + public virtual void UpdateFisSettle() + { + + DbConnection.Execute("EXEC sp_settle_fis_update", null, null, 1200, null); + + } + + + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisUpdateExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisUpdateExportService.cs new file mode 100644 index 00000000..84282a5f --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisUpdateExportService.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace SettleAccount.Job.Services.Report +{ + public class FisUpdateExportService : ITransientDependency, IExportJob + { + private readonly FisUpdateDapperRepository _dapperRepository; + + + public FisUpdateExportService( + + FisUpdateDapperRepository dapperRepository + //HQHSettledDetailDapperRepository dapperRepository, + + //OutputService outputService, + //InputService inputService + //, IBlobContainer fileContainer + ) + { + _dapperRepository = dapperRepository; + } + + public string ExportFile(Guid id, List exportName, List property) + { + _dapperRepository.UpdateFisSettle(); + return id.ToString(); + } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/SettleAccount/SettleAccountImportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/SettleAccount/SettleAccountImportService.cs index 003cd10f..6c4d0bc1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/SettleAccount/SettleAccountImportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/SettleAccount/SettleAccountImportService.cs @@ -50,9 +50,7 @@ namespace TaskJob.Services var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value; var year = customConditions.Where(p => p.Name == "Year").FirstOrDefault().Value; var period = customConditions.Where(p => p.Name == "Period").FirstOrDefault().Value; - var factory = customConditions.Where(p => p.Name == "Factory").FirstOrDefault().Value; - //_versionRepository.Delete(version); - //_repository.Delete(version); + var factory = customConditions.Where(p => p.Name == "Factory").FirstOrDefault().Value; List _setls = new List(); var _id = Guid.NewGuid(); foreach (var itm in fileName) @@ -92,9 +90,9 @@ namespace TaskJob.Services _setls = _setls.GroupBy(p => new { p.ChassisNumber, p.MaterialCode, p.KENNCode }).Select(p => p.FirstOrDefault()).ToList(); _repository.Insert(_setls); _versionRepository.Insert(_id, version, customerCode, customerCode); - _repository.GetDbContext().Database.ExecuteSqlRaw( - "EXEC sp_settle_fis_update" - ); + //_repository.GetDbContext().Database.ExecuteSqlRaw( + // "EXEC sp_settle_fis_update" + // ); return id.ToString(); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs index 2c8851a7..ccb17879 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs @@ -205,6 +205,10 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } + if (key.Equals(typeof(FisUpdateExportService).FullName)) + { + return implementationFactory.GetService(); + } else { throw new ArgumentException($"Not Support key:{key}");