Browse Source

审计调整

qianyi
shanji 3 years ago
parent
commit
924d9c3cca
  1. 2
      BBWY.Client/Models/APIModel/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs
  2. 13
      BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
  3. 19
      BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
  4. 5
      BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

2
BBWY.Client/Models/APIModel/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs

@ -19,5 +19,7 @@ namespace BBWY.Client.Models
public DateTime? PurchaseTime { get; set; } public DateTime? PurchaseTime { get; set; }
public Platform? PurchasePlatform { get; set; } public Platform? PurchasePlatform { get; set; }
public DateTime? OrderStartTime { get; set; }
} }
} }

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

@ -104,5 +104,18 @@ namespace BBWY.Client.Models
public string ErrorMessage { get => errorMessage; set { Set(ref errorMessage, value); } } public string ErrorMessage { get => errorMessage; set { Set(ref errorMessage, value); } }
public DateTime? OrderStartTime { get; set; } public DateTime? OrderStartTime { get; set; }
public override string ToString()
{
return $"{PayBillNo},{SourceMerchantOrderNo},{PayBillType},{PayTime},{OppositeAccount},{IncomeAmount},{ExpenditureAmount},{AuditCapitalType},{BelongShop},{RelationPurchaseOrderId},{RelationShopOrderId},{OrderStartTime},{PurchasePlatform},{Remark},{ErrorMessage}";
}
public static string ExportTitle
{
get
{
return "账单流水号,商家订单号,账单平台,支付时间,对方账户,收入金额,支出金额,资金类型,归属店铺,采购单号,销售单号,订单日期,采购平台,备注,异常信息";
}
}
} }
} }

19
BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs

@ -262,6 +262,7 @@ namespace BBWY.Client.ViewModels
payBill.BelongShopId = relationPurchaseOrder.ShopId; payBill.BelongShopId = relationPurchaseOrder.ShopId;
payBill.BelongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId)?.ShopName; payBill.BelongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId)?.ShopName;
payBill.PurchasePlatform = relationPurchaseOrder.PurchasePlatform; payBill.PurchasePlatform = relationPurchaseOrder.PurchasePlatform;
payBill.OrderStartTime = relationPurchaseOrder.OrderStartTime;
if (payBill.IncomeAmount > 0) if (payBill.IncomeAmount > 0)
payBill.AuditCapitalType = AuditCapitalType.退; payBill.AuditCapitalType = AuditCapitalType.退;
else else
@ -520,9 +521,23 @@ namespace BBWY.Client.ViewModels
{ {
if (ShowAuditPayBillList.Count == 0) if (ShowAuditPayBillList.Count == 0)
return; return;
var list = ShowAuditPayBillList.Select(p => p.ToString()).ToList(); var shopNames = string.Join(',', SelectedDepartment.ShopList.Where(s => s.IsSelected).Select(s => s.ShopName));
list.Add(""); var sfd = new SaveFileDialog() { FileName = $"{StartDate:yyyy-MM-dd}_{EndDate:yyyy-MM-dd}_{shopNames}_审计结果.csv" };
if (sfd.ShowDialog() != true)
return;
var path = sfd.FileName;
try
{
var list = ShowAuditPayBillList.Select(p => p.ToString()).ToList();
list.Insert(0, AuditPayBill.ExportTitle);
File.WriteAllLines(path, list, Encoding.UTF8);
MessageBox.Show("导出成功", "导出审计结果");
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "导出审计结果");
}
} }
} }
} }

5
BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

@ -178,7 +178,7 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<c:BButton Content="结果搜索" Padding="10,0" Command="{Binding SearchLocalCommand}"/> <c:BButton Content="结果搜索" Padding="10,0" Command="{Binding SearchLocalCommand}"/>
<c:BButton Content="清空条件" Padding="10,0" Command="{Binding ClearLocalConditionCommand}" Background="{StaticResource Text.Pink}"/> <c:BButton Content="清空条件" Padding="10,0" Command="{Binding ClearLocalConditionCommand}" Background="{StaticResource Text.Pink}"/>
<c:BButton Content="导出Excel" Padding="10,0" Background="#02A7F0"/> <c:BButton Content="导出Excel" Padding="10,0" Background="#02A7F0" Command="{Binding ExportCommand}"/>
<c:BButton Content="保存" Padding="10,0" Background="#1CC2A2" Command="{Binding SaveCommand}"/> <c:BButton Content="保存" Padding="10,0" Background="#1CC2A2" Command="{Binding SaveCommand}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
@ -218,7 +218,8 @@
<DataGridTextColumn Header="归属店铺" Width="100" Binding="{Binding BelongShop}" 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="140" Binding="{Binding RelationPurchaseOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Header="关联销售单" Width="120" Binding="{Binding RelationShopOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/> <DataGridTextColumn Header="关联销售单" Width="120" Binding="{Binding RelationShopOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Header="采购平台" Width="60" Binding="{Binding PurchasePlatform}" ElementStyle="{StaticResource middleTextBlock}"/> <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}"/> <DataGridTextColumn Header="备注" Width="*" Binding="{Binding Remark}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Header="异常内容" Width="*" Binding="{Binding ErrorMessage}" Foreground="Red" ElementStyle="{StaticResource verticalCenterTextBlock}"/> <DataGridTextColumn Header="异常内容" Width="*" Binding="{Binding ErrorMessage}" Foreground="Red" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
</DataGrid.Columns> </DataGrid.Columns>

Loading…
Cancel
Save