From 175889f2bd727da7277977d998d91d5ced2ef200 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 4 Sep 2023 18:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=AE=8C=E7=BB=93=E6=94=B9=E6=88=90sk?=
 =?UTF-8?q?u=E9=9A=90=E8=97=8F=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                  |  2 +-
 .../SealBox/GetWareWaitCompletedResponse.cs   |  4 +-
 .../PackTask/WareHouseListViewModel.cs        | 34 ++++++-
 .../Views/PackTask/WaitCompletedControl.xaml  | 95 ++++++++++++-------
 4 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index deb6db8c..d06b4723 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 = "10178";
+            ClientVersion = "10179";
         }
 
         private User user;
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
index ea042f66..930b5742 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
@@ -41,10 +41,12 @@ namespace BBWY.Client.Models.APIModel
         public string AcceptUserNames { get; set; }
 
 
+
+        private List<WaitTransportSku> waitTransportSkus;
         /// <summary>
         /// sku列表
         /// </summary>
-        public List<WaitTransportSku> WaitTransportSkus { get; set; }
+        public List<WaitTransportSku> WaitTransportSkus { get => waitTransportSkus; set {Set(ref waitTransportSkus,value); } }
 
     }
 }
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 8934cc58..00f1f9fe 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -309,8 +309,10 @@ namespace BBWY.Client.ViewModels.PackTask
         /// 待完结列表
         /// </summary>
         public ObservableCollection<WareWaitCompleted> WaitCompletedList { get => waitCompletedList; set { Set(ref waitCompletedList, value); } }
-      
-        
+
+        public List<WareWaitCompleted> WaitCompleteds { get; set; }
+
+
         private ObservableCollection<WareWaitTransport> waitTransportList;
         /// <summary>
         /// 待转运列表
@@ -672,6 +674,21 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
             LoadTransportSkuDataCommand = new RelayCommand<WareWaitTransport>(LoadTransportSkuData);
+
+            LoadCompletedSkuDataCommand = new RelayCommand<WareWaitCompleted>(LoadCompletedSkuData);
+        }
+
+        private void LoadCompletedSkuData(WareWaitCompleted model)
+        {
+            if (model.WaitTransportSkus == null || model.WaitTransportSkus.Count <= 0)
+            {
+                var skuDatas = WaitCompleteds.SingleOrDefault(w => w.SealBoxId == model.SealBoxId);
+                WaitCompletedList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId).WaitTransportSkus = skuDatas.WaitTransportSkus;
+            }
+            else
+            {
+                WaitCompletedList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId).WaitTransportSkus = null;
+            }
         }
 
         private void LoadTransportSkuData(WareWaitTransport model)
@@ -1237,6 +1254,13 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public ICommand LoadTransportSkuDataCommand { get; set; }
 
+
+
+
+        /// <summary>
+        /// 待完结
+        /// </summary>
+        public ICommand LoadCompletedSkuDataCommand { get; set; }
         /// <summary>
         /// 完成封箱
         /// </summary>
@@ -1422,17 +1446,21 @@ namespace BBWY.Client.ViewModels.PackTask
                 stopwatch.Start();
                 if (TaskState == Models.TaskState.待出库)
                 {
+                    PageSize = 20;
                     WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
                     var datas = sealBoxService.GetWareWaitCompletedList(null, SearchShopName, taskId, SearchSkuId, sealBoxId, PageIndex, PageSize);
                     if (datas != null && datas.Data != null && datas.Success)
                     {
                         var dataModel = datas.Data;
                         OrderCount = dataModel.TotalCount;
+                        WaitCompleteds = dataModel.WareWaitCompleteds;
                         foreach (var item in dataModel.WareWaitCompleteds)
                         {
+                            var skuItem = item.Copy();
+                            skuItem.WaitTransportSkus = null;//默认不加载
                             App.Current.Dispatcher.BeginInvoke(new Action(() =>
                             {
-                                WaitCompletedList.Add(item);
+                                WaitCompletedList.Add(skuItem);
                             }));
 
                         }
diff --git a/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml b/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
index 1ec74bbf..b3861a9f 100644
--- a/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
@@ -128,10 +128,10 @@
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
-                              MinHeight="100">
+                              >
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="30"/>
-                                <RowDefinition  MinHeight="90"/>
+                                <RowDefinition  />
                             </Grid.RowDefinitions>
                             <Grid Background="#F2F2F2" >
                                 <Grid.ColumnDefinitions>
@@ -142,38 +142,65 @@
                                     <ColumnDefinition MinWidth="80"/>
                                     <ColumnDefinition Width="100"/>
                                 </Grid.ColumnDefinitions>
-                                <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
-                                    <TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
-                                    <c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding SealBoxId}"
-                                                                   Margin=" 5,0,7,0"/>
-                                    <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
-                                    <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ShopName}"
-                                                                   Margin=" 5,0,7,0"/>
-
-
-                                    <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
-                                    <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding WareName}"
-                                                                   Margin=" 5,0,7,0"/>
-
-
-                                    <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
-                                    <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding DepartmentName}"
-                                                                   Margin=" 5,0,0,0"/>
+                                <Grid  Grid.Column="0" Grid.ColumnSpan="11">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="200"/>
+                                        <ColumnDefinition Width="200"/>
+                                        <ColumnDefinition Width="200"/>
+                                        <ColumnDefinition Width="200"/>
+                                        <ColumnDefinition Width="200"/>
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <StackPanel Orientation="Horizontal" Grid.Column="0">
+                                        <TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
+                                        <c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding SealBoxId}"
+                                    Margin=" 5,0,7,0"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                        <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
+                                        <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding ShopName}"
+                                    Margin=" 5,0,7,0"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Grid.Column="2">
+                                        <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
+                                        <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                   CommandParameter="{Binding WareName}"
+                                   Margin=" 5,0,7,0"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Grid.Column="3">
+                                        <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
+                                        <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding DepartmentName}"
+                                    Margin=" 5,0,0,0"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Grid.Column="4">
+                                        <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
+                                        <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
+                                    </StackPanel>
+
+                                </Grid>
+
+                                <c:BButton Grid.Column="0" Grid.ColumnSpan="6"   HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1" Background="Transparent"
+ Command="{Binding DataContext.LoadCompletedSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+      CommandParameter="{Binding}"
+/>
+                                <Grid Grid.Column="5" Panel.ZIndex="-2">
+                                    <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding WaitTransportSkus,Converter={StaticResource objConverter},ConverterParameter=#null:∧:∨}"   FontWeight="Bold"
+Foreground="{StaticResource Text.Link.Color}" FontSize="18"
+     />
+                                </Grid>
 
-                                    <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
-                                    <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
-                                </StackPanel>
 
                             </Grid>
-                            <Grid Grid.Row="1">
+                            <Grid Grid.Row="1"  Visibility="{Binding WaitTransportSkus,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
                                     <RowDefinition />
@@ -192,7 +219,7 @@
                                          ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
-                                            <Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid  Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
                                                 <Grid>
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="90"/>
@@ -267,8 +294,8 @@
                                                                   Margin=" 5,0,0,0"/>-->
                                                         </StackPanel>
                                                         <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,10,0,5">
-                                                            
-                                                            
+
+
                                                             <TextBlock Foreground="{StaticResource Text.Gray}">
                                                             <Run Text="任务ID:" />
                                                             </TextBlock>