1

BBWY.Client/APIServices/QiKu/SealBoxService.cs

@@ -104,14 +104,15 @@ namespace BBWY.Client.APIServices
 
 
 
-        public ApiResponse<bool> WareCompeteSealBox(long SealBoxId, int? BoxCount)
+        public ApiResponse<bool> WareCompeteSealBox(long SealBoxId, int? BoxCount )
         {
             return SendRequest<bool>(globalContext.QKApiHost, $"api/SealBox/WareCompeteSealBox",
                new
                {
                    SealBoxId,
                    BoxCount
-               }
+
+}
                 , null, HttpMethod.Post);
         }
         /// <summary>

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10135";
+            ClientVersion = "10136";
         }
 
         private User user;

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -825,18 +825,10 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public void CreateTask()
         {
-
-
-
             PublishTaskWindow publish = new PublishTaskWindow(ReflashTask);
             publish.Show();
         }
 
-
-
-
-
-
         /// <summary>
         /// 弹出条形码可视化界面
         /// </summary>

BBWY.Client/Views/PackTask/TaskList.xaml

@@ -120,7 +120,7 @@
                              />
 
 
-                <RadioButton Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检"   
+                <RadioButton Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待验收"   
                              IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:True:False}" 
                              />
 

BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@@ -454,7 +454,7 @@
                                                    
                                                    Visibility="Visible" />
 
-                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="质检" 
+                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收" 
                                                    Command="{Binding QualityTaskCommand}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}" 
                                                     />

BBWY.Client/Views/PackTask/WareHouseList.xaml

@@ -176,7 +176,7 @@
                               IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:True:False}" 
                               />
 
-                <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待出库" Tag="{Binding WaitOutbound,Mode=TwoWay}"
+                <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待完结" Tag="{Binding WaitOutbound,Mode=TwoWay}"
                               IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:True:False}" 
                               />
 

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -473,7 +473,7 @@
                             </Grid>
                             <Grid Grid.Column="9" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="质检" 
+                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收" 
                                                    Command="{Binding QualityTaskCommand}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}" 
                                                     />

BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@@ -486,7 +486,7 @@
                             </Grid>-->
                             <Grid Grid.Column="12" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="质检" 
+                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收" 
                                                    Command="{Binding QualityTaskCommand}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}" 
                                                     />