10028

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>

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);
                 }

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">