From ab2754795197aad71348ce23d0b30f7077787189 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Thu, 22 Jun 2023 16:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E7=AE=B1=E6=B7=BB=E5=8A=A0=E5=BE=85?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => QiKu}/ConsumableService.cs           |   0
 .../APIServices/QiKu/SealBoxService.cs        |  23 ++
 .../GetWareSealBoxConfigureCountResponse.cs   |  13 +
 .../GetWareSealBoxWaitConfigureResponse.cs    |  85 ++++++
 .../Models/SealBox/WareNoSealBoxModel.cs      |  36 +++
 .../PackTask/WareHouseListViewModel.cs        | 118 +++++---
 .../FallWare/WareFallWareListControl.xaml     |  15 +-
 BBWY.Client/Views/PackTask/WareHouseList.xaml |   2 +-
 .../SealBox/SealBoxNoConfigureControl.xaml    | 271 ++++++++++++++++++
 .../SealBox/SealBoxNoConfigureControl.xaml.cs |  26 ++
 10 files changed, 554 insertions(+), 35 deletions(-)
 rename BBWY.Client/APIServices/{ => QiKu}/ConsumableService.cs (100%)
 create mode 100644 BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxConfigureCountResponse.cs
 create mode 100644 BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
 create mode 100644 BBWY.Client/Models/SealBox/WareNoSealBoxModel.cs
 create mode 100644 BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
 create mode 100644 BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml.cs

diff --git a/BBWY.Client/APIServices/ConsumableService.cs b/BBWY.Client/APIServices/QiKu/ConsumableService.cs
similarity index 100%
rename from BBWY.Client/APIServices/ConsumableService.cs
rename to BBWY.Client/APIServices/QiKu/ConsumableService.cs
diff --git a/BBWY.Client/APIServices/QiKu/SealBoxService.cs b/BBWY.Client/APIServices/QiKu/SealBoxService.cs
index c60ba381..4e9d607e 100644
--- a/BBWY.Client/APIServices/QiKu/SealBoxService.cs
+++ b/BBWY.Client/APIServices/QiKu/SealBoxService.cs
@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace BBWY.Client.APIServices
 {
@@ -210,5 +211,27 @@ namespace BBWY.Client.APIServices
                 globalContext.User.Shop.Platform,
             }, null, HttpMethod.Post);
         }
+
+
+        public ApiResponse<GetWareSealBoxWaitConfigureResponse> GetWareSealBoxWaitConfigureList(string ShopName, long? TaskId, string SkuId, int? PageIndex, int? PageSize)
+        {
+            return SendRequest<GetWareSealBoxWaitConfigureResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareSealBoxWaitConfigureList",
+                new
+                {
+                    ShopName,
+                    TaskId,
+                    SkuId,
+                    PageIndex,
+                    PageSize
+                }
+                , null, HttpMethod.Post);
+        }
+
+        public ApiResponse<GetWareSealBoxConfigureCountResponse> GetWareSealBoxConfigureCounts()
+        {
+            return SendRequest<GetWareSealBoxConfigureCountResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareSealBoxConfigureCounts",
+              null
+                , null, HttpMethod.Post);
+        }
     }
 }
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxConfigureCountResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxConfigureCountResponse.cs
new file mode 100644
index 00000000..66abf23c
--- /dev/null
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxConfigureCountResponse.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.APIModel
+{
+    public class GetWareSealBoxConfigureCountResponse
+    {
+        public int SealBoxWaitConfigureCount { get; set; }
+
+        public int SealBoxConfiguredCount { get; set; }
+    }
+}
diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
new file mode 100644
index 00000000..aeb70a6b
--- /dev/null
+++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.APIModel
+{
+    public class GetWareSealBoxWaitConfigureResponse
+    {
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int TotalCount { get; set; }
+
+        /// <summary>
+        /// 分箱列表
+        /// </summary>
+        public List<WareNoSealBoxData> WaitSealBoxModels { get; set; }
+    }
+
+
+
+    public class WareNoSealBoxData
+    {
+
+        /// <summary>
+        /// 店铺Id
+        /// </summary>
+        public string ShopId { get; set; }
+
+        /// <summary>
+        /// 店铺名称
+        /// </summary>
+        public string ShopName { get; set; }
+
+
+        /// <summary>
+        /// 团队名称
+        /// </summary>
+        public string DepartmentName { get; set; }
+
+        /// <summary>
+        /// 对接人(同团队下)
+        /// </summary>
+        public List<string> AcceptUserNames { get; set; }
+
+        /// <summary>
+        /// 封箱sku列表
+        /// </summary>
+        public List<WareNoSealBoxSku> SealBoxSkus { get; set; }
+
+    }
+    public class WareNoSealBoxSku
+    {
+
+        /// <summary>
+        /// 任务Id
+        /// </summary>
+        public long TaskId { get; set; }
+        /// <summary>
+        /// 图片链接
+        /// </summary>
+        public string Logo { get; set; }
+        /// <summary>
+        /// skuid
+        /// </summary>
+        public string SkuId { get; set; }
+        /// <summary>
+        /// sku标题
+        /// </summary>
+        public string SkuTitle { get; set; }
+        /// <summary>
+        /// 品名
+        /// </summary>
+        public string BrandName { get; set; }
+        /// <summary>
+        /// 货号
+        /// </summary>
+        public string ProductNo { get; set; }
+        /// <summary>
+        /// (任务的sku产品数量)
+        /// </summary>
+        public int SkuCount { get; set; }
+    }
+
+}
diff --git a/BBWY.Client/Models/SealBox/WareNoSealBoxModel.cs b/BBWY.Client/Models/SealBox/WareNoSealBoxModel.cs
new file mode 100644
index 00000000..94e1dab4
--- /dev/null
+++ b/BBWY.Client/Models/SealBox/WareNoSealBoxModel.cs
@@ -0,0 +1,36 @@
+using BBWY.Client.Models.APIModel;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models
+{
+    public class WareNoSealBoxModel:NotifyObject
+    {
+        /// <summary>
+        /// 店铺Id
+        /// </summary>
+        public string ShopId { get; set; }
+
+        /// <summary>
+        /// 店铺名称
+        /// </summary>
+        public string ShopName { get; set; }
+
+
+        /// <summary>
+        /// 团队名称
+        /// </summary>
+        public string DepartmentName { get; set; }
+
+        /// <summary>
+        /// 对接人(同团队下)
+        /// </summary>
+        public string AcceptUserName { get; set; }
+
+        /// <summary>
+        /// 封箱sku列表
+        /// </summary>
+        public List<WareNoSealBoxSku> SealBoxSkus { get; set; }
+    }
+}
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 12a3c565..ee931157 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -65,11 +65,16 @@ namespace BBWY.Client.ViewModels.PackTask
         public ObservableCollection<WaitFallWareModel> WaitFallWareList { get => waitFallWareList; set { Set(ref waitFallWareList, value); } }
 
 
+        private ObservableCollection<WareNoSealBoxModel> wareNoSealBoxModels;
+        /// <summary>
+        /// 分箱列表(未配置)
+        /// </summary>
+        public ObservableCollection<WareNoSealBoxModel> WareNoSealBoxModels { get => wareNoSealBoxModels; set { Set(ref wareNoSealBoxModels, value); } }
 
 
         private ObservableCollection<SealBoxModel> waitSealBoxModels;
         /// <summary>
-        /// 分箱列表
+        /// 分箱列表(已配置)
         /// </summary>
         public ObservableCollection<SealBoxModel> WaitSealBoxModels { get => waitSealBoxModels; set { Set(ref waitSealBoxModels, value); } }
 
@@ -613,10 +618,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
                     else
                     {
-                        //App.Current.Dispatcher.BeginInvoke(new Action(() =>
-                        //{
-                        //    new TipsWindow("查不到数据").Show();
-                        //}));
+                        if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                     }
                     IsLoadCount();
                     IsLoadFallWareCount();
@@ -629,45 +631,84 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
                     var randNum = new Random().Next(81, 90);
-                    WaitSealBoxModels = new ObservableCollection<SealBoxModel>();
 
-                    var datas = sealBoxService.GetWareSealBoxList(SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
-                    if (datas != null && datas.Data != null && datas.Success)
+                    if(SealBoxConfigureType== SealBoxConfigureType.已配置)
                     {
-                        var dataModel = datas.Data;
-                        OrderCount = dataModel.TotalCount;
-                        foreach (var item in dataModel.WaitSealBoxModels)
-                        {
+                        WaitSealBoxModels = new ObservableCollection<SealBoxModel>();
 
-                            App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                        var datas = sealBoxService.GetWareSealBoxList(SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
+                        if (datas != null && datas.Data != null && datas.Success)
+                        {
+                            var dataModel = datas.Data;
+                            OrderCount = dataModel.TotalCount;
+                            foreach (var item in dataModel.WaitSealBoxModels)
                             {
-                                WaitSealBoxModels.Add(new SealBoxModel
+
+                                App.Current.Dispatcher.BeginInvoke(new Action(() =>
                                 {
-                                    AcceptUserName = string.Join("|", item.AcceptUserNames),
-                                    DepartmentName = item.DepartmentName,
-                                    SealBoxSkus = item.SealBoxSkus.Select(s =>
+                                    WaitSealBoxModels.Add(new SealBoxModel
                                     {
+                                        AcceptUserName = string.Join("|", item.AcceptUserNames),
+                                        DepartmentName = item.DepartmentName,
+                                        SealBoxSkus = item.SealBoxSkus.Select(s =>
+                                        {
+
+                                            s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}");
+                                            return s;
+                                        }).ToList(),
+                                        ShopId = item.ShopId,
+                                        ShopName = item.ShopName,
+                                        WareId = item.WareId,
+                                        WareName = item.WareName,
+                                        SealBoxId = item.SealBoxId,
+                                    });
+                                }));
 
-                                        s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}");
-                                        return s;
-                                    }).ToList(),
-                                    ShopId = item.ShopId,
-                                    ShopName = item.ShopName,
-                                    WareId = item.WareId,
-                                    WareName = item.WareName,
-                                    SealBoxId = item.SealBoxId,
-                                });
-                            }));
-
+                            }
+                        }
+                        else
+                        {
+                            if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                         }
                     }
-                    else
+                    if (SealBoxConfigureType == SealBoxConfigureType.待配置)
                     {
-                        //App.Current.Dispatcher.BeginInvoke(new Action(() =>
-                        //{
-                        //    new TipsWindow("查不到数据").Show();
-                        //}));
+                        WareNoSealBoxModels = new ObservableCollection<WareNoSealBoxModel>();
+
+                        var datas = sealBoxService.GetWareSealBoxWaitConfigureList(SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
+                        if (datas != null && datas.Data != null && datas.Success)
+                        {
+                            var dataModel = datas.Data;
+                            OrderCount = dataModel.TotalCount;
+                            foreach (var item in dataModel.WaitSealBoxModels)
+                            {
+
+                                App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                {
+                                    WareNoSealBoxModels.Add(new  WareNoSealBoxModel
+                                    {
+                                        AcceptUserName = string.Join("|", item.AcceptUserNames),
+                                        DepartmentName = item.DepartmentName,
+                                        SealBoxSkus = item.SealBoxSkus.Select(s =>
+                                        {
+
+                                            s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}");
+                                            return s;
+                                        }).ToList(),
+                                        ShopId = item.ShopId,
+                                        ShopName = item.ShopName,
+                                       
+                                    });
+                                }));
+
+                            }
+                        }
+                        else
+                        {
+                            if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
+                        }
                     }
+                    IsLoadSealBoxCount();
                     IsLoadCount();
                     IsLoading = false;
 
@@ -765,6 +806,17 @@ namespace BBWY.Client.ViewModels.PackTask
                     IsLoading = false;
                 });
         }
+
+        private void IsLoadSealBoxCount()
+        {
+            var res = sealBoxService.GetWareSealBoxConfigureCounts();
+            if (res != null && res.Success && res.Data != null)
+            {
+                FallWareWaitConfigureCount = res.Data.SealBoxWaitConfigureCount.ToString();
+                FallWareConfiguredCount = res.Data.SealBoxWaitConfigureCount.ToString();
+            }
+        }
+
         private void IsLoadFallWareCount()
         {
             var res = sealBoxService.GetFallWareConfigureCounts(null);
diff --git a/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml b/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
index 204f1415..7e0c6619 100644
--- a/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
+++ b/BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
@@ -8,6 +8,7 @@
              xmlns:ctr="clr-namespace:BBWY.Client.Converters" Background="White"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:packtask ="clr-namespace:BBWY.Client.Views.PackTask"
+             xmlns:sealbox="clr-namespace:BBWY.Client.Views.SealBox"
              xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
              xmlns:cmodel="clr-namespace:BBWY.Client.Models"
              DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
@@ -75,11 +76,23 @@
                          />
         </StackPanel>
         <Grid Grid.Row="1" 
-              Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"
+                Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"
               >
 
             <packtask:WaitFallWareControl/>
+        
 
+        </Grid>
+        <Grid Grid.Row="1" 
+                Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"
+              >
+
+            <packtask:WaitSealBoxControl
+              Visibility="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:Visible:Collapsed}"
+                />
+            <sealbox:SealBoxNoConfigureControl
+               Visibility="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:Visible:Collapsed}"
+                />
 
         </Grid>
     </Grid>
diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml
index 473e609b..e2aefe15 100644
--- a/BBWY.Client/Views/PackTask/WareHouseList.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml
@@ -176,7 +176,7 @@
             <Grid Grid.Row="2" Margin="0,5,0,0">
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
                 <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓:Collapsed:Visible}" />
-                <local:WaitSealBoxControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
+                <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
                 
 
             </Grid>
diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
new file mode 100644
index 00000000..348e85bd
--- /dev/null
+++ b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
@@ -0,0 +1,271 @@
+<UserControl x:Class="BBWY.Client.Views.SealBox.SealBoxNoConfigureControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BBWY.Client.Views.SealBox"
+             mc:Ignorable="d" 
+        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+
+        <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
+                Background="#F2F2F2">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="400"/>
+                   
+                    <ColumnDefinition Width="80"/>
+                    <ColumnDefinition MinWidth="80"/>
+                    <ColumnDefinition Width="100"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+             
+                <TextBlock Text=" " Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="操作" Grid.Column="3"   Style="{StaticResource middleTextBlock}"/>
+                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
+                <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>-->
+
+                <!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}"  Grid.ColumnSpan="6"/>-->
+            </Grid>
+        </Border>
+        <ListBox x:Name="listbox_order"
+                     Grid.Row="7"   
+                     ItemsSource="{Binding WareNoSealBoxModels}"              
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="1,1,1,0"
+                     Foreground="{StaticResource Text.Color}">
+            <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"/>
+                        </Grid.RowDefinitions>
+                        <Grid Background="#F2F2F2" >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="80"/>
+                              
+                                <ColumnDefinition MinWidth="80"/>
+                                <ColumnDefinition Width="100"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
+
+                                <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"/>
+
+
+
+                                <!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,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 AcceptUserName}" Margin="5,0,0,0" />
+                            </StackPanel>
+
+                        </Grid>
+                        <Grid Grid.Row="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="80"/>
+                               
+                                <ColumnDefinition MinWidth="80"/>
+                                <ColumnDefinition Width="100"/>
+                            </Grid.ColumnDefinitions>
+
+                            <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding SealBoxSkus}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}"
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="90"/>
+                                                    <ColumnDefinition/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+
+                                                <!--{Binding Logo}-->
+                                                <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="11,10,0,10"
+                                                           Cursor="Hand">
+                                                    <b:Interaction.Triggers>
+                                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                            <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                                <b:InvokeCommandAction.CommandParameter>
+                                                                    <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                        <Binding Path="SkuId"/>
+                                                                    </MultiBinding>
+                                                                </b:InvokeCommandAction.CommandParameter>
+                                                            </b:InvokeCommandAction>
+                                                        </b:EventTrigger>
+                                                    </b:Interaction.Triggers>
+                                                </c:BAsyncImage>
+
+                                                <StackPanel   Grid.Column="1"  Orientation="Vertical" Margin="8,15,0,10">
+                                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
+                                                        <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
+                                                        <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                    <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
+                                                        <TextBlock.ToolTip>
+                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                <TextBlock Text="{Binding SkuTitle,Mode=TwoWay}"/>
+                                                            </ToolTip>
+                                                        </TextBlock.ToolTip>
+                                                         <Run Text="SKU名称:"/>
+                                                         <Run Text="{Binding SkuTitle}"/>
+                                                    </TextBlock>
+                                                    <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0">
+                                                            <Run Text="品名:"/>
+                                                            <Run Text="{Binding BrandName}"/>
+                                                    </TextBlock>
+
+
+
+
+                                                </StackPanel>
+                                                <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
+                                                    <StackPanel    Orientation="Horizontal" >
+                                                        <TextBlock Foreground="{StaticResource Text.Gray}">
+                                                            <Run Text="货号:" />
+                                                        </TextBlock>
+                                                        <c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ProductNo}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                    <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
+                                                        <TextBlock Foreground="{StaticResource Text.Gray}">
+                                                            <Run Text="任务ID:" />
+                                                        </TextBlock>
+                                                        <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                    <!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
+                                                            <Run Text="任务状态:"/>
+                                                            <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Red:black}" Text="{Binding TaskState}"/>
+                                                    </TextBlock>-->
+
+                                                </StackPanel>
+
+                                            </Grid>
+
+                                            <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+                            <ListBox x:Name="listbox_skuCount"   ItemsSource="{Binding SealBoxSkus}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}"  Grid.Column="1"
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid MinHeight="100"  Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
+                                            <Grid>
+                                                <TextBlock x:Name="txt_storeName" 
+                                               Text="{Binding SkuCount}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"   VerticalAlignment="Center"
+                                               />
+                                            </Grid>
+
+                                            <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
+
+
+
+                          
+                            <Grid Grid.Column="2" >
+
+                            </Grid>
+
+                            <Grid Grid.Column="3" >
+                                
+                            </Grid>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 2 0"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 1 0"/>
+                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
+                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>-->
+
+                        </Grid>
+                        <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                    </Grid>
+
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
+</UserControl>
diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml.cs
new file mode 100644
index 00000000..b716b15c
--- /dev/null
+++ b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BBWY.Client.Views.SealBox
+{
+    /// <summary>
+    /// SealBoxNoConfigureControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class SealBoxNoConfigureControl : UserControl
+    {
+        public SealBoxNoConfigureControl()
+        {
+            InitializeComponent();
+        }
+    }
+}