diff --git a/BBWY.Client/APIServices/QiKu/PackTaskService.cs b/BBWY.Client/APIServices/QiKu/PackTaskService.cs
index fb11dc82..1ebeec3e 100644
--- a/BBWY.Client/APIServices/QiKu/PackTaskService.cs
+++ b/BBWY.Client/APIServices/QiKu/PackTaskService.cs
@@ -27,7 +27,7 @@ namespace BBWY.Client.APIServices
 
 
 
-        public ApiResponse<SearchTaskListResponse> GetTaskList(string skuId = null, string taskId = null
+        public ApiResponse<SearchTaskListResponse> SearchTaskList(string skuId = null, string taskId = null
                                                   , string spuId = null, string orderSn = null,
                                                    TaskState? TaskState = null,
                                                    int pageIndex = 1,
@@ -36,11 +36,7 @@ namespace BBWY.Client.APIServices
                                                   )
         {
 
-            return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
-            {
-
-                }, null, HttpMethod.Post);
-            }
+           
             return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
             {
                 orderSn,
@@ -55,7 +51,7 @@ namespace BBWY.Client.APIServices
             }, null, HttpMethod.Post);
         }
         public ApiResponse<SearchTaskListResponse> SearchTaskList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
-
+                                                    string spuId = null, string orderSn = null,
                                                    TaskState? TaskState = null,
                                                    string ShopName = null,
                                                    int pageIndex = 1,
@@ -74,6 +70,8 @@ namespace BBWY.Client.APIServices
                 ShopName = ShopName,
                 WayBillNo = WayBillNo,
                 SourceExpressName = SourceExpressName,
+                spuId,
+                orderSn
             }, null, HttpMethod.Post);
         }
 
diff --git a/BBWY.Client/APIServices/QiKu/SealBoxService.cs b/BBWY.Client/APIServices/QiKu/SealBoxService.cs
index 35c166cf..c288ba6a 100644
--- a/BBWY.Client/APIServices/QiKu/SealBoxService.cs
+++ b/BBWY.Client/APIServices/QiKu/SealBoxService.cs
@@ -1,9 +1,11 @@
-using BBWY.Client.Models;
+using BBWY.Client.Helpers;
+using BBWY.Client.Models;
 using BBWY.Client.Models.APIModel;
 using BBWY.Client.Models.APIModel.Response.PackTask;
 using BBWY.Client.Views.PackTask;
 using BBWY.Common.Http;
 using BBWY.Common.Models;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -206,6 +208,7 @@ namespace BBWY.Client.APIServices
                 , null, HttpMethod.Post);
         }
 
+
         public ApiResponse<GetJDSupplierNameAndStoreNameResponse> GetJDSupplierNameAndStoreName(string poOrderNo)
         {
             return SendRequest<GetJDSupplierNameAndStoreNameResponse>(globalContext.BBYWApiHost, "api/qiku/GetJDSupplierNameAndStoreName", new
diff --git a/BBWY.Client/Helpers/HttpClientHelper.cs b/BBWY.Client/Helpers/HttpClientHelper.cs
index 3c185e21..5cc68f8a 100644
--- a/BBWY.Client/Helpers/HttpClientHelper.cs
+++ b/BBWY.Client/Helpers/HttpClientHelper.cs
@@ -5,6 +5,7 @@ using System.Net.Http.Headers;
 using System.Net.Http;
 using System.Text;
 using System.Windows;
+using System.Linq;
 
 namespace BBWY.Client.Helpers
 {
@@ -136,6 +137,48 @@ namespace BBWY.Client.Helpers
             }
             return JsonConvert.DeserializeObject<T>(result);
         }
+
+
+        public string Post(string Url, string JsonData, string headers = null)
+        {
+            HttpClient client = new HttpClient();
+
+
+
+            //设置 API的 基地址
+            client.BaseAddress = new Uri(BaseAddr);
+
+            if (!string.IsNullOrEmpty(headers))
+            {
+                var headdics = JsonConvert.DeserializeObject<Dictionary<string, string>>(headers);
+
+                foreach (var item in headdics.Keys)
+                {
+                    if (item.ToLower() == "host" || item.ToLower() == "Content-Type".ToLower() || item.ToLower() == "Content-Length".ToLower()) continue;
+                    client.DefaultRequestHeaders.Add(item, headdics[item]);
+                }
+
+
+            }
+
+
+
+            //设置 默认请求头ACCEPT
+            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            //设置消息体
+            HttpContent content = new StringContent(JsonData);
+            content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+            //发送Post请求
+            HttpResponseMessage msg = client.PostAsync(Url, content).Result;
+            //判断结果是否成功
+            if (msg.IsSuccessStatusCode)
+            {
+                //返回响应结果
+                return msg.Content.ReadAsStringAsync().Result;
+            }
+            //返回空字符串，表示响应错误
+            return "";
+        }
     }
 
 }
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index 30b3a946..14867e89 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
@@ -536,7 +536,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     try
                     {
                         PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
-                        var datas = packTaskService.SearchTaskList(SearchSkuId, SearchTaskId, this.TaskState,
+                        var datas = packTaskService.SearchTaskList(SearchSkuId, SearchTaskId,SearchSpuId,SearchOrderSn, this.TaskState,
                             PageIndex, PageSize);
                         if (datas != null && datas.Data != null && datas.Success)
                         {
diff --git a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
index 4019eefe..40330280 100644
--- a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
@@ -319,6 +319,7 @@ namespace BBWY.Client.ViewModels.PackTask
             IncreateList = new ObservableCollection<IncreateModel>();
             foreach (var item in increates)
             {
+               
                 IncreateList.Add(new IncreateModel
                 {
                     IncreateName = item,
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index f800f5f0..92478d58 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -38,6 +38,113 @@ namespace BBWY.Client.ViewModels.PackTask
         //public RelayCommand<string> SelectCmd => new RelayCommand<string>(str => Growl.Info(str));
         #region 属性绑定
 
+
+        private ObservableCollection<string> selectExpressList = new ObservableCollection<string> {
+        "物流单号","物流公司名称"
+        };
+
+        public ObservableCollection<string> SelectExpressList { get => selectExpressList; set { Set(ref selectExpressList, value); } }
+
+
+        private ObservableCollection<string> selectSkuList = new ObservableCollection<string> {
+        "SKU","SPU"
+        };
+
+        public ObservableCollection<string> SelectSkuList { get => selectSkuList; set { Set(ref selectSkuList, value); } }
+
+        private ObservableCollection<string> selectIdList = new ObservableCollection<string> {
+        "任务ID","拳探订单号"
+        };
+
+        public ObservableCollection<string> SelectIdList { get => selectIdList; set { Set(ref selectIdList, value); } }
+
+        /// <summary>
+        /// 查询物流
+        /// </summary>
+        private string selectExpress;
+        public string SelectExpress
+        {
+            get => selectExpress;
+
+
+            set
+            {
+                Set(ref selectExpress, value);
+
+                OnSelectExpressChanged(SelectExpress);
+            }
+        }
+
+        private void OnSelectExpressChanged(string SelectExpress)
+        {
+            if (SelectExpress == "物流单号")
+            {
+                SearchExpressName = null;
+            }
+            if (SelectExpress == "物流公司名称")
+            {
+                SearchWayBillNo = null;
+            }
+          
+        }
+
+
+        /// <summary>
+        /// 查询物流
+        /// </summary>
+        private string selectTaskId= "任务ID";
+        public string SelectTaskId
+        {
+            get => selectTaskId;
+
+
+            set
+            {
+                Set(ref selectTaskId, value);
+
+                OnSelectTaskIdChanged(SelectTaskId);
+            }
+        }
+
+        private void OnSelectTaskIdChanged(string SelectTaskId)
+        {
+            if (SelectTaskId == "任务ID")
+            {
+                searchOrderSn = null;
+            }
+            if (SelectTaskId == "拳探订单号")
+            {
+                SearchTaskId = null;
+            }
+
+        }
+        /// <summary>
+        /// 查询sku
+        /// </summary>
+        private string selectSku;
+        public string SelectSku
+        {
+            get => selectSku;
+            set
+            {
+                Set(ref selectSku, value);
+                OnSelectSkuChanged(SelectSku);
+            }
+        }
+        private void OnSelectSkuChanged(string SelectSku)
+        {
+            if (SelectSku == "SKU")
+            {
+                SearchSpuId = null;
+            }
+            if (SelectSku == "SPU")
+            {
+                SearchSkuId = null;
+            }
+         
+        }
+
+
         /// <summary>
         /// 查询时间段
         /// </summary>
@@ -206,6 +313,20 @@ namespace BBWY.Client.ViewModels.PackTask
         private string searchSkuId;
         public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
 
+        /// <summary>
+        /// 查询Spu
+        /// </summary>
+        private string searchSpuId;
+        public string SearchSpuId { get => searchSpuId; set { Set(ref searchSpuId, value); } }
+
+        /// <summary>
+        /// 查询拳探订单号
+        /// </summary>
+        private string searchOrderSn;
+        public string SearchOrderSn { get => searchOrderSn; set { Set(ref searchOrderSn, value); } }
+
+
+
         private TaskState? taskState;
         /// <summary>
         /// 任务状态
@@ -332,6 +453,9 @@ namespace BBWY.Client.ViewModels.PackTask
         public GlobalContext globalContext;
         public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService)
         {
+
+
+
             this.globalContext = globalContext;
             this.sealBoxService = sealBoxService;
             this.packTaskService = packTaskService;
@@ -404,6 +528,10 @@ namespace BBWY.Client.ViewModels.PackTask
 
             LookLSOrderConfigureCommand = new RelayCommand<object>(LookLSOrderConfigure);
             SubmitOverTimeMarkMsgCommand = new RelayCommand<object>(SubmitOverTimeMarkMsg);
+
+
+            SelectSku = "SKU";
+            SelectExpress = "物流单号";
         }
 
         private void SubmitOverTimeMarkMsg(object param)
@@ -414,7 +542,7 @@ namespace BBWY.Client.ViewModels.PackTask
             var markMsg = paramList[1]?.ToString();
 
 
-            OverTimeTaskType overTimeTaskType= OverTimeTaskType.待验收;
+            OverTimeTaskType overTimeTaskType = OverTimeTaskType.待验收;
             switch (TaskState.Value)
             {
                 case Models.TaskState.待验收:
@@ -1092,7 +1220,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                             if (datetime.TotalMilliseconds > 0)
                                             {
                                                 item.IsWaitTransportOverTime = false;
-                                                item.WaitTransportRemainTime = OverTimeHelper.GetTimeString(datetime);  
+                                                item.WaitTransportRemainTime = OverTimeHelper.GetTimeString(datetime);
                                             }
                                             else
                                             {
@@ -1245,7 +1373,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                         WareName = item.WareName,
                                         SealBoxId = item.SealBoxId,
                                         SealBoxPackOverTime = item.SealBoxPackOverTime,
-                                         SealBoxPackOverTimeMarkMsg = item.SealBoxPackOverTimeMarkMsg
+                                        SealBoxPackOverTimeMarkMsg = item.SealBoxPackOverTimeMarkMsg
                                     });
                                 }));
 
@@ -1274,7 +1402,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                                 else
                                                 {
                                                     item.IsSealBoxOverTime = true;
-                                                    item.SealBoxRemainTime = OverTimeHelper.GetTimeString(datetime) ;
+                                                    item.SealBoxRemainTime = OverTimeHelper.GetTimeString(datetime);
                                                 }
 
                                             }
@@ -1343,7 +1471,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
-                    var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName,
+                    var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, SearchSpuId, SearchOrderSn, this.TaskState, SearchShopName,
                         PageIndex, PageSize);
                     if (datas != null && datas.Data != null && datas.Success)
                     {
@@ -1381,10 +1509,10 @@ namespace BBWY.Client.ViewModels.PackTask
                                 QualityCompletionOverTime = item.QualityCompletionOverTime,
                                 PackCompletionOverTime = item.PackCompletionOverTime,
                                 ShopName = item.ShopName,
-                                 QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
-                                 PackOverTimeMarkMsg    = item.PackOverTimeMarkMsg,
-                                 ShowMarkMessage =item.ShowMarkMessage,
-                                  SkuPurchaseSchemeId=item.SkuPurchaseSchemeId
+                                QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
+                                PackOverTimeMarkMsg = item.PackOverTimeMarkMsg,
+                                ShowMarkMessage = item.ShowMarkMessage,
+                                SkuPurchaseSchemeId = item.SkuPurchaseSchemeId
 
                             };
 
@@ -1409,7 +1537,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                             {
-                                
+
                                 data.BarCodeModel = item.BarCodeDTO;
                                 if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板)
                                     data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 92f80a19..6a0c9190 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -22,6 +22,7 @@ using NPOI.Util;
 using BBWY.Controls;
 using WebSocketSharp;
 using BBWY.Client.APIServices.QiKu;
+using BarcodeLib;
 
 namespace BBWY.Client.ViewModels
 {
@@ -528,12 +529,11 @@ namespace BBWY.Client.ViewModels
                     BarCodeModel.Brand = Brand;
                     BarCodeModel.SkuId = SkuId;
                     BarCodeModel.SkuName = SkuName;
+                    BarCodeModel.ShopName = OriginShopName;
                 }
                 else
                 {
-
                     BarCodeModel = resCode.Data;
-
                 }
 
             }
@@ -623,7 +623,7 @@ namespace BBWY.Client.ViewModels
         {
 
 
-
+            OriginShopName = model.ShopName;
 
             FloorDragNumber = 0;
             PurchaseSkuList = new ObservableCollection<PurchaseSku>();
diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
index b2609d8e..84fcf645 100644
--- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
@@ -27,13 +27,13 @@
         <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
     </UserControl.Resources>
     <Grid>
-        <StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="460,15,0,0">
+        <StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="550,15,0,0">
             <c:BTextBox x:Name="tb"  Width="150" Height="30" TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
             <ListBox MaxHeight="300"  x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
 
             </ListBox>
         </StackPanel>
-        <StackPanel Panel.ZIndex="100"  HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="660,15,0,0"
+        <StackPanel Panel.ZIndex="100"  HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="750,15,0,0"
                     >
             <c:BTextBox x:Name="tbShop"  Width="150" Height="30" TextChanged="tbShop_TextChanged"      Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
             <ListBox MaxHeight="300"  x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged"     Background="{StaticResource Border.Background}">
@@ -57,25 +57,57 @@
                 </Grid.ColumnDefinitions>
                 <StackPanel Orientation="Horizontal"   Height="30"  >
                     <StackPanel.Resources>
-                        <Style TargetType="DatePickerTextBox">
-                            <Setter Property="IsReadOnly" Value="True"/>
-                        </Style>
+                        <ResourceDictionary>
+                            <ResourceDictionary.MergedDictionaries>
+                                <ResourceDictionary  Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+                                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+                            </ResourceDictionary.MergedDictionaries>
+                        </ResourceDictionary>
                     </StackPanel.Resources>
-                    <TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
-                    <TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  BorderThickness="0"  Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  WaterRemark="任务ID" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                      Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=任务ID:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  BorderThickness="0"  VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                      Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SKU:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  WaterRemark="SPUID" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
 
                     <TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
-                    <c:BTextBox  Visibility="Hidden"  Width="150" Height="30" TextChanged="tb_TextChanged"   ></c:BTextBox>
+                    <c:BTextBox  Visibility="Hidden"  Width="150" Height="30" ></c:BTextBox>
 
                     <TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
-                    <TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索"/>
-                    <TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"/>
+                    <c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" />
+
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  Width="125" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索" 
+                                    Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                                     Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
 
                     <Button Content="搜索" Width="94" Height="30" VerticalAlignment="Stretch" Margin="10,0,0,0"
                             Command="{Binding SearchTaskCommand}"
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index cab7a357..082065cc 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -13,28 +13,32 @@
              mc:Ignorable="d" 
              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"/>
+        <ResourceDictionary>
+            <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"/>
+        </ResourceDictionary>
+        
+       
     </UserControl.Resources>
 
     <Grid>
-        <StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="460,15,0,0">
-            <c:BTextBox x:Name="tb"  Width="150" Height="30" TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
+        <StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="550,15,0,0">
+            <c:BTextBox x:Name="tb"  Width="150" Height="30" TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称"></c:BTextBox>
             <ListBox MaxHeight="300"  x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
 
             </ListBox>
         </StackPanel>
-        <StackPanel Panel.ZIndex="100"  HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="660,15,0,0"
+        <StackPanel Panel.ZIndex="100"  HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="750,15,0,0"
                     >
-            <c:BTextBox x:Name="tbShop"  Width="150" Height="30" TextChanged="tbShop_TextChanged"      Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
+            <c:BTextBox x:Name="tbShop"  Width="150" Height="30" TextChanged="tbShop_TextChanged"      Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"></c:BTextBox>
             <ListBox MaxHeight="300"  x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged"     Background="{StaticResource Border.Background}">
 
             </ListBox>
@@ -56,25 +60,61 @@
                 </Grid.ColumnDefinitions>
                 <StackPanel Orientation="Horizontal"   Height="30"  >
                     <StackPanel.Resources>
-                        <Style TargetType="DatePickerTextBox">
-                            <Setter Property="IsReadOnly" Value="True"/>
-                        </Style>
+                        <ResourceDictionary>
+                            <ResourceDictionary.MergedDictionaries>
+                                <ResourceDictionary  Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+                                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+                            </ResourceDictionary.MergedDictionaries>
+                        </ResourceDictionary>
                     </StackPanel.Resources>
-                    <TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
-                    <TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
 
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  BorderThickness="0"  Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  WaterRemark="任务ID" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                      Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=任务ID:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
+                  
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  BorderThickness="0"  VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                      Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SKU:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  WaterRemark="SPUID" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
 
                     <TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
-                    <c:BTextBox  Visibility="Hidden"  Width="150" Height="30" TextChanged="tb_TextChanged"   ></c:BTextBox>
+                    <c:BTextBox  Visibility="Hidden"  Width="150" Height="30" ></c:BTextBox>
 
                     <TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
-                    <TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索"/>
-                    <TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"/>
+                    <c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" />
+
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  Width="125" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索" 
+                                    Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                                     Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
+            
 
                     <Button Content="搜索" Width="94" Height="30" VerticalAlignment="Stretch" Margin="10,0,0,0"
                             Command="{Binding SearchTaskCommand}"
diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
index 13f91e23..1e0e3c85 100644
--- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
@@ -26,13 +26,13 @@
     </UserControl.Resources>
 
     <Grid>
-        <StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="460,15,0,0">
+        <StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="550,15,0,0">
             <c:BTextBox x:Name="tb"  Width="150" Height="30" TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
             <ListBox MaxHeight="300"  x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
 
             </ListBox>
         </StackPanel>
-        <StackPanel Panel.ZIndex="100"  HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="660,15,0,0"
+        <StackPanel Panel.ZIndex="100"  HorizontalAlignment="Left" VerticalAlignment="Top"  Orientation="Vertical"  Margin="750,15,0,0"
                     >
             <c:BTextBox x:Name="tbShop"  Width="150" Height="30" TextChanged="tbShop_TextChanged"      Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
             <ListBox MaxHeight="300"  x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged"     Background="{StaticResource Border.Background}">
@@ -56,25 +56,57 @@
                 </Grid.ColumnDefinitions>
                 <StackPanel Orientation="Horizontal"   Height="30"  >
                     <StackPanel.Resources>
-                        <Style TargetType="DatePickerTextBox">
-                            <Setter Property="IsReadOnly" Value="True"/>
-                        </Style>
+                        <ResourceDictionary>
+                            <ResourceDictionary.MergedDictionaries>
+                                <ResourceDictionary  Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+                                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+                            </ResourceDictionary.MergedDictionaries>
+                        </ResourceDictionary>
                     </StackPanel.Resources>
-                    <TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
-                    <TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  BorderThickness="0"  Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  WaterRemark="任务ID" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                      Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=任务ID:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  BorderThickness="0"  VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                      Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SKU:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  WaterRemark="SPUID" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
 
                     <TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
-                    <c:BTextBox  Visibility="Hidden"  Width="150" Height="30" TextChanged="tb_TextChanged"   ></c:BTextBox>
+                    <c:BTextBox  Visibility="Hidden"  Width="150" Height="30" ></c:BTextBox>
 
                     <TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
-                    <c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
-                    <TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索"/>
-                    <TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"/>
+                    <c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" />
+
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <ComboBox  Width="125" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
+                    </Border>
+                    <UniformGrid  Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
+                        <c:BTextBox Width="150"  Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索" 
+                                    Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
+                                    />
+                        <c:BTextBox Width="150"  Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                                     Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
+                                    />
+
+                    </UniformGrid>
 
                     <Button Content="搜索" Width="94" Height="30" VerticalAlignment="Stretch" Margin="10,0,0,0"
                             Command="{Binding SearchTaskCommand}"