From 6eb7911eeaedd047704d4c498cf6b9b2e5b3802b Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 22 Aug 2023 18:21:17 +0800
Subject: [PATCH] =?UTF-8?q?10173=20=E6=B7=BB=E5=8A=A0=E5=B0=81=E7=AE=B1?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                     |  2 +-
 .../PackTask/SearchWaitSealBoxResponse.cs        |  2 +-
 .../Response/SealBox/GetWareSealBoxResponse.cs   |  2 ++
 .../GetWareSealBoxWaitConfigureResponse.cs       |  2 ++
 .../SealBox/GetWareWaitTransportResponse.cs      |  2 +-
 .../Views/FallWare/WaitFallWareControl.xaml      |  8 +++++---
 .../Views/PackTask/WaitCompletedControl.xaml     | 16 +++++++++++++++-
 .../Views/SealBox/SealBoxNoConfigureControl.xaml |  8 +++++---
 .../Views/SealBox/WaitSealBoxControl.xaml        |  7 ++++---
 .../WaitTransport/WareWaitTransportControl.xaml  | 14 +++++++++++++-
 10 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index cec3c48c..8facce1c 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 = "10172";
+            ClientVersion = "10173";
         }
 
         private User user;
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
index bcedf94a..6c08fd14 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
@@ -67,7 +67,7 @@ namespace BBWY.Client.Models.APIModel
 
     public class SealBoxSku
     {
-
+        public DateTime? CreateTime { get; set; }
         /// <summary>
         /// 任务Id
         /// </summary>
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs
index a42d459d..cc19678e 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs
@@ -67,6 +67,8 @@ namespace BBWY.Client.Models.APIModel
     public class WareSealBoxSku
     {
 
+        public DateTime? CreateTime { get; set; }
+
         public TaskState TaskState { get; set; }
         /// <summary>
         /// 任务Id
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
index aeb70a6b..e574e294 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
@@ -52,6 +52,8 @@ namespace BBWY.Client.Models.APIModel
     public class WareNoSealBoxSku
     {
 
+        public DateTime? CreateTime { get; set; }
+
         /// <summary>
         /// 任务Id
         /// </summary>
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
index 57b8638d..14c466cb 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
@@ -73,7 +73,7 @@ namespace BBWY.Client.Models.APIModel
     }
     public class WaitTransportSku
     {
-
+        public DateTime? CreateTime { get; set; }
         ///// <summary>
         ///// 任务状态
         ///// </summary>
diff --git a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
index 1093d504..ecb4227e 100644
--- a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
+++ b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
@@ -203,12 +203,14 @@
                                                 <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
                                                     <StackPanel    Orientation="Horizontal" >
                                                         <TextBlock Foreground="{StaticResource Text.Gray}">
-                                                            <Run Text="货号:" />
+ <Run Text="发布日期:" />
+
                                                         </TextBlock>
-                                                        <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                        <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                                        <!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding ProductNo}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   Margin=" 5,0,0,0"/>-->
                                                     </StackPanel>
                                                     <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
                                                         <TextBlock Foreground="{StaticResource Text.Gray}">
diff --git a/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml b/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
index 4ad18bb5..1ec74bbf 100644
--- a/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
@@ -254,7 +254,21 @@
                                                                    CommandParameter="{Binding ProductNo}"
                                                                    Margin=" 5,0,0,0"/>
                                                     </StackPanel>-->
-                                                        <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5">
+
+                                                        <StackPanel    Orientation="Horizontal" >
+                                                            <TextBlock Foreground="{StaticResource Text.Gray}">
+<Run Text="发布日期:" />
+
+                                                            </TextBlock>
+                                                            <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                                            <!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                                  Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+                                                                  CommandParameter="{Binding ProductNo}"
+                                                                  Margin=" 5,0,0,0"/>-->
+                                                        </StackPanel>
+                                                        <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,10,0,5">
+                                                            
+                                                            
                                                             <TextBlock Foreground="{StaticResource Text.Gray}">
                                                             <Run Text="任务ID:" />
                                                             </TextBlock>
diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
index 2e6b495e..835650c4 100644
--- a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
+++ b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
@@ -193,12 +193,14 @@
                                                     <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
                                                         <StackPanel    Orientation="Horizontal" >
                                                             <TextBlock Foreground="{StaticResource Text.Gray}">
-                                                            <Run Text="货号:" />
+                                                            <Run Text="发布日期:" />
+                                                                
                                                             </TextBlock>
-                                                            <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                            <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                                            <!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding ProductNo}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   Margin=" 5,0,0,0"/>-->
                                                         </StackPanel>
                                                         <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
                                                             <TextBlock Foreground="{StaticResource Text.Gray}">
diff --git a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
index 9c171c99..4130954d 100644
--- a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
+++ b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
@@ -210,12 +210,13 @@
                                                 <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
                                                     <StackPanel    Orientation="Horizontal" >
                                                         <TextBlock Foreground="{StaticResource Text.Gray}">
-                                                            <Run Text="货号:" />
+                                                            <Run Text="发布日期:" />
                                                         </TextBlock>
-                                                        <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                        <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                                        <!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding ProductNo}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   Margin=" 5,0,0,0"/>-->
                                                     </StackPanel>
                                                     <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
                                                         <TextBlock Foreground="{StaticResource Text.Gray}">
diff --git a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
index 94ae4607..f10bdca6 100644
--- a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
+++ b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
@@ -210,7 +210,19 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18"
                                                                    CommandParameter="{Binding ProductNo}"
                                                                    Margin=" 5,0,0,0"/>
                                                     </StackPanel>-->
-                                                    <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5">
+
+                                                    <StackPanel    Orientation="Horizontal" >
+                                                        <TextBlock Foreground="{StaticResource Text.Gray}">
+<Run Text="发布日期:" />
+
+                                                        </TextBlock>
+                                                        <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                                        <!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                                  Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+                                                                  CommandParameter="{Binding ProductNo}"
+                                                                  Margin=" 5,0,0,0"/>-->
+                                                    </StackPanel>
+                                                    <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,11,0,5">
                                                         <TextBlock Foreground="{StaticResource Text.Gray}">
                                                             <Run Text="任务ID:" />
                                                         </TextBlock>