采购审计

BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs

@@ -353,6 +353,10 @@ namespace BBWY.Client.ViewModels
                 foreach (var line in importResult.Lines)
                 {
                     var array = line.CSVstrToArry();
+                    var sourceMerchantOrderNo = array[2].FormatString();
+                    if (!string.IsNullOrEmpty(sourceMerchantOrderNo) && sourceMerchantOrderNo.StartsWith("XP"))
+                        continue; //暂时不支持此类商户单号
+
                     var expenditureAmount = decimal.Parse(array[7].FormatString());
                     if (expenditureAmount == 0)  //支出为0的账单不参与审计
                         continue;
@@ -364,7 +368,7 @@ namespace BBWY.Client.ViewModels
                         BelongFileName = importResult.FileName,
                         PayBillNo = payBillNo,
                         PayBillType = PayBillType.AliPay,
-                        SourceMerchantOrderNo = array[2].FormatString(),
+                        SourceMerchantOrderNo = sourceMerchantOrderNo,
                         ProductName = array[3].FormatString(),
                         PayTime = DateTime.Parse(array[4].FormatString()),
                         OppositeAccount = array[5].FormatString(),
@@ -373,6 +377,7 @@ namespace BBWY.Client.ViewModels
                     payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo;
                     if (payBill.SourceMerchantOrderNo.StartsWith("T50060NP"))
                         payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo.Substring(8);
+
                     AuditPayBillList.Add(payBill);
                 }
             }