From deb27f9db7376daa141b478a6bfb23c3c9912f72 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 30 May 2023 12:13:30 +0800
Subject: [PATCH] 1

---
 BBWY.Client/APIServices/PackTaskService.cs     | 18 ++++++++++++++----
 .../PackTask/PackServiceViewModel.cs           |  7 ++++++-
 BBWY.Client/Views/PackTask/ServiceWindow.xaml  |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/BBWY.Client/APIServices/PackTaskService.cs b/BBWY.Client/APIServices/PackTaskService.cs
index 43d2c788..3ee6ced4 100644
--- a/BBWY.Client/APIServices/PackTaskService.cs
+++ b/BBWY.Client/APIServices/PackTaskService.cs
@@ -172,7 +172,12 @@ namespace BBWY.Client.APIServices
 
 
 
-
+        /// <summary>
+        /// 修改任务状态
+        /// </summary>
+        /// <param name="taskId"></param>
+        /// <param name="packTaskState"></param>
+        /// <returns></returns>
         public ApiResponse<object> SetPackTaskState(long taskId, PackTaskState packTaskState)
         {
             return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/SetPackTaskState", new
@@ -200,6 +205,11 @@ namespace BBWY.Client.APIServices
           , null, HttpMethod.Post);
         }
 
+
+        /// <summary>
+        /// 获取打包人员列表
+        /// </summary>
+        /// <returns></returns>
         public ApiResponse<PackUser[]> GetPackMembers()
         {
 
@@ -213,7 +223,7 @@ namespace BBWY.Client.APIServices
         /// <returns></returns>
         public ApiResponse<PackServiceResponse> GetTaskService(long taskId)
         {
-            return SendRequest<PackServiceResponse>(globalContext.QKApiHost, "api/PackTask/GetTaskService", new { TaskId = taskId }
+            return SendRequest<PackServiceResponse>(globalContext.QKApiHost, $"api/PackTask/GetTaskService?TaskId={taskId}",null
          , null, HttpMethod.Get);
         }
         /// <summary>
@@ -297,7 +307,7 @@ namespace BBWY.Client.APIServices
         }
 
         /// <summary>
-        /// 获取封箱列表
+        /// 获取待封箱列表
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
@@ -315,7 +325,7 @@ namespace BBWY.Client.APIServices
         }
 
         /// <summary>
-        /// 获取封箱列表
+        /// 完成封箱
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
index fd65bdd3..40dbfa9c 100644
--- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
@@ -35,7 +35,12 @@ namespace BBWY.Client.ViewModels.PackTask
     {
 
 
-        
+        private decimal? directionalFees;
+        /// <summary>
+        /// 定向费用
+        /// </summary>
+        public decimal? DirectionalFees { get => directionalFees; set { Set(ref directionalFees, value); } }
+
 
         private BitmapImage barcodeImage;
         /// <summary>
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
index 44edf693..112b771a 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@@ -43,8 +43,8 @@
                 <RowDefinition Height="250"/>
             </Grid.RowDefinitions>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="促销折扣:"   HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
-                <c:BTextBox Text="{Binding Discount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100"/>
+                <TextBlock Text="定向收费:"   HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
+                <c:BTextBox Text="{Binding DirectionalFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100"/>
             </StackPanel>
             <Grid Grid.Row="1">
                 <Grid.RowDefinitions>