diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 0858d256..8934cc58 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -1107,19 +1107,7 @@ namespace BBWY.Client.ViewModels.PackTask private void SetSealBox(object obj) { - var model = (SealBoxModel)obj; - if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState.待验收 || s.TaskState == Models.TaskState.待包装)) - { - System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务"); - return; - } - - SetSealBoxWindow setSealBoxWindow = new SetSealBoxWindow(); - setSealBoxWindow.SendBoxCount = boxCount => - { - model.SealBoxCount = boxCount; - }; - setSealBoxWindow.ShowDialog(); + } @@ -1255,28 +1243,43 @@ namespace BBWY.Client.ViewModels.PackTask /// private void CompeteSealBox(object obj) { - var model = (SealBoxModel)obj; - if (model.SealBoxCount == null || model.SealBoxCount.Value <= 0) - { - System.Windows.MessageBox.Show("请先设置封箱数量"); - return; - } - var res = sealBoxService.WareCompeteSealBox(model.SealBoxId, model.SealBoxCount); - if (res == null) + var model = (SealBoxModel)obj; + if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState.待验收 || s.TaskState == Models.TaskState.待包装)) { - System.Windows.MessageBox.Show("网络异常", ""); + System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务"); return; } + SetSealBoxWindow setSealBoxWindow = new SetSealBoxWindow(new Action((boxCount) => { - if (!res.Success || !res.Data) - { - System.Windows.MessageBox.Show(res.Msg); - return; - } - SearchTaskList(); + + model.SealBoxCount = boxCount; + + if (model.SealBoxCount == null || model.SealBoxCount.Value <= 0) + { + System.Windows.MessageBox.Show("请先设置封箱数量"); + return; + } + var res = sealBoxService.WareCompeteSealBox(model.SealBoxId, model.SealBoxCount); + if (res == null) + { + System.Windows.MessageBox.Show("网络异常", ""); + return; + } + + + + if (!res.Success || !res.Data) + { + System.Windows.MessageBox.Show(res.Msg); + return; + } + SearchTaskList(); + })); + setSealBoxWindow.ShowDialog(); + } diff --git a/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs b/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs index 5aab0828..0db98aeb 100644 --- a/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs @@ -28,12 +28,12 @@ namespace BBWY.Client.Views.SealBox /// public partial class SetSealBoxWindow : BWindow { - public SetSealBoxWindow() + public SetSealBoxWindow( Action SendBoxCount) { - + this.SendBoxCount = SendBoxCount; InitializeComponent(); } - public Action SendBoxCount { get; set; } + private Action SendBoxCount { get; set; } private void BButton_Click(object sender, RoutedEventArgs e) { int boxCount = 0; diff --git a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml index 4130954d..f9a161c5 100644 --- a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml +++ b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml @@ -303,11 +303,11 @@ > - + />-->