diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 9c1d8530..15add704 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -941,21 +941,30 @@ namespace BBWY.Client.ViewModels.PackTask + + + UpdateShelvesNumberCommand = new RelayCommand(UpdateShelvesNumber); + + PrintShelvesNumberCommand = new RelayCommand(PrintShelvesNumber); + + LoadSplitDatas(); + } + + private void LoadSplitDatas() + { if (IsCanPackModelList == null) { var res = packTaskService.GetTaskAbortEnum(); - if (res.Success) + if (res != null && res.Success) { IsCanPackModelList = res.Data.IsCanPackModelList; ShelvesNumberList = res.Data.ShelvesNumberList; FloorNumberList = res.Data.FloorNumberList; } } + } - UpdateShelvesNumberCommand = new RelayCommand(UpdateShelvesNumber); - PrintShelvesNumberCommand = new RelayCommand(PrintShelvesNumber); - } private void PrintShelvesNumber(PackTaskModel model) { @@ -965,9 +974,9 @@ namespace BBWY.Client.ViewModels.PackTask private void UpdateShelvesNumber(PackTaskModel model) { - UpdateShelvesNumberWindow window = new UpdateShelvesNumberWindow(packTaskAbortService, model, ReflashTask, ShelvesNumberList, FloorNumberList); - + LoadSplitDatas(); + UpdateShelvesNumberWindow window = new UpdateShelvesNumberWindow(packTaskAbortService, model, ReflashTask, ShelvesNumberList, FloorNumberList); window.ShowDialog(); } @@ -1009,10 +1018,10 @@ namespace BBWY.Client.ViewModels.PackTask } - + } - public void TaskSplit(PackTaskModel model) + public void TaskSplit(PackTaskModel model) { SplitTaskWindow addExceptionWindow = new SplitTaskWindow(packTaskService, model.TaskId, model.TaskState, ReflashTask); @@ -1292,7 +1301,7 @@ namespace BBWY.Client.ViewModels.PackTask MessageBox.Show(ex.Message); } - + } MarkMessageService markMessageService;