From 5742bb771802bc3ead11c808dc33ca1b3543b346 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 15 Sep 2023 17:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E8=90=BD=E4=BB=93=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B0=81=E7=AE=B1=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                                 | 2 +-
 BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml    | 1 +
 BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml | 2 ++
 BBWY.Client/Views/FallWare/WaitFallWareControl.xaml          | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 6762ffda..d5876d53 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 = "10183";
+            ClientVersion = "10184";
         }
 
         private User user;
diff --git a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
index 56c8d761..44480b66 100644
--- a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
+++ b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
@@ -104,6 +104,7 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding SealBoxId}"
                                                                    Margin=" 5,0,7,0"/>
+                                <TextBlock VerticalAlignment="Center" Text="{Binding BoxCount,StringFormat=封箱数量: {0}}" Margin="16,0,0,0" />
                             </StackPanel>
                             <Grid Grid.Column="1">
                                 <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
diff --git a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
index e02d2348..8679d86c 100644
--- a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
+++ b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
@@ -102,6 +102,8 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding SealBoxId}"
                                                                    Margin=" 5,0,7,0"/>
+
+                                <TextBlock VerticalAlignment="Center" Text="{Binding BoxCount,StringFormat=封箱数量: {0}}" Margin="16,0,0,0" />
                             </StackPanel>
 
                             <Grid Grid.Column="1">
diff --git a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
index ecb4227e..8feb9a9c 100644
--- a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
+++ b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
@@ -107,7 +107,8 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding SealBoxId}"
                                                                    Margin=" 5,0,7,0"/>
-                               
+
+                                <TextBlock VerticalAlignment="Center" Text="{Binding SealBoxCount,StringFormat=封箱数量: {0}}" Margin="16,0,0,0" />
 
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="16,0,0,0" />
                                 <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"