From ccb2ba0f928bbf2cd96519fefd3f4254f9f2c081 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 4 May 2023 17:13:49 +0800
Subject: [PATCH] 1

---
 BBWYB.Client/APIServices/OrderService.cs      | 24 ++++++++++---------
 .../ViewModels/Order/OrderViewModel.cs        | 10 ++++----
 BBWYB.Client/Views/Order/OrderList.xaml       |  6 ++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/BBWYB.Client/APIServices/OrderService.cs b/BBWYB.Client/APIServices/OrderService.cs
index 615276f..0105a32 100644
--- a/BBWYB.Client/APIServices/OrderService.cs
+++ b/BBWYB.Client/APIServices/OrderService.cs
@@ -19,6 +19,7 @@ namespace BBWYB.Client.APIServices
                                                            string productId,
                                                            string skuId,
                                                            string clientOrderId,
+                                                           string purchaseOrderId,
                                                            string sourceShopName,
                                                            string sourceSku,
                                                            int pageIndex,
@@ -28,18 +29,19 @@ namespace BBWYB.Client.APIServices
         {
             return SendRequest<OrderListResponse>(globalContext.BBYWApiHost, "api/order/getorderlist", new
             {
-                OrderId = orderId,
-                ShopId = shopId,
-                StartDate = startDate,
-                EndDate = endDate,
-                OrderState = orderState,
-                PageIndex = pageIndex,
-                PageSize = pageSize,
-                ProductId = productId,
+                orderId,
+                shopId,
+                startDate,
+                endDate,
+                orderState,
+                pageIndex,
+                pageSize,
+                productId,
                 Sku = skuId,
-                ClientOrderId = clientOrderId,
-                SourceShopName = sourceShopName,
-                SourceSku = sourceSku
+                clientOrderId,
+                purchaseOrderId,
+                sourceShopName,
+                sourceSku
             }, null, HttpMethod.Post);
         }
     }
diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index 734c22a..1e42313 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -28,7 +28,7 @@ namespace BBWYB.Client.ViewModels
         private string searchSku;
         private string searchProductId;
         private string searchOrderId;
-        private string searchClientOrderId;
+        private string searchPurchaseOrderId;
         private string searchSourceShopName;
         private string searchSourceSku;
         private bool excludeCanceled;
@@ -47,7 +47,7 @@ namespace BBWYB.Client.ViewModels
         public string SearchSku { get => searchSku; set { SetProperty(ref searchSku, value); } }
         public string SearchProductId { get => searchProductId; set { SetProperty(ref searchProductId, value); } }
         public string SearchOrderId { get => searchOrderId; set { SetProperty(ref searchOrderId, value); } }
-        public string SearchClientOrderId { get => searchClientOrderId; set { SetProperty(ref searchClientOrderId, value); } }
+        public string SearchPurchaseOrderId { get => searchPurchaseOrderId; set { SetProperty(ref searchPurchaseOrderId, value); } }
         public string SearchSourceShopName { get => searchSourceShopName; set { SetProperty(ref searchSourceShopName, value); } }
         public string SearchSourceSku { get => searchSourceSku; set { SetProperty(ref searchSourceSku, value); } }
         public bool ExcludeCanceled { get => excludeCanceled; set { SetProperty(ref excludeCanceled, value); } }
@@ -93,7 +93,7 @@ namespace BBWYB.Client.ViewModels
         private void LoadOrder(int pageIndex)
         {
             IsLoading = true;
-            var response = orderService.GetOrderList(SearchOrderId, StartDate, EndDate, OrderState, SearchProductId, SearchSku, SearchClientOrderId, SearchSourceShopName, SearchSourceSku, pageIndex, PageSize, globalContext.User.Shop.ShopId, ExcludeCanceled);
+            var response = orderService.GetOrderList(SearchOrderId, StartDate, EndDate, OrderState, SearchProductId, SearchSku, string.Empty, SearchPurchaseOrderId, SearchSourceShopName, SearchSourceSku, pageIndex, PageSize, globalContext.User.Shop.ShopId, ExcludeCanceled);
 
             if (!response.Success)
             {
@@ -143,7 +143,7 @@ namespace BBWYB.Client.ViewModels
             SearchOrderId = string.Empty;
             SearchSku = string.Empty;
             SearchProductId = string.Empty;
-            SearchClientOrderId = string.Empty;
+            SearchPurchaseOrderId = string.Empty;
             SearchSourceShopName = string.Empty;
             SearchSourceSku = string.Empty;
             if (isInitDate)
@@ -192,7 +192,7 @@ namespace BBWYB.Client.ViewModels
                 return;
             }
 
-            var orderResponse = orderService.GetOrderList(orderId, StartDate, EndDate, null, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, 1, 10, globalContext.User.Shop.ShopId, true);
+            var orderResponse = orderService.GetOrderList(orderId, StartDate, EndDate, null, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, 1, 10, globalContext.User.Shop.ShopId, true);
             IsLoading = false;
             if (!orderResponse.Success)
             {
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index 4237ff4..82470a6 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -84,10 +84,8 @@
                     <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
                                Command="{Binding SetSearchDateCommand}"
                                CommandParameter="{StaticResource d30}"/>
-                    <TextBlock Text="采购单" VerticalAlignment="Center" Margin="5,0,0,0"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchClientOrderId}" WaterRemark="精确匹配"
-                                Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+                    <TextBlock Text="采购单" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchPurchaseOrderId}" WaterRemark="精确匹配"/>
                     <TextBlock VerticalAlignment="Center" Margin="5,0,0,0">
                         <Run Text="下单"/>
                         <LineBreak/>