From b078f627c827216f5c5cc4a395aa225287a5f330 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sat, 12 Feb 2022 02:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=8F=B7=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Views/Order/OrderList.xaml         | 4 +++-
 BBWY.Server.Business/PlatformSDK/JDBusiness.cs | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 19c74f06..04b5194f 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -457,7 +457,9 @@
                                         <Run Text="采购单号"/>
                                         <Run Text="{Binding OrderDropShipping.PurchaseOrderId}"/>
                                         </TextBlock>
-                                        <c:BButton Content="复制" Style="{StaticResource LinkButton}" VerticalAlignment="Center"/>
+                                        <c:BButton Content="复制" Style="{StaticResource LinkButton}" VerticalAlignment="Center"
+                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding OrderDropShipping.PurchaseOrderId}"/>
                                     </StackPanel>
                                     <TextBlock>
                                         <Run Text="采购金额"/>
diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index 45dd056e..0a9f19e6 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
@@ -185,7 +185,7 @@ namespace BBWY.Server.Business
                     }
                     else
                     {
-                        fbpReq.orderState = "abc";  //待转换
+                        fbpReq.orderState = searchOrderRequest.OrderState;  //待转换
                     }
                     fbpReq.page = searchOrderRequest.PageIndex.ToString();
                     fbpReq.pageSize = searchOrderRequest.PageSize.ToString();
@@ -219,7 +219,7 @@ namespace BBWY.Server.Business
                     }
                     else
                     {
-                        sopReq.orderState = "abc";  //待转换
+                        sopReq.orderState = searchOrderRequest.OrderState;  //待转换
                     }
                     sopReq.optionalFields = searchFields;
                     sopReq.page = searchOrderRequest.PageIndex.ToString();