审计备注

BBWY.Client/APIServices/PurchaseOrderService.cs

@@ -94,6 +94,8 @@ namespace BBWY.Client.APIServices
         /// <param name="purchaseAccountId"></param>
         /// <param name="buyerAccount"></param>
         /// <param name="sellerAccount"></param>
+        /// <param name="purchaserId"></param>
+        /// <param name="platformCommissionRatio"></param>
         /// <returns></returns>
         public ApiResponse<object> FastCreateOrder(Consignee consignee,
                                            IList<PurchaseSchemeProductSku> purchaseSchemeProductSkuList,
@@ -107,6 +109,7 @@ namespace BBWY.Client.APIServices
                                            long purchaseAccountId,
                                            string buyerAccount,
                                            string sellerAccount,
+                                           string purchaserId,
                                            decimal platformCommissionRatio)
         {
             return SendRequest<object>(globalContext.BBYWApiHost, "api/purchaseOrder/NewFastCreateOrder", new
@@ -133,6 +136,7 @@ namespace BBWY.Client.APIServices
                 purchaseAccountId,
                 buyerAccount,
                 sellerAccount,
+                purchaserId,
                 platformCommissionRatio
             }, null, HttpMethod.Post);
         }

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

@@ -69,5 +69,7 @@ namespace BBWY.Client.Models
         /// </summary>
         public string ErrorMessage { get; set; }
 
+        public string Remark { get; set; }
+
     }
 }

BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs

@@ -200,7 +200,7 @@ namespace BBWY.Client.ViewModels
             };
             IsLoading = true;
             var shopList = SelectedDepartment.ShopList.Where(s => s.IsSelected).ToList();
-            var sDate = StartDate;
+            var sDate = StartDate.AddDays(-5);
             var eDate = EndDate;
             Task.Factory.StartNew(() =>
             {
@@ -408,8 +408,8 @@ namespace BBWY.Client.ViewModels
                 {
                     var array = line.CSVstrToArry();
                     var sourceMerchantOrderNo = array[2].FormatString();
-                    if (!string.IsNullOrEmpty(sourceMerchantOrderNo) && sourceMerchantOrderNo.StartsWith("XP"))
+                    //if (!string.IsNullOrEmpty(sourceMerchantOrderNo))
-                        continue; //暂时不支持此类商户单号
+                    //    continue; //暂时不支持此类商户单号
 
                     var expenditureAmount = decimal.Parse(array[7].FormatString());
                     if (expenditureAmount == 0)  //支出为0的账单不参与审计
@@ -426,7 +426,8 @@ namespace BBWY.Client.ViewModels
                         ProductName = array[3].FormatString(),
                         PayTime = DateTime.Parse(array[4].FormatString()),
                         OppositeAccount = array[5].FormatString(),
-                        ExpenditureAmount = Math.Abs(expenditureAmount)
+                        ExpenditureAmount = Math.Abs(expenditureAmount),
+                        Remark = array[11]
                     };
                     payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo;
                     if (payBill.SourceMerchantOrderNo.StartsWith("T50060NP"))

BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs

@@ -320,6 +320,7 @@ namespace BBWY.Client.ViewModels
                purchaseAccount.Id,
                purchaseAccount.AccountName,
                purchaseSchemeList[0].PurchaserName,
+               purchaser.Id,
                globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M)).ContinueWith(t =>
                   {
                       IsLoading = false;

BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

@@ -156,10 +156,19 @@
                     <DataGridTextColumn Header="支付时间" Width="130" Binding="{Binding PayTime,StringFormat=yyyy-MM-dd HH:mm:ss}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="对方账号" Width="100" Binding="{Binding OppositeAccount}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="支出金额" Width="60" Binding="{Binding ExpenditureAmount}" ElementStyle="{StaticResource middleTextBlock}"/>
-                    <DataGridTextColumn Header="商户订单号" Width="200" Binding="{Binding SourceMerchantOrderNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
+                    <!--<DataGridTextColumn Header="商户订单号" Width="200" Binding="{Binding SourceMerchantOrderNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>-->
+                    <DataGridTemplateColumn Header="商户订单号" Width="200">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding SourceMerchantOrderNo}" Background="Transparent" BorderThickness="0"
+                                         IsReadOnly="True" VerticalAlignment="Center"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <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 RelationShopOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
+                    <DataGridTextColumn Header="备注" Width="*" Binding="{Binding Remark}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="异常内容" Width="*" Binding="{Binding ErrorMessage}" Foreground="Red" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                 </DataGrid.Columns>
             </DataGrid>

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.Name}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10017" Margin="5,0,0,0"/>
+                <TextBlock Text="v10018" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -308,7 +308,8 @@ namespace BBWY.Server.Business
                     SingleOperationAmount = 0,
                     SingleSkuAmount = currentOrderSkuProductAmount / orderSku.ItemTotal.Value,
                     SingleFreight = currentOrderSkuFreightAmount / orderSku.ItemTotal.Value,
-                    StorageType = Enums.StorageType.代发
+                    StorageType = Enums.StorageType.代发,
+                    PurchaserId = createOnlinePurchaseOrderRequest.PurchaserId
                 };
                 insertPurchaseOrders.Add(purchaseOrder);
                 #endregion

BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs

@@ -82,6 +82,12 @@ namespace BBWY.Server.Model.Db
 
         public long? ShopId { get; set; }
 
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string PurchaserId { get; set; }
+
         /// <summary>
         /// 单件Sku成本
         /// </summary>

BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs

@@ -35,5 +35,11 @@
         public string SellerAccount { get; set; }
 
         public decimal PlatformCommissionRatio { get; set; }
+
+
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        public string PurchaserId { get; set; }
     }
 }

BBWY.Server.Model/Enums.cs

@@ -10,7 +10,8 @@
             淘宝 = 0,
             京东 = 1,
             阿里巴巴 = 2,
-            拼多多 = 3
+            拼多多 = 3,
+            微信 = 4
         }
 
         /// <summary>