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 1/4] =?UTF-8?q?=E5=B0=81=E7=AE=B1=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=B7=BB=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 @@ --> - + - + - + + + + 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); })); From bcc11228c47e27e035baf51aaf9e9af1dd71af77 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:50 +0800 Subject: [PATCH 2/4] 10233 --- BBWY.Client/GlobalContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 9978f5d2..57c63914 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10232"; + ClientVersion = "10233"; } From 188fb863118738b75f3ff4ef5e1103a9fbb48261 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 19:51:11 +0800 Subject: [PATCH 3/4] 10234 --- BBWY.Client/GlobalContext.cs | 2 +- BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml | 8 ++++---- .../Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 57c63914..ad6034e0 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10233"; + ClientVersion = "10234"; } diff --git a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml index 5eec4ee6..4d3e8ec2 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml @@ -34,16 +34,16 @@ --> - + - + - + - + diff --git a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs index 4bfe36b3..7eceb3e4 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs @@ -169,8 +169,8 @@ 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.PrintBox(PrintName); + policyDetailsWindow.Show(); + //policyDetailsWindow.PrintBox(PrintName); })); } From faa2323e253f746fa6fd2c477cf1e90ad9a70899 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 19:52:57 +0800 Subject: [PATCH 4/4] 1 --- BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs | 3 --- BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs b/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs index 06600b46..18e6b210 100644 --- a/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs +++ b/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs @@ -156,9 +156,6 @@ namespace BBWY.Client.Views.FallWare //lSAcceptOrderWindow.Show(); lSAcceptOrderWindow.PrintLSOrder(PrintName); }); - - //SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId); - //policyDetailsWindow.PrintBox(PrintName); } } } diff --git a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs index 7eceb3e4..64d83d56 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs @@ -169,8 +169,8 @@ 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); + //policyDetailsWindow.Show(); + policyDetailsWindow.PrintBox(PrintName); })); }