Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10232";
+            ClientVersion = "10234";
         }
 
 

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);
         }
     }
 }

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="20 0 0 0"/>
                 <TextBlock Text="{Binding ShopName}"/>
 
-                <TextBlock Text="仓库:" Margin="50 0 0 0"/>
+                <TextBlock Text="仓库:" Margin="20 0 0 0"/>
                 <TextBlock Text="{Binding WareName}"/>
 
-                <TextBlock Text="对接人:" Margin="50 0 0 0"/>
+                <TextBlock Text="对接人:" Margin="20 0 0 0"/>
                 <TextBlock Text="{Binding AcceptUserName}"/>
 
+                <TextBlock Text="打印时间:" Margin="20 0 0 0"/>
+                <TextBlock Text="{Binding NowDateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+
             </StackPanel>
 
             <Grid Grid.Row="2" >

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为纵向