1

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -204,8 +204,12 @@ namespace BBWY.Client.Models
             var model = packTaskService.UpdateTaskStatus(taskId, 1);
             if (model != null && model.Success)
             {
+
+                ViewModelLocator viewModelLocator = new ViewModelLocator();
+               var wareHouse =  viewModelLocator.WareHouseList;
+                wareHouse.SearchTaskList();
                 this.TaskStatus = TaskStateType.已完成;
-                new TipsWindow("修改成功").Show();
+               // new TipsWindow("修改成功").Show();
             }
         }
         /* 拼接模板数据

BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs

@@ -54,18 +54,12 @@ namespace BBWY.Client.ViewModels.PackTask
         public ICommand SearchConsumableCommand { get; set; }
         private readonly ConsumableService consumableService;
 
-
-
-
-        // public Action ReflashDatas { get; set; }
-
         public ConsumableViewModel(ConsumableService consumableService)
         {
 
 
             this.consumableService = consumableService;
             ConsumableModel = new ConsumableModel(consumableService);
-            // ConsumableModel.ReflashDatas = ReflashDatas;
             ConsumableList = new ObservableCollection<ConsumableModel>();
             AddConsumableCommand = new RelayCommand(AddConsumable);
             SearchConsumableCommand = new RelayCommand(SearchConsumable);

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10085" Margin="5,0,0,0"/>
+                <TextBlock Text="v10086" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Client/Views/PackTask/PrintWindow.xaml.cs

@@ -176,7 +176,8 @@ namespace BBWY.Client.Views.PackTask
 
         private void Document_PrintPage(object sender, PrintPageEventArgs args)
         {
-
+            //RectangleF bounds = new RectangleF(0, 0, 236, 157);
+            //args.Graphics.SetClip(bounds);//设置打印区域
 
             Font font = new Font("宋体", 6, System.Drawing.FontStyle.Regular);
             if (barCodeModel!=null)