1

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -39,9 +39,9 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
-        
 
-             private string searchShopName;
+
+        private string searchShopName;
         public string SearchShopName
         {
             get => searchShopName; set
@@ -237,7 +237,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         }
 
-        
+
         #region 事件绑定
 
         public ICommand SetTaskStatusCommand { get; set; }
@@ -281,7 +281,7 @@ namespace BBWY.Client.ViewModels.PackTask
         {
             var objList = (object[])obj;
             long taskId = (long)objList[0];
-            var  packTaskState = (PackTaskState)objList[1];
+            var packTaskState = (PackTaskState)objList[1];
 
             ApiResponse<object> res = null;
             switch (packTaskState)
@@ -293,7 +293,15 @@ namespace BBWY.Client.ViewModels.PackTask
                 case PackTaskState.待质检:
                     break;
                 case PackTaskState.待打包:
-                    res= packTaskService.SetPackTaskState(taskId, PackTaskState.待封箱);
+
+                    var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId);
+                    if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0)
+                    {
+                        System.Windows.MessageBox.Show("请先设置打包费用!");
+                        return;
+                    }
+
+                    res = packTaskService.SetPackTaskState(taskId, PackTaskState.待封箱);
                     break;
                 case PackTaskState.待封箱:
                     break;
@@ -306,11 +314,11 @@ namespace BBWY.Client.ViewModels.PackTask
                 default:
                     break;
             }
-            if (res!=null&&res.Success)
+            if (res != null && res.Success)
             {
                 SearchTaskList();
             }
-            
+
 
         }
         public void SetTaskStatus(object obj)
@@ -373,7 +381,7 @@ namespace BBWY.Client.ViewModels.PackTask
         {
             try
             {
-                if  (SearchTaskId != null && !string.IsNullOrEmpty(SearchTaskId.Trim()))
+                if (SearchTaskId != null && !string.IsNullOrEmpty(SearchTaskId.Trim()))
                     Convert.ToInt64(SearchTaskId);
             }
             catch

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10109" Margin="5,0,0,0"/>
+                <TextBlock Text="v10110" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">