diff --git a/.gitignore b/.gitignore index 04ba0ad0..2d5ef72f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /.vs/Win.Sfs.SmartSettlementSystem.PG/v17/.suo /src/.vs/SettleAccount/v17/.suo /src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220226.txt +/src/.vs/SettleAccount/v17/.futdcache.v1 +/src/.vs/SettleAccount/v17/fileList.bin diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 33b68568..7a621a0d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -3443,13 +3443,6 @@ - - - 出库单导出 - - - - 准时化出库主表 diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs index 9b9ceb94..4e80f850 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs @@ -99,6 +99,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { var _sql= "SELECT\n" + + " ROW_NUMBER()OVER(ORDER BY Type DESC) 行号 ,\n" + " Client 客户,\n" + " Type 出库类型,\n" + " BillNum 结算单,\n" + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs index 9e31baf3..a4791e7b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs @@ -281,9 +281,11 @@ namespace SettleAccount.Job.Services itm.DiffPrice = itm.Price - itm.InvoicePrice; } - + _ls.AddRange(rangeList); + _ls=_ls.Where(p => p.ParentSapMaterialCode == p.SapMaterialCode).ToList(); + if (!string.IsNullOrEmpty(materialGroup)) { var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();