From ec5da9f2ba6f975cd0daeb48cbb0f9f8a769badf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=9E=E5=9D=A4=20=E6=9E=97?= <506583276@qq.com>
Date: Wed, 29 Mar 2023 20:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/PackTask/ConsumableModel.cs        | 21 ++++++++++++++++---
 BBWY.Client/Models/PackTask/PackTaskModel.cs  |  8 +++++--
 .../PackTask/ConsumableViewModel.cs           |  2 +-
 BBWY.Client/Views/PackTask/Consumable.xaml    |  2 +-
 .../Views/PackTask/PrintWindow.xaml.cs        | 10 +++------
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/BBWY.Client/Models/PackTask/ConsumableModel.cs b/BBWY.Client/Models/PackTask/ConsumableModel.cs
index 3b86bab8..5437d1b1 100644
--- a/BBWY.Client/Models/PackTask/ConsumableModel.cs
+++ b/BBWY.Client/Models/PackTask/ConsumableModel.cs
@@ -46,7 +46,7 @@ namespace BBWY.Client.Models.PackTask
                 return;
             }
             ApiResponse<object> res = null;
-            if (Id > 0)
+            if (Id > 0)//修改
             {
                 res = consumableService.Edit(new ConsuableRequest
                 {
@@ -80,7 +80,11 @@ namespace BBWY.Client.Models.PackTask
             if (res != null && res.Success)
             {
                 var win = obj as System.Windows.Window;
-                if (ReflashDatas != null) ReflashDatas();
+
+                ViewModelLocator viewModel = new ViewModelLocator();
+                var con = viewModel.Consumable;
+                con.SearchConsumable();
+                //if (ReflashDatas != null) ReflashDatas();
                 win.Close();
             }
             else
@@ -94,6 +98,9 @@ namespace BBWY.Client.Models.PackTask
             var res = consumableService.Deleted(Id);
             if (res.Success)
             {
+                ViewModelLocator viewModel = new ViewModelLocator();
+                var con = viewModel.Consumable;
+                con.SearchConsumable();
                 list.Remove(this);
             }
         }
@@ -102,7 +109,15 @@ namespace BBWY.Client.Models.PackTask
 
         public void EditConsumable()
         {
-            EditConsumable add = new EditConsumable(this);
+            EditConsumable add = new EditConsumable(new ConsumableModel(consumableService) { 
+             Heigth=this.Heigth, Length=this.Length,
+              Id=this.Id, Name=this.Name, Weigth=this.Weigth,
+               Remark = this.Remark,
+               Width = this.Width ,
+                Price = this.Price 
+             
+            });
+          
             add.Show();
         }
 
diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs
index d52e40e4..5f988637 100644
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@@ -45,7 +45,7 @@ namespace BBWY.Client.Models
         public ICommand UpdateTaskCommand { get; set; }
 
         /// <summary>
-        /// 修改任务
+        /// 删除任务
         /// </summary>
         public ICommand DeletedTaskCommand { get; set; }
 
@@ -208,8 +208,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();
             }
         }
         /*
diff --git a/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs b/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs
index 24c90e2c..9ffbed11 100644
--- a/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs
@@ -82,7 +82,7 @@ namespace BBWY.Client.ViewModels.PackTask
         }
 
 
-        private void SearchConsumable()
+        public void SearchConsumable()
         {
             Task.Factory.StartNew(() =>
             {
diff --git a/BBWY.Client/Views/PackTask/Consumable.xaml b/BBWY.Client/Views/PackTask/Consumable.xaml
index 747cc362..14ce767d 100644
--- a/BBWY.Client/Views/PackTask/Consumable.xaml
+++ b/BBWY.Client/Views/PackTask/Consumable.xaml
@@ -155,7 +155,7 @@
                                 </Grid>
                                 <Grid Grid.Column="5">
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <c:BButton Background="Transparent" Foreground="Blue" Content="编辑" Command="{Binding EditConsumableCommand}" Margin="0 0 10 0"/>
+                                        <c:BButton Background="Transparent" Foreground="Blue" Content="编辑" Command="{Binding EditConsumableCommand}" CommandParameter="" Margin="0 0 10 0"/>
                                         <c:BButton Background="Transparent" Foreground="Blue" Content="删除" Command="{Binding DeletedConsumableCommand}"
                                                   CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}, Path=ItemsSource}"
                                                    />
diff --git a/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs b/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
index b1219dc4..66490a03 100644
--- a/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
@@ -145,15 +145,11 @@ namespace BBWY.Client.Views.PackTask
         private void BButton_Click(object sender, RoutedEventArgs e)
         {
 
-
+            int printCount = Convert.ToInt32(tbCount.Text);
+            string printName = cbPrints.Text;//选择的要打印的打印机名称
             Task.Factory.StartNew(() => { 
             try
-            {
-                //string appPath = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-                //string path = appPath + $"/Resources/LabelNames/{LabelName}.btw";
-
-                int printCount = Convert.ToInt32(tbCount.Text);//份数
-                string printName = cbPrints.Text;//选择的要打印的打印机名称
+            {    
                 PrintDocument pd = new PrintDocument();
                 PrintDocument document = new PrintDocument();
                 document.PrinterSettings.PrinterName = printName;