From f1e2d8016c24c8273366e560e9eec6306ba8962e Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 21 May 2023 15:15:19 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Models/PackTask/PackTaskModel.cs  | 27 +++++++++++++++++--
 .../QualityTask/QualityViewModel.cs           |  1 -
 .../Views/PackTask/WareHouseListControl.xaml  | 14 +++++++++-
 .../Views/QualityTask/QualityWindow.xaml      | 11 +++-----
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs
index 1f2f0dbd..c0db5732 100644
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@@ -2,6 +2,7 @@
 using BBWY.Client.Models.APIModel.Response.PackTask;
 using BBWY.Client.ViewModels;
 using BBWY.Client.Views.PackTask;
+using BBWY.Client.Views.QualityTask;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.Generic;
@@ -35,13 +36,13 @@ namespace BBWY.Client.Models
         public ICommand LookCerCommand { get; set; }
         public ICommand LookBarCommand { get; set; }
         public ICommand SetServiceCommand { get; set; }
-
         /// <summary>
         /// 修改任务
         /// </summary>
         public ICommand UpdateTaskCommand { get; set; }
 
-     
+        public ICommand QualityTaskCommand { get; set; }
+
 
 
         public Action ReflashTask { get; set; }
@@ -85,6 +86,28 @@ namespace BBWY.Client.Models
             LookCerCommand = new RelayCommand(LookCer);
             SetServiceCommand = new RelayCommand(SetService);
             UpdateTaskCommand = new RelayCommand(UpdateTask);
+            QualityTaskCommand=new RelayCommand(QualityTask);
+        }
+
+        private void QualityTask()
+        {
+            QualityWindow service = new QualityWindow();
+            //加载数据
+            ViewModelLocator viewModelLocator = new ViewModelLocator();
+            var qualityViewModel = viewModelLocator.QualityTask;
+            qualityViewModel.TaskCount = SkuCount;
+            qualityViewModel.TaskId = TaskId;
+            qualityViewModel.OrderId = OrderId;
+            qualityViewModel.SkuId = SkuId;
+            qualityViewModel.LoadPackDatas();
+            qualityViewModel.SetAllFees = new Action<FeesItemResponse, List<string>>((feesItem, packUsers) =>
+            {
+                FeesItemResponse = feesItem;
+                PackUser = string.Join("\r\n", packUsers);
+                FeesItemResponse.DiscountAllFees = feesItem.disCount * feesItem.AllFees;
+                IsShowFees = feesItem.AllFees > 0 ? true : false;
+            });
+            service.Show();
         }
 
         private void SetService()
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index bd8e0a7b..ba6b5dbd 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -339,7 +339,6 @@ namespace BBWY.Client.ViewModels
 
         public ICommand OpenSkuDetailCommand { get; set; }
         public ICommand CreateTaskCommand { get; set; }
-
         public ICommand SearchSkuCommand { get; set; }
 
         private void SetBarCode()
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 85c0bad7..c61bda2c 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -574,10 +574,22 @@
                                     <Grid Grid.Row="1" >
                                         <Border Grid.Row="0" VerticalAlignment="Top" Height="1"  Background="{StaticResource Border.Brush}"/>
 
-                                        <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="White"   Foreground="Black" Grid.Row="1"  Content="设置" 
+                                        <StackPanel Orientation="Vertical">
+                                            <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="White"   Foreground="Black" Grid.Row="1"  Content="设置" 
                                                    Command="{Binding SetServiceCommand}"
                                                    
                                                    Visibility="Visible" />
+
+                                            <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="White"   Foreground="Black" Grid.Row="1"  Content="设置" 
+                                                   Command="{Binding SetServiceCommand}"
+                                                   
+                                                    />
+                                            <!--Visibility="{Binding Availability,Converter={StaticResource objConverter},ConverterParameter=已到货:Visible:Collapsed}"-->
+
+                                        </StackPanel>
+                                       
+                                        
+                                        
                                     </Grid>
                                 </Grid>
                             </Grid>
diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml
index d8b00898..5bacd36b 100644
--- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml
+++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml
@@ -13,7 +13,7 @@
         MinButtonVisibility="Collapsed"
         MaxButtonVisibility="Collapsed"
         RightButtonGroupMargin="0,5,5,0"
-        Height="800" Width="1305">
+        Height="700" Width="1305">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -37,7 +37,7 @@
         </Grid.RowDefinitions>
         <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
         <Grid Background="{StaticResource Border.Background}">
-            <TextBlock Text="质检打包信息" VerticalAlignment="Center" HorizontalAlignment="Center" />
+            <TextBlock Text="质检任务信息" VerticalAlignment="Center" HorizontalAlignment="Center" />
         </Grid>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
@@ -290,7 +290,7 @@
                     </Grid>
 
                     <TextBlock Text="打包配置" FontWeight="Bold" FontSize="13" Margin="20 23 "  HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                    <Grid Height="70"   Margin="20 54 20 0">
+                    <Grid Height="70"   Margin="20 20 20 0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="77"/>
                             <ColumnDefinition Width="77"/>
@@ -344,9 +344,6 @@
 
 
                         <Grid Grid.Row="1" Grid.Column="4">
-                            <Grid.Resources>
-
-                            </Grid.Resources>
                             <hc:CheckComboBox  BorderThickness="0"  IsTextSearchEnabled="True" ItemsSource="{Binding IncreateList}" 
                                       ShowClearButton="True"
                                       MinWidth="90"
@@ -389,7 +386,7 @@
         </Grid>
         <Grid Grid.Row="2">
 
-            <c:BButton Content="保存" Width="100"  HorizontalAlignment="Right"  VerticalAlignment="Stretch" Margin="0,2,19,2" 
+            <c:BButton Content="完成质检" Width="100"  HorizontalAlignment="Right"  VerticalAlignment="Stretch" Margin="0,2,19,2" 
                     Command="{Binding CreateTaskCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
                     Background="{StaticResource  Button.Selected.Background}" BorderThickness="0" Foreground="White"/>