diff --git a/BBWY.Client/Models/APIModel/Response/FinancialTerminal/AuditPayBillResponse.cs b/BBWY.Client/Models/APIModel/Response/FinancialTerminal/AuditPayBillResponse.cs index 0675df81..632bb782 100644 --- a/BBWY.Client/Models/APIModel/Response/FinancialTerminal/AuditPayBillResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/FinancialTerminal/AuditPayBillResponse.cs @@ -98,5 +98,10 @@ namespace BBWY.Client.Models public string ErrorMessage { get; set; } public AuditCapitalType? AuditCapitalType { get; set; } + + /// + /// 自定义资金类型 + /// + public string CustomAuditCapitalType { get; set; } } } diff --git a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs index 0fb4c06d..ea19b5c4 100644 --- a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs +++ b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs @@ -5,6 +5,7 @@ namespace BBWY.Client.Models public class AuditPayBill : NotifyObject { private AuditCapitalType? auditCapitalType; + private string customAuditCapitalType; private string errorMessage; /// @@ -96,6 +97,8 @@ namespace BBWY.Client.Models { IsChanged = true; ErrorMessage = string.Empty; + if (value != Models.AuditCapitalType.自定义) + CustomAuditCapitalType = string.Empty; } } @@ -115,6 +118,16 @@ namespace BBWY.Client.Models public DateTime? OrderStartTime { get; set; } + + /// + /// 自定义资金类型 + /// + public string CustomAuditCapitalType + { + get => customAuditCapitalType; + set { Set(ref customAuditCapitalType, value); } + } + public override string ToString() { return $"{PayBillNo},{SourceMerchantOrderNo},{PayBillType},{PayTime},{OppositeAccount},{IncomeAmount},{ExpenditureAmount},{AuditCapitalType},{BelongShop},{RelationPurchaseOrderId},{RelationShopOrderId},{OrderStartTime},{PurchasePlatform},{Remark},{ErrorMessage}"; @@ -127,5 +140,6 @@ namespace BBWY.Client.Models return "账单流水号,商家订单号,账单平台,支付时间,对方账户,收入金额,支出金额,资金类型,归属店铺,采购单号,销售单号,订单日期,采购平台,备注,异常信息"; } } + } } diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs index 2b5ccb84..e44ef957 100644 --- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs +++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs @@ -236,6 +236,12 @@ namespace BBWY.Client.ViewModels #endregion #region 匹配采购单 + if (string.IsNullOrEmpty(payBill.SourceMerchantOrderNo)) + { + payBill.ErrorMessage = "未选资金类型"; + continue; + } + var relationPurchaseOrder = auditPurchaseOrderResponse.Data.FirstOrDefault(p => p.PurchaseOrderId == payBill.MerchantOrderNo || p.MerchantOrderId == payBill.MerchantOrderNo); @@ -358,6 +364,7 @@ namespace BBWY.Client.ViewModels /// private void ImportAliPayBill() { + //AuditPayBillList.Clear(); var importResult = ImportAuditFile(AuditFileType.账单); if (!string.IsNullOrEmpty(importResult.ErrorMessage)) { @@ -437,7 +444,7 @@ namespace BBWY.Client.ViewModels list.Add(payBill); } - list = list.OrderByDescending(p => p.PayBillNo).ToList(); + list = list.OrderByDescending(p => p.PayTime).ToList(); foreach (var p in list) AuditPayBillList.Add(p); } @@ -531,7 +538,11 @@ namespace BBWY.Client.ViewModels App.Current.Dispatcher.Invoke(() => { if (insertResponse.Success) + { + foreach (var p in saveList) + p.IsChanged = false; MessageBox.Show("保存成功", "提示"); + } else MessageBox.Show(insertResponse.Msg, "提示"); }); diff --git a/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs b/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs index 6cb8f630..d0c317cd 100644 --- a/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs +++ b/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs @@ -112,6 +112,12 @@ namespace BBWY.Server.Model.Db [Column(DbType = "int(1)", MapType = typeof(int?))] public Enums.AuditCapitalType? AuditCapitalType { get; set; } + + /// + /// 自定义资金类型 + /// + [Column(StringLength = 50)] + public string CustomAuditCapitalType { get; set; } } }