封箱落仓展示任务状态

BBWY.Client/BBWYAppSettings.json

@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  "QKApiHost": "http://localhost:8080"
-  //  "QKApiHost": "http://qiku.qiyue666.com"
+  //"QKApiHost": "http://localhost:8080"
+  "QKApiHost": "http://qiku.qiyue666.com"
 }

BBWY.Client/GlobalContext.cs

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

BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs

@@ -97,5 +97,10 @@ namespace BBWY.Client.Models.APIModel
         /// </summary>
         public int SkuCount { get; set; }
 
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public TaskState? TaskState { get; set; }
+
     }
 }

BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs

@@ -82,6 +82,11 @@ namespace BBWY.Client.Models.APIModel
         /// (任务的sku产品数量)
         /// </summary>
         public int SkuCount { get; set; }
+
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public TaskState TaskState { get; set; }
     }
 
 }

BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs

@@ -76,10 +76,10 @@ namespace BBWY.Client.Models.APIModel
     public class WaitTransportSku
     {
         public DateTime? CreateTime { get; set; }
-        ///// <summary>
-        ///// 任务状态
-        ///// </summary>
-        //public TaskState? TaskState { get; set; }
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public TaskState? TaskState { get; set; }
         /// <summary>
         /// 任务Id
         /// </summary>

BBWY.Client/Views/FallWare/WaitFallWareControl.xaml

@@ -222,7 +222,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,0,0"/>
                                                     </StackPanel>
-
+                                                    <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
+        <Run Text="任务状态:"/>
+        <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包装:Red:black}" Text="{Binding TaskState}"/>
+                                                    </TextBlock>
                                                 </StackPanel>
 
                                             </Grid>
@@ -260,7 +263,7 @@
 
                             <Grid Grid.Column="2" >
 
-                              
+
                                 <StackPanel Orientation="Vertical" VerticalAlignment="Center"  HorizontalAlignment="Center"
                                             >
                                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center"

BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml

@@ -211,10 +211,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,0,0"/>
                                                         </StackPanel>
-                                                        <!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
+                                                        <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
                                                             <Run Text="任务状态:"/>
                                                             <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包装:Red:black}" Text="{Binding TaskState}"/>
-                                                    </TextBlock>-->
+                                                    </TextBlock>
 
                                                     </StackPanel>