From 88e8a45af9141083f91ef888341134661034beec Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 29 May 2023 13:50:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AB=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/BBWYAppSettings.json              |  4 ++--
 .../PackTask/WareHouseListViewModel.cs        | 10 ++++++--
 .../Views/PackTask/WareHouseListControl.xaml  | 23 +++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index ef760e08..0bc0e98f 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/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 955b182e..14cc413c 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -341,8 +341,14 @@ namespace BBWY.Client.ViewModels.PackTask
             switch (packTaskState)
             {
                 case PackTaskState.未到货:
-                    break;
                 case PackTaskState.部分到货:
+
+                    if (System.Windows.MessageBox.Show("是否确认收货?","提示",
+                                  MessageBoxButton.YesNo,
+                                  MessageBoxImage.Warning) != MessageBoxResult.Yes)
+                        return;
+
+                    res = packTaskService.SetPackTaskState(taskId, PackTaskState.待质检);
                     break;
                 case PackTaskState.待质检:
                     break;
@@ -498,7 +504,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 {
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
-                    var datas = packTaskService.GetWareHouseList(SearchWayBillNo,SearchExpressName,IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName,
+                    var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName,
                         PageIndex, PageSize);
                     if (datas != null && datas.Data != null && datas.Success)
                     {
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index dc000639..806b6e4e 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -454,6 +454,29 @@
                                             </b:EventTrigger>
                                         </b:Interaction.Triggers>
                                     </c:BButton>
+                                    <Grid
+                                        Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" 
+                                        >
+
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="确认收货" 
+                                                Visibility="{Binding OrderId,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" 
+                                               >
+                                            <b:Interaction.Triggers>
+                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                    <b:InvokeCommandAction Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                        <b:InvokeCommandAction.CommandParameter>
+                                                            <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                <Binding Path="TaskId" />
+                                                                <Binding Path="TaskState"/>
+                                                                <Binding Path="OrderId"/>
+                                                            </MultiBinding>
+                                                        </b:InvokeCommandAction.CommandParameter>
+                                                    </b:InvokeCommandAction>
+                                                </b:EventTrigger>
+                                            </b:Interaction.Triggers>
+                                        </c:BButton>
+
+                                    </Grid>
 
 
                                 </StackPanel>