From 4357045982dd942058ce65c7e1488c381425f1a0 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: Tue, 28 Mar 2023 15:50:02 +0800
Subject: [PATCH] setpackService

---
 BBWY.Client/APIServices/PackTaskService.cs    |  2 +-
 BBWY.Client/Models/PackTask/PackItemModel.cs  |  7 +++--
 .../PackTask/PackServiceViewModel.cs          | 30 +++++++++++--------
 BBWY.Client/Views/PackTask/ServiceWindow.xaml |  6 ++--
 .../Views/PackTask/ServiceWindow.xaml.cs      |  1 -
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/BBWY.Client/APIServices/PackTaskService.cs b/BBWY.Client/APIServices/PackTaskService.cs
index 2b387edb..79c2c913 100644
--- a/BBWY.Client/APIServices/PackTaskService.cs
+++ b/BBWY.Client/APIServices/PackTaskService.cs
@@ -95,7 +95,7 @@ namespace BBWY.Client.APIServices
         {
             HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost);
 
-            string url = $"{globalContext.QKApiHost}/api/PackTask/SearchProduct?skuId={skuId}&ShopId={globalContext.User.Shop.ShopId.ToString()}";
+            string url = $"{globalContext.QKApiHost}/api/PackTask/SearchProduct?skuId={skuId}&ShopId={globalContext.User.Shop.ShopId}";
             var data = helper.Get(url);
 
             return JsonConvert.DeserializeObject<ApiResponse<ProductSkuResponse>>(data);
diff --git a/BBWY.Client/Models/PackTask/PackItemModel.cs b/BBWY.Client/Models/PackTask/PackItemModel.cs
index 15c9c57b..5109d401 100644
--- a/BBWY.Client/Models/PackTask/PackItemModel.cs
+++ b/BBWY.Client/Models/PackTask/PackItemModel.cs
@@ -53,15 +53,18 @@ namespace BBWY.Client.Models.PackTask
             )
         {
            
-            DeleteServiceCommand = new RelayCommand<ObservableCollection<PackItemModel>>(DeleteService);
+            DeleteServiceCommand = new RelayCommand<object>(DeleteService);
            this. IncreateServiceList = IncreateServiceList;
             this.PackServiceList = PackServiceList;
             this.MemberList = MemberList;
             this.ConsumableList = ConsumableList;        
         }
 
-        private void DeleteService(ObservableCollection<PackItemModel> list)
+        private void DeleteService(object obj)
         {
+            ObservableCollection<PackItemModel> list= obj as ObservableCollection<PackItemModel>;
+
+
             list.Remove(this);
 
         }
diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
index 3aef80c8..719c9e38 100644
--- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
@@ -39,13 +39,18 @@ namespace BBWY.Client.ViewModels.PackTask
 
         public ICommand SetAllCountCommand { get; set; }
 
+        readonly PackTaskService packTaskService;
+        readonly ConsumableService consumableService;
+        private ObservableCollection<PackItemModel> increateList = new ObservableCollection<PackItemModel>();
+        public ObservableCollection<PackItemModel> IncreateList { get => increateList; set { Set(ref increateList, value); } } //
 
-        PackTaskService packTaskService;
-        ConsumableService consumableService;
+        private ObservableCollection<PackItemModel> 
+            packList  = new ObservableCollection<PackItemModel>();
+        public ObservableCollection<PackItemModel> PackList { get => packList; set { Set(ref packList, value); } } //
 
-        public ObservableCollection<PackItemModel> IncreateList { get; set; } = new ObservableCollection<PackItemModel>();
-        public ObservableCollection<PackItemModel> PackList { get; set; } = new ObservableCollection<PackItemModel>();
-        public ObservableCollection<PackItemModel> ConsumableServiceList { get; set; } = new ObservableCollection<PackItemModel>();
+        private ObservableCollection<PackItemModel>
+            consumableServiceList = new ObservableCollection<PackItemModel>();
+        public ObservableCollection<PackItemModel> ConsumableServiceList { get => consumableServiceList; set { Set(ref consumableServiceList, value); } } //
 
 
 
@@ -54,9 +59,9 @@ namespace BBWY.Client.ViewModels.PackTask
         public ObservableCollection<ConsumableModel> ConsumableList { get; set; } = new ObservableCollection<ConsumableModel>();
         public ObservableCollection<WorkProcessModel> PackServiceList { get; set; } = new ObservableCollection<WorkProcessModel>();
 
-       
-        
-        IncreateServiceService increateService;
+
+        readonly WorkProcessService workProcessService;
+        readonly IncreateServiceService increateService;
         public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateService, long taskId)
         {
             TaskId = taskId;
@@ -68,7 +73,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
-            var increateRes = increateService.SearchAll();
+            var increateRes = this.increateService.SearchAll();
             if (increateRes.Success)
             {
                 if (increateRes.Data != null && increateRes.Data.Count() > 0)
@@ -84,7 +89,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 }
             }
 
-            var result = workProcessService.SearchAll();
+            var result = this.workProcessService.SearchAll();
             if (result.Success)
             {
                 if (result.Data != null && result.Data.Count() > 0)
@@ -100,7 +105,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 }
             }
 
-            var res = packTaskService.GetPackMembers();
+            var res = this.packTaskService.GetPackMembers();
             if (res.Success)
             {
                 foreach (var item in res.Data)
@@ -134,7 +139,6 @@ namespace BBWY.Client.ViewModels.PackTask
                             Length = item.Length,
                             Heigth = item.Heigth,
                             Id = item.Id
-
                         });
                     });
                 }
@@ -584,7 +588,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 ItemCount = TaskCount
             });
         }
-        WorkProcessService workProcessService;
+
         private void AddIncreateService()
         {
             IncreateList.Add(new PackItemModel(IncreateServiceList, MemberList)
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
index 9231e4cd..385726dc 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@@ -59,7 +59,7 @@
                 <Label Content="操作" Width="40" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="303,56,0,0" />
 
                 <StackPanel Grid.Row="1" Orientation="Vertical" MaxHeight="140" Width="322" Margin="19,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"  Background="Transparent">
-                    <ListBox ItemsSource="{Binding   IncreateList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                    <ListBox ItemsSource="{Binding   IncreateList}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
                      BorderThickness="1,1,1,0" MaxHeight="100"
                      Foreground="{StaticResource Text.Color}"
@@ -118,7 +118,7 @@
 
                 <StackPanel Grid.Row="1" Orientation="Vertical" MaxHeight="140" Width="322" Margin="19,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"  Background="Transparent">
                     <ListBox
-                        ItemsSource="{Binding PackList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" MaxHeight="100"
+                        ItemsSource="{Binding PackList}" MaxHeight="100"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
                      BorderThickness="1,1,1,0"
@@ -182,7 +182,7 @@
 
                 <StackPanel Grid.Row="1" Orientation="Vertical" MaxHeight="160" Width="260" Margin="19,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"  Background="Transparent">
                     <ListBox MaxHeight="120" Name="consumable_listBox"
-                        ItemsSource="{Binding ConsumableServiceList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                        ItemsSource="{Binding ConsumableServiceList}"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
                      BorderThickness="1,1,1,0"
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs
index 91134e38..827dfa6e 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs
@@ -35,7 +35,6 @@ namespace BBWY.Client.Views.PackTask
             this.workProcessService = workProcessService;
             this.packTaskService = packTaskService;
             this.increateService = increateService;
-            
             model = new PackServiceViewModel(packTaskService, consumableService, workProcessService, increateService, taskId);
             model.TaskId = taskId;
             model.TaskCount = taskCount;