From d765817863d42eca262f2be8a627e449d14177a3 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 10 Oct 2023 14:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E7=AE=B1=E8=90=BD=E4=BB=93=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/BBWYAppSettings.json                          | 4 ++--
 BBWY.Client/GlobalContext.cs                              | 2 +-
 .../Response/PackTask/SearchWaitSealBoxResponse.cs        | 5 +++++
 .../SealBox/GetWareSealBoxWaitConfigureResponse.cs        | 5 +++++
 .../Response/SealBox/GetWareWaitTransportResponse.cs      | 8 ++++----
 BBWY.Client/Views/FallWare/WaitFallWareControl.xaml       | 7 +++++--
 BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml  | 4 ++--
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index 54bc506c..a46121ab 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/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"
 }
\ No newline at end of file
diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index c8e7d4bb..0ea996ca 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/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;
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
index 6c08fd14..8405fcda 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
+++ b/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; }
+
     }
 }
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
index e574e294..7f8425d2 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
+++ b/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; }
     }
 
 }
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
index 60adea39..bf386efc 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
+++ b/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>
diff --git a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
index 8feb9a9c..4eae0b49 100644
--- a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
+++ b/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"
diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
index 835650c4..bf2cd02f 100644
--- a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
+++ b/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>