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>(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>(DeleteService); + DeleteServiceCommand = new RelayCommand(DeleteService); this. IncreateServiceList = IncreateServiceList; this.PackServiceList = PackServiceList; this.MemberList = MemberList; this.ConsumableList = ConsumableList; } - private void DeleteService(ObservableCollection list) + private void DeleteService(object obj) { + ObservableCollection list= obj as ObservableCollection; + + 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 increateList = new ObservableCollection(); + public ObservableCollection IncreateList { get => increateList; set { Set(ref increateList, value); } } // - PackTaskService packTaskService; - ConsumableService consumableService; + private ObservableCollection + packList = new ObservableCollection(); + public ObservableCollection PackList { get => packList; set { Set(ref packList, value); } } // - public ObservableCollection IncreateList { get; set; } = new ObservableCollection(); - public ObservableCollection PackList { get; set; } = new ObservableCollection(); - public ObservableCollection ConsumableServiceList { get; set; } = new ObservableCollection(); + private ObservableCollection + consumableServiceList = new ObservableCollection(); + public ObservableCollection ConsumableServiceList { get => consumableServiceList; set { Set(ref consumableServiceList, value); } } // @@ -54,9 +59,9 @@ namespace BBWY.Client.ViewModels.PackTask public ObservableCollection ConsumableList { get; set; } = new ObservableCollection(); public ObservableCollection PackServiceList { get; set; } = new ObservableCollection(); - - - 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 @@