From 45adc45284d1db8a5f4ea6e9a0b80b3eb48f61cf Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 3 Nov 2023 22:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=BD=E6=94=B6=E5=8D=95?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=BA=E5=BA=97=E9=93=BA=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                          |  2 +-
 .../ViewModels/PackTask/WareHouseListViewModel.cs     | 11 +++++++----
 .../Views/FallWare/WareLSAcceptOrderWindow.xaml       |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index fee5720c..f4d6d646 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10195";
+            ClientVersion = "10196";
         }
 
 
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index f7cfd837..45d8ace4 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -847,10 +847,11 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
 
             }
-
+            
             var data = LSOrderPurchaseListRes.Data;
-
-
+            lsdTaskMsg.CustomerName = model.ShopName;
+            lsdTaskMsg.CustomerUserName = model.ShopName;
+            lsdTaskMsg.JDTransportUserName = model.ShopName;
             List<GetWareLSOrderPurchase> lookData = null;
             if (data.GetWareLSOrderPurchases.Count > 10)
             {
@@ -891,7 +892,9 @@ namespace BBWY.Client.ViewModels.PackTask
 
             }
             var lsdTaskMsg = lsdTaskMsgRes.Data;
-
+            lsdTaskMsg.CustomerName = model.ShopName;
+            lsdTaskMsg.CustomerUserName = model.ShopName;
+            lsdTaskMsg.JDTransportUserName = model.ShopName;
             var LSOrderPurchaseListRes = sealBoxService.GetWareLSOrderPurchaseList(model.BoxConfigureData.PrewOrder);
             if (!LSOrderPurchaseListRes.Success)
             {
diff --git a/BBWY.Client/Views/FallWare/WareLSAcceptOrderWindow.xaml b/BBWY.Client/Views/FallWare/WareLSAcceptOrderWindow.xaml
index 5b747000..41f4ab64 100644
--- a/BBWY.Client/Views/FallWare/WareLSAcceptOrderWindow.xaml
+++ b/BBWY.Client/Views/FallWare/WareLSAcceptOrderWindow.xaml
@@ -86,7 +86,7 @@
                     <TextBlock Text="{Binding GetWareLSAcceptOrderResponse.CustomerName}" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"  FontSize="14"/>
 
                     <TextBlock Text="提货地址" Grid.Row="2" Style="{StaticResource fontSize14}" />
-                    <TextBlock Text="{Binding GetWareLSAcceptOrderResponse.AcceptAdress}" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" FontSize="14"/>
+                    <TextBlock Text="{Binding GetWareLSAcceptOrderResponse.AcceptAdress}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" FontSize="14"/>
 
                     <TextBlock Text="客户联系人*" Grid.Row="3" Style="{StaticResource fontSize14}" />
                     <TextBlock Text="{Binding GetWareLSAcceptOrderResponse.CustomerUserName}" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"  FontSize="14"/>