From 107568f320aec03a24e71bce793823795ae0f110 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 27 Jun 2022 03:55:33 +0800
Subject: [PATCH] 10028

---
 .../ProcurementAudit/AuditPayBill.cs             |  5 +++++
 .../ProcurementAuditViewModel.cs                 | 16 +++++++++++++++-
 BBWY.Client/Views/MainWindow.xaml                |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
index 2173fdb7..100e4df2 100644
--- a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
+++ b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
@@ -31,6 +31,11 @@ namespace BBWY.Client.Models
         /// </summary>
         public string MerchantOrderNo { get; set; }
 
+        /// <summary>
+        /// 是否支持商户单号
+        /// </summary>
+        public bool IsSupportMerchantOrderNo { get; set; }
+
         /// <summary>
         /// 商品名称
         /// </summary>
diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
index aff8405d..2f268b35 100644
--- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
+++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
@@ -217,7 +217,10 @@ namespace BBWY.Client.ViewModels
 
                     if (relationPurchaseOrder == null)
                     {
-                        payBill.ErrorMessage = "未匹配采购单";
+                        if (payBill.IsSupportMerchantOrderNo)
+                            payBill.ErrorMessage = "未匹配采购单";
+                        else
+                            payBill.AuditCapitalType = AuditCapitalType.商品采购;
                         continue;
                     }
                     payBill.RelationPurchaseOrderId = relationPurchaseOrder.PurchaseOrderId;
@@ -357,10 +360,21 @@ namespace BBWY.Client.ViewModels
                     payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo;
 
                     if (payBill.SourceMerchantOrderNo.StartsWith("T50060NP"))
+                    {
                         payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo.Substring(8);
+                        payBill.IsSupportMerchantOrderNo = true;
+                    }
 
                     if (payBill.SourceMerchantOrderNo.StartsWith("T200P"))
+                    {
                         payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo.Substring(5);
+                        payBill.IsSupportMerchantOrderNo = true;
+                    }
+
+                    if (payBill.SourceMerchantOrderNo.StartsWith("XP"))
+                    {
+                        payBill.IsSupportMerchantOrderNo = true;
+                    }
 
                     AuditPayBillList.Add(payBill);
                 }
diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 0634c33d..bc3d0dc4 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10027" Margin="5,0,0,0"/>
+                <TextBlock Text="v10028" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">