财务审计保存账单修改

BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs

@@ -6,6 +6,12 @@ namespace BBWY.Client.Models
     {
         private AuditCapitalType? auditCapitalType;
         private string errorMessage;
+
+        /// <summary>
+        /// 是否发生过变化
+        /// </summary>
+        public bool IsChanged { get; set; }
+
         /// <summary>
         /// 账单流水号
         /// </summary>
@@ -87,7 +93,11 @@ namespace BBWY.Client.Models
             {
                 Set(ref auditCapitalType, value);
                 if (value != null)
+                {
+                    IsChanged = true;
                     ErrorMessage = string.Empty;
+                }
+
             }
         }
 

BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs

@@ -221,6 +221,8 @@ namespace BBWY.Client.ViewModels
 
                 foreach (var payBill in AuditPayBillList)
                 {
+                    payBill.IsChanged = true;
+
                     payBill.ErrorMessage = string.Empty;
 
                     #region 按日累计拼多多账单金额
@@ -263,10 +265,22 @@ namespace BBWY.Client.ViewModels
                     payBill.BelongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId)?.ShopName;
                     payBill.PurchasePlatform = relationPurchaseOrder.PurchasePlatform;
                     payBill.OrderStartTime = relationPurchaseOrder.OrderStartTime;
+
+
                     if (payBill.IncomeAmount > 0)
-                        payBill.AuditCapitalType = AuditCapitalType.当月商品退款;
+                    {
+                        if (payBill.PayTime.Value.Month == relationPurchaseOrder.OrderStartTime.Value.Month)
+                            payBill.AuditCapitalType = AuditCapitalType.当月商品退款;
+                        else
+                            payBill.AuditCapitalType = AuditCapitalType.上月商品退款;
+                    }
                     else
-                        payBill.AuditCapitalType = AuditCapitalType.当月商品采购;
+                    {
+                        if (payBill.PayTime.Value.Month == relationPurchaseOrder.OrderStartTime.Value.Month)
+                            payBill.AuditCapitalType = AuditCapitalType.当月商品采购;
+                        else
+                            payBill.AuditCapitalType = AuditCapitalType.上月商品采购;
+                    }
                     #endregion
                 }
 
@@ -484,6 +498,14 @@ namespace BBWY.Client.ViewModels
                 MessageBox.Show("没有需要保存的数据", "提示");
                 return;
             }
+
+            var saveList = ShowAuditPayBillList.Where(p => p.IsChanged).ToList();
+            if (saveList.Count == 0)
+            {
+                MessageBox.Show("没有需要保存的账单");
+                return;
+            }
+
             var importShopIds = string.Join(',', SelectedDepartment.ShopList.Where(s => s.IsSelected).Select(s => s.ShopId));
 
             var replaceResponse = financialTerminalService.IsExistAuditPayBill(importShopIds, StartDate, EndDate);
@@ -502,7 +524,7 @@ namespace BBWY.Client.ViewModels
             foreach (var bill in ShowAuditPayBillList)
                 bill.ImportShopIds = importShopIds;
 
-            Task.Factory.StartNew(() => financialTerminalService.BatchInsertAuditPayBill(ShowAuditPayBillList)).ContinueWith(t =>
+            Task.Factory.StartNew(() => financialTerminalService.BatchInsertAuditPayBill(saveList)).ContinueWith(t =>
             {
                 IsLoading = false;
                 var insertResponse = t.Result;

BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

@@ -190,7 +190,14 @@
                       BorderBrush="{StaticResource Border.Brush}"
                       VirtualizingPanel.IsVirtualizing="True">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="账单流水号" Width="145" Binding="{Binding PayBillNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
+                    <DataGridTemplateColumn Header="账单流水号" Width="145">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding PayBillNo}" Background="Transparent" BorderThickness="0"
+                                         IsReadOnly="True" VerticalAlignment="Center"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <DataGridTemplateColumn Header="商户订单号" Width="200">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
@@ -216,8 +223,22 @@
                     <!--<DataGridTextColumn Header="商户订单号" Width="200" Binding="{Binding SourceMerchantOrderNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>-->
 
                     <DataGridTextColumn Header="归属店铺" Width="100" Binding="{Binding BelongShop}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="关联采购单" Width="140" Binding="{Binding RelationPurchaseOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="关联销售单" Width="120" Binding="{Binding RelationShopOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
+                    <DataGridTemplateColumn Header="关联采购单" Width="140">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding RelationPurchaseOrderId}" Background="Transparent" BorderThickness="0"
+                                         IsReadOnly="True" VerticalAlignment="Center"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="关联销售单" Width="120">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding RelationShopOrderId}" Background="Transparent" BorderThickness="0"
+                                         IsReadOnly="True" VerticalAlignment="Center"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <DataGridTextColumn Header="订单日期" Width="80" Binding="{Binding OrderStartTime,StringFormat=yyyy-MM-dd}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="采购平台" Width="60" Binding="{Binding PurchasePlatform}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="备注" Width="*" Binding="{Binding Remark}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>

BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs

@@ -34,16 +34,18 @@ namespace BBWY.Server.Business
         {
             if (insertList == null || insertList.Count == 0)
                 throw new BusinessException("数据不全");
-            var importShopIds = insertList[0].ImportShopIds;
-            var startTime = insertList.Min(abp => abp.PayTime).Value;
-            var endTime = insertList.Max(abp => abp.PayTime).Value;
+            //var importShopIds = insertList[0].ImportShopIds;
+            //var startTime = insertList.Min(abp => abp.PayTime).Value;
+            //var endTime = insertList.Max(abp => abp.PayTime).Value;
 
+            var deleteIds = insertList.Select(p => p.PayBillNo).ToArray();
 
             fsql.Transaction(() =>
             {
-                fsql.Delete<AuditPayBill>().Where(apb => apb.ImportShopIds == importShopIds &&
-                                                         apb.PayTime >= startTime &&
-                                                         apb.PayTime <= endTime).ExecuteAffrows();
+                fsql.Delete<AuditPayBill>(deleteIds).ExecuteAffrows();
+                //fsql.Delete<AuditPayBill>().Where(apb => apb.ImportShopIds == importShopIds &&
+                //                                         apb.PayTime >= startTime &&
+                //                                         apb.PayTime <= endTime).ExecuteAffrows();
                 fsql.Insert(insertList).ExecuteAffrows();
             });
         }