diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs index 260fd501..db7a8067 100644 --- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs +++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs @@ -588,12 +588,32 @@ namespace BBWY.Client.ViewModels { fileName = $"{StartDate:yyyy-MM-dd}_{EndDate:yyyy-MM-dd}_{shopNames}_资金类型汇总.csv"; saveList.Add($"序号,资金类型,{string.Join(',', SelectedDepartment.ShopList)},汇总"); - var capitalGroups = ShowAuditPayBillList.GroupBy(p=>p.AuditCapitalType); + var capitalGroups = ShowAuditPayBillList.Where(p => p.AuditCapitalType != null).GroupBy(p => p.AuditCapitalType); + var index = 1; + var rowBuilder = new StringBuilder(); foreach (var capitalGroup in capitalGroups) - { - + { + var sum = 0M; + rowBuilder.Append($"{index},{capitalGroup.Key},"); + foreach (var shop in SelectedDepartment.ShopList) + { + var currentShopCapitalGroup = capitalGroup.Where(p => p.BelongShopId == shop.ShopId); + var amount = 0M; + if (currentShopCapitalGroup.Count() > 0) + { + if (capitalGroup.Key == AuditCapitalType.当月商品退款 || capitalGroup.Key == AuditCapitalType.上月商品退款) + amount = currentShopCapitalGroup.Sum(p => p.IncomeAmount); + else + amount = currentShopCapitalGroup.Sum(p => p.ExpenditureAmount); + } + sum += amount; + rowBuilder.Append($"{amount},"); + } + rowBuilder.Append($"{sum}"); + index++; + saveList.Add(rowBuilder.ToString()); + rowBuilder.Clear(); } - } var sfd = new SaveFileDialog() { FileName = fileName }; diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml index e79b1841..8b6ccdfb 100644 --- a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml +++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml @@ -68,8 +68,8 @@ - - + +