移除设置封箱数量,设置封箱数量合并到完成封箱

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
         /// <param name="obj"></param>
         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<int>((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();
+
 
         }
 

BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs

@@ -28,12 +28,12 @@ namespace BBWY.Client.Views.SealBox
     /// </summary>
     public partial class SetSealBoxWindow : BWindow
     {
-        public SetSealBoxWindow()
+        public SetSealBoxWindow( Action<int> SendBoxCount)
         {
-
+            this.SendBoxCount = SendBoxCount;
             InitializeComponent();
         }
-        public Action<int> SendBoxCount { get; set; }
+        private Action<int> SendBoxCount { get; set; }
         private void BButton_Click(object sender, RoutedEventArgs e)
         {
             int boxCount = 0;

BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

@@ -303,11 +303,11 @@
                                   >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
 
-                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center"
+                                    <!--<c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center"
                                                Content="{Binding SealBoxCount,Converter={StaticResource objConverter},ConverterParameter=#null:设置:修改}" 
                                              Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
                                                CommandParameter="{Binding}"
-                                               />
+                                               />-->