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

---
 BBWYB.Client/ViewModels/Order/OrderViewModel.cs        |  2 +-
 BBWYB.Client/Views/Order/OrderList.xaml                | 10 ++++++----
 BBWYB.Server.Business/Order/OrderBusiness.cs           |  9 ++++++++-
 .../Dto/Request/Order/QueryOrderRequest.cs             |  2 ++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index a357ce2..734c22a 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -73,7 +73,7 @@ namespace BBWYB.Client.ViewModels
             });
             SearchOrderCommand = new RelayCommand(() =>
             {
-                InitSearchParam();
+                PageIndex = 1;
                 Task.Factory.StartNew(() => LoadOrder(PageIndex));
             });
             OrderPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index bdd72c2..4237ff4 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -502,10 +502,12 @@
                                                             <Run Text="采购账号:"/>
                                                             <Run Text="{Binding PurchaseAccountName}"/>
                                                                     </TextBlock>
-                                                                    <TextBlock>
-                                                            <Run Text="订单号:"/>
-                                                            <Run Text="{Binding PurchaseOrderId}"/>
-                                                    </TextBlock>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <TextBlock VerticalAlignment="Center" Text="采购单号:"/>
+                                                        <c:BButton Style="{StaticResource LinkButton}" Content="{Binding PurchaseOrderId}" Margin="5,0,0,0"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding PurchaseOrderId}"/>
+                                                    </StackPanel>
                                                 </StackPanel>
                                             </DataTemplate>
                                         </ListBox.ItemTemplate>
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index ad85263..024204a 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -42,12 +42,19 @@ namespace BBWYB.Server.Business
                     select = select.Where((o, ocs, oct) => childSelect.Where(osku => osku.OrderId == o.Id).Any());
                 }
 
+                if (!string.IsNullOrEmpty(request.PurchaseOrderId))
+                {
+                    var childSelect = fsql.Select<OrderPurchaseInfo>().As("opi")
+                                          .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId);
+                    select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any());
+                }
+
                 select = select.WhereIf(request.OrderState != null, (o, ocs, oct) => o.OrderState == request.OrderState)
                                .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
                                .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId)
                                .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName)
-                               .WhereIf(!string.IsNullOrEmpty(request.SourceSku), (o, ocs, oct) => o.SourceSku == request.SourceSku);
+                               .WhereIf(!string.IsNullOrEmpty(request.SourceSku), (o, ocs, oct) => o.SourceSku.Contains(request.SourceSku));
             }
 
             select = select.WhereIf(request.ShopId != null, (o, ocs, oct) => o.ShopId == request.ShopId);
diff --git a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
index 4b5b9f7..4d1f01b 100644
--- a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
@@ -24,6 +24,8 @@
 
         public string ClientOrderId { get; set; }
 
+        public string PurchaseOrderId { get; set; }
+
         public string SourceShopName { get; set; }
 
         public string SourceSku { get; set; }