diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 9978f5d2..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 = "10232"; + ClientVersion = "10234"; } 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/SealBoxPolicyDetailsWindow.xaml b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml index a8331b12..4d3e8ec2 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为纵向