From 306d68b1ac7b0355ed2d81b2b2907a305678eda4 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 16 Oct 2022 00:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcurementAuditViewModel.cs              | 28 ++++++++++++++++---
 .../FinancialTerminal/ProcurementAudit.xaml   |  4 +--
 2 files changed, 26 insertions(+), 6 deletions(-)

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 @@
                             </Style>
                         </hc:CheckComboBox.ItemContainerStyle>
                     </hc:CheckComboBox>
-                    <DatePicker Width="100" Height="30" Margin="5,0,0,0" SelectedDate="{Binding StartDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-                    <DatePicker Width="100" Height="30" Margin="5,0,0,0" SelectedDate="{Binding EndDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                    <DatePicker Height="30" Margin="5,0,0,0" SelectedDate="{Binding StartDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                    <DatePicker Height="30" Margin="5,0,0,0" SelectedDate="{Binding EndDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                     <c:BButton Content="查询" Margin="5,0,0,0" Padding="10,0" Command="{Binding SearchHistoryCommand}"/>
                     <c:BButton Content="审计" Padding="10,0" Command="{Binding AuditCommand}" Background="#02A7F0"/>
                     <c:BButton Content="清空" Padding="10,0" Command="{Binding ClearAuditCommand}" Background="#1CC2A2"/>