From e1792347edf0a1e8779fd8c2bf8ee104046f08c8 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 11 Mar 2022 11:01:24 +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 --- .../Entities/Wms/WmsDetailReportDto.cs | 2 ++ .../Entities/WMS/WmsDetailUnInterface.cs | 13 +++++++++--- .../Entities/WMS/WmsUnInterface.cs | 7 ++----- .../SettleAccount.Application.xml | 21 +++++++++++++++++++ .../InvoiceSettledDiffs/InvoiceSettledDiff.cs | 4 ++++ ...nvoiceSettledDetailDiffDapperRepository.cs | 3 ++- 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs index 1a7bc8b5..927f8724 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs @@ -10,6 +10,8 @@ namespace Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput { public class WmsRequestDetailReportDto: RequestDtoBase { + [Display(Name = "版本")] + public string Version { set; get; } [Display(Name = "行号")] public int LineNumber { set; get; } [Display(Name = "客户")] diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs index fb992dcd..97043cc3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs @@ -113,6 +113,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); var totalCount = await GetCountAsync(input); @@ -122,11 +123,17 @@ namespace Win.Sfs.SettleAccount.Entities.WMS private async Task GetCountAsync(WmsRequestDetailReportDto input) { - // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); + return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); } + [HttpPost] + [Route("Sync")] - + public virtual async Task SyncInterface() + { + //_wmsRepository.Where(p => p.BillNum ==) + return true; + } //[HttpPost] //[Route("Output")] @@ -155,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS 0, true); IExporter _excel = new ExcelExporter(); byte[] result = null; - var _fileName = string.Format("汇总合计报表_{0}.xlsx", Guid.NewGuid().ToString()); + var _fileName = string.Format("差异清单报表_{0}.xlsx", Guid.NewGuid().ToString()); result = await _excel.ExportAsByteArray(entities); result.ShouldNotBeNull(); //保存导出文件到服务器存成二进制 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs index 0959944f..ea912f49 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs @@ -122,6 +122,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS virtual public async Task> GetListAsync(WmsRequestDetailReportDto input) { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); var totalCount = await GetCountAsync(input); @@ -135,7 +136,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// [HttpPost] - [Route("version")] + [Route("Version")] virtual public async Task> GetVersionListAsync() { @@ -145,10 +146,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } - - - - private async Task GetCountAsync(WmsRequestDetailReportDto input) { // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 5597be90..e61c2d15 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -3012,6 +3012,20 @@ + + + + + + + + + + Wms汇总合计明细 + + + + wms出库-一汽轿车 @@ -3631,6 +3645,13 @@ + + + Wms汇总合计明细 + + + + 区域相关应用服务 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs index 7f0aa3dd..21a73298 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs @@ -103,6 +103,10 @@ namespace Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs [ExporterHeader(DisplayName = "版本", IsIgnore = true)] public string Version { set; get; } + + + [ExporterHeader(DisplayName = "未结期间", IsIgnore = true)] + public string UnSettleVersion { set; get; } //总金额差异 //[ExporterHeader(DisplayName = "总金额差异")] //public decimal AmtDiffPrice { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs index 2f734afb..62d44ef4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs @@ -100,7 +100,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " 0 DiffSettleFisQty,\n" + " 0 DiffSettleInvQty, \n" + " a.Qty InvoiceQty ,\n" + - " IsNull( B.Qty, 0 ) SettleReadyQty \n" + + " IsNull( B.Qty, 0 ) SettleReadyQty, \n" + + " a.UnSettleVersion \n" + " FROM\n" + tablestr +