From a0d94fcb26b512a78ed3c268089558d035516ed6 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 5 Sep 2023 16:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=20=E6=94=B9=E6=88=90=E5=B0=81=E7=AE=B1=E6=8A=98=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                  |  2 +-
 .../SealBox/GetWareWaitCompletedResponse.cs   |  3 +
 .../FallWare/FallWareConfiguredModel.cs       | 13 +--
 .../Models/SealBox/SealBoxConfiguredModel.cs  |  6 ++
 .../ViewModels/PackTask/TaskListViewModel.cs  | 79 ++++++++++++++++++-
 .../FallWare/FallWareConfiguredControl.xaml   | 32 ++++++--
 .../FallWareWaitConfigureControl.xaml         | 68 +++++++++++++---
 .../FallWare/WareFallWareListControl.xaml     |  2 +-
 .../PackTask/ShopWaitCompletedControl.xaml    | 19 +++--
 BBWY.Client/Views/PackTask/WareHouseList.xaml | 14 ++--
 .../SealBox/SealBoxConfiguredControl.xaml     | 40 ++++++++--
 .../Views/SealBox/ShopSealBoxListControl.xaml |  2 +-
 12 files changed, 236 insertions(+), 44 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index d06b4723..bc313f8d 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 = "10179";
+            ClientVersion = "10180";
         }
 
         private User user;
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
index 930b5742..8785faf8 100644
--- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
@@ -16,6 +16,9 @@ namespace BBWY.Client.Models.APIModel
 
     public class WareWaitCompleted:NotifyObject
     {
+
+        private bool isHideSkuList = true;//默认隐藏
+        public bool IsHideSkuList { get => isHideSkuList; set { Set(ref isHideSkuList, value); } }
         public long SealBoxId { get; set; }
         /// <summary>
         /// 店铺Id
diff --git a/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs b/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
index 039788c2..0a641742 100644
--- a/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
+++ b/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
@@ -5,10 +5,13 @@ using System.Text;
 
 namespace BBWY.Client.Models.FallWare
 {
-   public class FallWareConfiguredModel:NotifyObject
-    { /// <summary>
-      /// 商品名称
-      /// </summary>
+    public class FallWareConfiguredModel : NotifyObject
+    {
+        private bool isHideSkuList = true;//默认隐藏
+        public bool IsHideSkuList { get => isHideSkuList; set { Set(ref isHideSkuList, value); } }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
         public string ProductTitle { get; set; }
         /// <summary>
         /// 采购单号
@@ -59,7 +62,7 @@ namespace BBWY.Client.Models.FallWare
         private string setPurchaseOrderOverTimeMarkMsg;
         public string SetPurchaseOrderOverTimeMarkMsg { get => setPurchaseOrderOverTimeMarkMsg; set { Set(ref setPurchaseOrderOverTimeMarkMsg, value); } }
 
-  
+
         private string fallWareRemainTime;
         public string FallWareRemainTime { get => fallWareRemainTime; set { Set(ref fallWareRemainTime, value); } }
 
diff --git a/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs b/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs
index 3bf7c6f7..868d4165 100644
--- a/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs
+++ b/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs
@@ -3,12 +3,18 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
+using System.Windows;
 
 namespace BBWY.Client.Models.SealBox
 {
     public class SealBoxConfiguredModel:NotifyObject
     {
+       
+        private bool isHideSealbox = true;//默认隐藏
+        public bool IsHideSealbox { get => isHideSealbox; set { Set(ref isHideSealbox, value); } }
 
+
+        
         private string sealBoxRemainTime;
         public string SealBoxRemainTime { get => sealBoxRemainTime; set { Set(ref sealBoxRemainTime, value); } }
 
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index d477608a..3639782a 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
@@ -290,8 +290,77 @@ namespace BBWY.Client.ViewModels.PackTask
             SubmitOverTimeMarkMsgCommand = new RelayCommand<object>(SubmitOverTimeMarkMsg);
 
             AddSealBoxProductCommand = new RelayCommand(AddSealBoxProduct);
+
+            LoadSealBoxSkuDataCommand = new RelayCommand<object>(LoadSealBoxSkuData);
             this.productService = productService;
         }
+
+
+        public void LoadSealBoxSkuData(object obj)
+        {
+            switch (TaskState.Value)
+            {
+                case Models.TaskState.待封箱:
+                    {
+                        if (obj is SealBoxConfiguredModel)
+                        {
+                            var data = obj as SealBoxConfiguredModel;
+                            data.IsHideSealbox = !data.IsHideSealbox;
+                        }
+
+                    }
+                    break;
+                case Models.TaskState.待出库:
+                    {
+                        if (obj is WareWaitCompleted)
+                        {
+                            var data = obj as WareWaitCompleted;
+                            data.IsHideSkuList = !data.IsHideSkuList;
+                        }
+                    }
+                    break;
+                case Models.TaskState.已完成:
+                    break;
+                case Models.TaskState.已取消:
+                    break;
+                case Models.TaskState.待落仓:
+                    {
+                        if (SealBoxConfigureType== SealBoxConfigureType.待配置)
+                        {
+                            if (obj is FallWareConfiguredModel)
+                            {
+                                var data = obj as FallWareConfiguredModel;
+                                data.IsHideSkuList = !data.IsHideSkuList;
+                            }
+                        }
+                        else
+                        {
+                            if (obj is FallWareConfiguredModel)
+                            {
+                                var data = obj as FallWareConfiguredModel;
+                                data.IsHideSkuList = !data.IsHideSkuList;
+                            }
+                        }
+                    }
+
+
+
+                    break;
+                case Models.TaskState.商家自取:
+                    break;
+                case Models.TaskState.待转运:
+                    break;
+                case Models.TaskState.已超时:
+                    break;
+                case Models.TaskState.待排单:
+                    break;
+            }
+        }
+
+
+
+
+
         ProductService productService;
         private void AddSealBoxProduct()
         {
@@ -448,6 +517,10 @@ namespace BBWY.Client.ViewModels.PackTask
 
         #region 事件绑定
 
+
+
+        public ICommand LoadSealBoxSkuDataCommand { get; set; }
+
         /// <summary>
         /// 添加封箱商品
         /// </summary>
@@ -1075,7 +1148,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     Task.Factory.StartNew(() =>
                     {
                         StoreGetSelfDataList = new ObservableCollection<StoreGetSelfData>();
-                        var datas = packTaskService.SearchStoreGetSelfList(SearchTaskId, SearchOrderSn, SearchSpuId, SearchSkuId, null, null, PageIndex, PageSize,  globalContext.User.Shop.ShopId.ToString());
+                        var datas = packTaskService.SearchStoreGetSelfList(SearchTaskId, SearchOrderSn, SearchSpuId, SearchSkuId, null, null, PageIndex, PageSize, globalContext.User.Shop.ShopId.ToString());
                         if (datas != null && datas.Data != null && datas.Success)
                         {
                             var dataModel = datas.Data;
@@ -1088,7 +1161,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                 }));
 
                             }
-                           
+
                         }
                         else
                         {
@@ -1096,7 +1169,7 @@ namespace BBWY.Client.ViewModels.PackTask
                             {
                                 MessageBox.Show(datas?.Msg);
                             }));
-                         
+
                         }
                         IsLoading = false;
                     });
diff --git a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
index eea48f3a..542cc549 100644
--- a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
+++ b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
@@ -78,10 +78,10 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
-                              MinHeight="68">
+                              >
                         <Grid.RowDefinitions>
                             <RowDefinition Height="30"/>
-                            <RowDefinition  MinHeight="68"/>
+                            <RowDefinition  />
                         </Grid.RowDefinitions>
                         <Grid Background="#F2F2F2" >
                             <Grid.ColumnDefinitions>
@@ -108,11 +108,31 @@
                             <Grid Grid.Column="1">
                                 <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
                             </Grid>
-                            <!--<Grid Grid.Column="2">
-                                <c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
-                            </Grid>-->
+
+                            <Grid Grid.Column="2">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PurchaseOrder}"/>
+                            </Grid>
+                            <Grid Grid.Column="3">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PrewOrder}"/>
+                            </Grid>
+                            <Grid Grid.Column="4">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
+                            </Grid>
+
+
+
+
+                            <c:BButton Grid.Column="0" Grid.ColumnSpan="6" Background="Transparent"  HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1"
+ Command="{Binding DataContext.LoadSealBoxSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+      CommandParameter="{Binding}"
+/>
+                            <Grid Grid.Column="5" Panel.ZIndex="-2">
+                                <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}"   FontWeight="Bold"
+Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment="Right" Margin="0 0 20 0"
+     />
+                            </Grid>
                         </Grid>
-                        <Grid Grid.Row="1">
+                        <Grid Grid.Row="1" Visibility="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="100"/>
diff --git a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
index eecf6fc6..b4a5f594 100644
--- a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
+++ b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
@@ -37,7 +37,7 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="400"/>
                     <ColumnDefinition Width="100"/>
-                    <ColumnDefinition Width="160"/>
+                    <ColumnDefinition Width="260"/>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition MinWidth="80"/>
                 </Grid.ColumnDefinitions>
@@ -76,16 +76,16 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
-                              MinHeight="68">
+                              >
                         <Grid.RowDefinitions>
                             <RowDefinition Height="30"/>
-                            <RowDefinition  MinHeight="68"/>
+                            <RowDefinition  />
                         </Grid.RowDefinitions>
                         <Grid Background="#F2F2F2" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="100"/>
-                                <ColumnDefinition Width="160"/>
+                                <ColumnDefinition Width="260"/>
                                 <ColumnDefinition Width="100"/>
                                 <ColumnDefinition MinWidth="80"/>
                             </Grid.ColumnDefinitions>
@@ -103,18 +103,68 @@
                                                                    CommandParameter="{Binding SealBoxId}"
                                                                    Margin=" 5,0,7,0"/>
                             </StackPanel>
+
                             <Grid Grid.Column="1">
                                 <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
                             </Grid>
-                            <!--<Grid Grid.Column="2">
-                                <c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
-                            </Grid>-->
+
+                            <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center" Grid.Column="2" Orientation="Horizontal"
+             Visibility="{Binding FallWareRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+             >
+                                <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                     Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+                 >
+                                    <TextBlock  Text="剩余: " />
+                                    <TextBlock  Text="{Binding  FallWareRemainTime}"/>
+                                </StackPanel>
+                                <StackPanel Margin="10,5" Orientation="Vertical"    VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                  Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                 >
+                                    <StackPanel Orientation="Horizontal" >
+                                        <TextBlock  Foreground="Red"  Text="超时: "/>
+                                        <TextBlock  Foreground="Red"  Text="{Binding  FallWareRemainTime}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                                <c:BButton Margin="0 0 0 0"    Content="{Binding SetPurchaseOrderOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+      
+                    >
+                                    <b:Interaction.Triggers>
+                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                            <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                <b:InvokeCommandAction.CommandParameter>
+                                                    <MultiBinding Converter="{StaticResource mptConverter}">
+                                                        <Binding Path="SealBoxId"/>
+                                                        <Binding Path="SetPurchaseOrderOverTimeMarkMsg"/>
+                                                    </MultiBinding>
+                                                </b:InvokeCommandAction.CommandParameter>
+                                            </b:InvokeCommandAction>
+                                        </b:EventTrigger>
+                                    </b:Interaction.Triggers>
+                                </c:BButton>
+
+                            </StackPanel>
+
+
+                            <Grid Grid.Column="3">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="设置" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
+                            </Grid>
+
+
+                            <c:BButton Grid.Column="0" Grid.ColumnSpan="6" Background="Transparent"  HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1"
+ Command="{Binding DataContext.LoadSealBoxSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+      CommandParameter="{Binding}"
+/>
+                            <Grid Grid.Column="4" Panel.ZIndex="-2">
+                                <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}"   FontWeight="Bold"
+Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment="Right" Margin="0 0 20 0"
+     />
+                            </Grid>
                         </Grid>
-                        <Grid Grid.Row="1">
+                        <Grid Grid.Row="1" Visibility="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="100"/>
-                                <ColumnDefinition Width="160"/>
+                                <ColumnDefinition Width="260"/>
                                 <ColumnDefinition Width="100"/>
                                 <ColumnDefinition MinWidth="80"/>
                             </Grid.ColumnDefinitions>
diff --git a/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml b/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
index d1b82ed4..7d489710 100644
--- a/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
+++ b/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
@@ -121,7 +121,7 @@
             </Grid>
 
             <StackPanel Orientation="Horizontal" Grid.Row="1">
-                <RadioButton Content="已配置"  Height="35" Width="130"  Tag="{Binding FallWareConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
+                <RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待贴单:待封箱}"  Height="35" Width="130"  Tag="{Binding FallWareConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
                          Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
                          />
                 <RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待同步采购单:待配置}"   Height="35" Width="130" Tag="{Binding FallWareWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
diff --git a/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
index ca9d89ef..af900616 100644
--- a/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
+++ b/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
@@ -77,10 +77,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>
@@ -111,18 +111,27 @@
                                                                    Margin=" 5,0,7,0"/>
 
 
-                                <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,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"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
-                                <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
+                                <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />-->
                             </StackPanel>
+                            <c:BButton Grid.Column="0" Grid.ColumnSpan="6" Background="Transparent"  HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1"
+ Command="{Binding DataContext.LoadSealBoxSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+      CommandParameter="{Binding}"
+/>
+                            <Grid Grid.Column="5" Panel.ZIndex="-2">
+                                <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}"   FontWeight="Bold"
+Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment="Right" Margin="0 0 20 0"
+     />
+                            </Grid>
 
                         </Grid>
-                        <Grid Grid.Row="1">
+                        <Grid Grid.Row="1" Visibility="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="80"/>
diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml
index 253dda41..877a928a 100644
--- a/BBWY.Client/Views/PackTask/WareHouseList.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml
@@ -20,7 +20,7 @@
       Title="TaskList">
     <Page.Resources>
         <Style TargetType="RadioButton">
-            
+
             <Setter Property="IsChecked" Value="False" />
             <Setter Property="Background" Value="#8080FF" />
             <Setter Property="Foreground" Value="Black" />
@@ -44,7 +44,7 @@
                                 <TextBlock   VerticalAlignment="Center" Text="{TemplateBinding  Tag}"  Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
 
                             </StackPanel>
-                           
+
 
 
 
@@ -78,7 +78,7 @@
                 <RowDefinition Height="30"/>
                 <!---->
             </Grid.RowDefinitions>
-          
+
 
             <StackPanel  Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal">
                 <RadioButton  Height="35" Width="126"   VerticalAlignment="Center" x:Name="qb"  Content="全部"  Command="{Binding SetTaskStateCommand}"  
@@ -111,14 +111,14 @@
                              IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}" 
                               />
 
-                <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运" Tag="{Binding WaitTransportCount,Mode=TwoWay}"
-                             IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:True:False}" 
-                              />
-
                 <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"
                               IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:True:False}" 
                               />
 
+                <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运" Tag="{Binding WaitTransportCount,Mode=TwoWay}"
+                             IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:True:False}" 
+                              />
+
                 <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待完结" Tag="{Binding WaitOutbound,Mode=TwoWay}"
                               IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:True:False}" 
                               />
diff --git a/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
index 9564637c..025e088e 100644
--- a/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
+++ b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
@@ -76,10 +76,10 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
-                              MinHeight="68">
+                              >
                         <Grid.RowDefinitions>
                             <RowDefinition Height="30"/>
-                            <RowDefinition  MinHeight="68"/>
+                            <RowDefinition  />
                         </Grid.RowDefinitions>
                         <Grid Background="#F2F2F2" >
                             <Grid.ColumnDefinitions>
@@ -104,11 +104,39 @@
                             <Grid Grid.Column="1">
                                 <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
                             </Grid>
-                            <!--<Grid Grid.Column="2">
-                                <c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
-                            </Grid>-->
+
+                            <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center" Grid.Column="2"
+             Visibility="{Binding SealBoxRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+             >
+                                <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                     Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+                 >
+                                    <TextBlock  Text="剩余: " />
+                                    <TextBlock  Text="{Binding  SealBoxRemainTime}"/>
+                                </StackPanel>
+                                <StackPanel Margin="10,5" Orientation="Horizontal"    VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                  Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                 >
+                                    <TextBlock  Foreground="Red"  Text="超时: "/>
+                                    <TextBlock  Foreground="Red"  Text="{Binding  SealBoxRemainTime}"/>
+                                </StackPanel>
+                            </StackPanel>
+
+                            <Grid Grid.Column="3">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.UpdateSealBoxConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
+                            </Grid>
+
+                            <c:BButton Grid.Column="0" Grid.ColumnSpan="6" Background="Transparent"  HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1"
+ Command="{Binding DataContext.LoadSealBoxSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+      CommandParameter="{Binding}"
+/>
+                            <Grid Grid.Column="4" Panel.ZIndex="-2">
+                                <TextBlock  Style="{StaticResource middleTextBlock}"  HorizontalAlignment="Right" Margin="0 0 20 0" Text="{Binding IsHideSealbox,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}"   FontWeight="Bold"
+Foreground="{StaticResource Text.Link.Color}" FontSize="18"
+     />
+                            </Grid>
                         </Grid>
-                        <Grid Grid.Row="1">
+                        <Grid Grid.Row="1"  Visibility="{Binding IsHideSealbox,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"  >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="100"/>
diff --git a/BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml b/BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml
index e16874ff..fc70edbe 100644
--- a/BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml
+++ b/BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml
@@ -66,7 +66,7 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal">
-            <RadioButton Content="已配置"  Height="35" Width="130"  Tag="{Binding SealBoxConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
+            <RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待贴单:待封箱}"  Height="35" Width="130"  Tag="{Binding SealBoxConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
                          Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
                          />
             <RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待同步采购单:待配置}"   Height="35" Width="130" Tag="{Binding SealBoxWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"