From 862024bfbe998c1d461bd399a783d0873e861251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com>
Date: Wed, 20 Mar 2024 18:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E7=AE=B1=E7=AD=96=E7=95=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8D=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/SealBox/SealBoxPolicyDetailsWindow.xaml        | 9 ++++++---
 .../Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs     | 4 ++++
 .../Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs      | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml
index a8331b12..5eec4ee6 100644
--- a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml
+++ b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml
@@ -34,15 +34,18 @@
                 <TextBlock Text="/"/>
                 <TextBlock Text="2"/>-->
 
-                <TextBlock Text="店铺:" Margin="50 0 0 0"/>
+                <TextBlock Text="店铺:" Margin="40 0 0 0"/>
                 <TextBlock Text="{Binding ShopName}"/>
 
-                <TextBlock Text="仓库:" Margin="50 0 0 0"/>
+                <TextBlock Text="仓库:" Margin="40 0 0 0"/>
                 <TextBlock Text="{Binding WareName}"/>
 
-                <TextBlock Text="对接人:" Margin="50 0 0 0"/>
+                <TextBlock Text="对接人:" Margin="40 0 0 0"/>
                 <TextBlock Text="{Binding AcceptUserName}"/>
 
+                <TextBlock Text="打印时间:" Margin="40 0 0 0"/>
+                <TextBlock Text="{Binding NowDateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+
             </StackPanel>
 
             <Grid Grid.Row="2" >
diff --git a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs
index f4b0818a..e789ee35 100644
--- a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs
+++ b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs
@@ -33,6 +33,7 @@ namespace BBWY.Client.Views.SealBox
             WareName = wareName;
             AcceptUserName = acceptUserName;
             SealBoxId = sealBoxId;
+            NowDateTime = DateTime.Now;
             this.UpdateLayout();
         }
 
@@ -47,6 +48,7 @@ namespace BBWY.Client.Views.SealBox
 
         public string AcceptUserName { get; set; }
 
+        public DateTime? NowDateTime { get; set; }
         public long SealBoxId { get; set; }
 
         public void PrintBox(string printName)
@@ -62,6 +64,8 @@ namespace BBWY.Client.Views.SealBox
                 System.Windows.MessageBox.Show("打印机处于错误状态");
                 return;
             }
+            NowDateTime = DateTime.Now;
+            this.UpdateLayout();
             MyPrintHelper.SetDefaultPrint(printName);//设置默认打印机
             PrintDialog printDialog = new PrintDialog();
             printDialog.PrintTicket.PageOrientation = PageOrientation.Portrait;//设置为横向打印 PageOrientation.Landscape   Portrait为纵向
diff --git a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs
index 64d83d56..4bfe36b3 100644
--- a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs
+++ b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs
@@ -169,7 +169,7 @@ namespace BBWY.Client.Views.SealBox
             App.Current.Dispatcher.Invoke(new Action(() =>
             {
                 SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId, SealBoxModel.AcceptUserName);
-                //policyDetailsWindow.Show();
+                
                 policyDetailsWindow.PrintBox(PrintName);
             }));