优化合格证

BBWY.Client/APIServices/QiKu/PackTaskService.cs

@@ -374,13 +374,29 @@ namespace BBWY.Client.APIServices
         public ApiResponse<object> StoreGetBySelfV2(long taskId, int storeGetCount, string PickerUserName)
         {
 
-            return SendRequest<object>(globalContext.QKApiHost, $"api/PackTask/StoreGetBySelfV2?TaskId={taskId}", new {
+            return SendRequest<object>(globalContext.QKApiHost, $"api/PackTask/StoreGetBySelfV2", new {
                 taskId,
                 storeGetCount,
                 PickerUserName,
                 OperatorUserName= globalContext.User.Name
             }, null, HttpMethod.Post);
         }
+
+        public ApiResponse<SearchStoreGetSelfResponse> SearchStoreGetSelfList(string taskId, string OrderSn, string SpuId, string SkuId,string DepartmentName, string ShopName, int? pageIndex, int pageSize, string ShopId)
+        {
+
+            return SendRequest<SearchStoreGetSelfResponse>(globalContext.QKApiHost, $"api/PackTask/SearchStoreGetSelfList", new
+            {
+                taskId,
+                OrderSn,
+                SpuId,
+                SkuId,
+                DepartmentName, ShopName,
+                ShopId , pageIndex, pageSize,
+            }, null, HttpMethod.Post);
+        }
+
+        
     }
 
     public class CompeteSealBox

BBWY.Client/Models/APIModel/Response/PackTask/SearchStoreGetSelfResponse.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.APIModel
+{
+    public class SearchStoreGetSelfResponse
+    {
+        /// <summary>
+        /// 总条数
+        /// </summary>
+        public int TotalCount { get; set; }
+
+        /// <summary>
+        /// 商家自取记录列表
+        /// </summary>
+        public List<StoreGetSelfData> StoreGetSelfResponseList { get; set; }
+
+    }
+
+    /// <summary>
+    /// 单挑自取记录数据
+    /// </summary>
+    public class StoreGetSelfData:NotifyObject
+    {
+        /// <summary>
+        /// 打包任务id
+        /// </summary>
+        public long TaskId { get; set; }
+        ///// <summary>
+        ///// 取货时间
+        ///// </summary>
+        //public DateTime OperatorTime { get; set; }
+
+        /// <summary>
+        /// 取货人
+        /// </summary>
+        public string PickerUserName { get; set; }
+
+        /// <summary>
+        /// 自取数量
+        /// </summary>
+        public int StoreGetCount { get; set; }
+
+        #region 任务信息
+
+        /// <summary>
+        /// 任务创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 店铺
+        /// </summary>
+        public string ShopName { get; set; }
+
+        /// <summary>
+        /// 团队
+        /// </summary>
+        public string DepartmentName { get; set; }
+        /// <summary>
+        /// 商品sku
+        /// </summary>
+        public string SkuId { get; set; }
+
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string Logo { get; set; }
+
+        /// <summary>
+        /// 商品sku标题名称
+        /// </summary>
+        public string SkuName { get; set; }
+
+        /// <summary>
+        /// 商品品名
+        /// </summary>
+        public string BrandName { get; set; }
+
+        #endregion
+    }
+}

BBWY.Client/Models/PackTask/CertificateModel.cs

@@ -134,11 +134,11 @@ namespace BBWY.Client.Models
 
 
 
-        private long goodsNumber = 1;
+        private long? goodsNumber = 1;
         /// <summary>
         /// 配件序号
         /// </summary>
-        public long GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
+        public long? GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
 
 
 

BBWY.Client/Models/SealBox/WareNoSealBoxModel.cs

@@ -31,6 +31,11 @@ namespace BBWY.Client.Models
         /// <summary>
         /// 封箱sku列表
         /// </summary>
-        public List<WareNoSealBoxSku> SealBoxSkus { get; set; }
+        private List<WareNoSealBoxSku> sealBoxSkus;
+
+        /// <summary>
+        /// 封箱sku列表
+        /// </summary>
+        public List<WareNoSealBoxSku> SealBoxSkus { get=> sealBoxSkus; set {Set(ref sealBoxSkus, value); } }
     }
 }

BBWY.Client/ViewModels/PackTask/StorePickSelfViewModel.cs

@@ -0,0 +1,11 @@
+using BBWY.Common.Models;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.ViewModels.PackTask
+{
+    public  class StorePickSelfViewModel:BaseVM,IDenpendency
+    {
+    }
+}

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -237,6 +237,12 @@ namespace BBWY.Client.ViewModels.PackTask
         public ObservableCollection<PackTaskModel> PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } }
         #endregion
 
+        private ObservableCollection<StoreGetSelfData> storeGetSelfDataList;
+        /// <summary>
+        /// 商家自取记录任务列表
+        /// </summary>
+        public ObservableCollection<StoreGetSelfData> StoreGetSelfDataList { get => storeGetSelfDataList; set { Set(ref storeGetSelfDataList, value); } }
+
 
 
         public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService)
@@ -373,11 +379,17 @@ namespace BBWY.Client.ViewModels.PackTask
             //SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, 0);
             //sealBoxConfigureWindow.ShowDialog();
 
-            var data = waitSealBoxRes.Data.SealBoxWaitConfigureModels.Select(x => new SealBoxConfigureModel { 
+            var data = waitSealBoxRes.Data.SealBoxWaitConfigureModels.Select(x => new SealBoxConfigureModel
-             Logo = x.Logo,
+            {
-                WareType = x.WareType, SkuCount = x.SkuCount    , SkuId = x.SkuId, SkuName = x.SkuName, TaskId = x.TaskId, TaskState =x.TaskState, 
+                Logo = x.Logo,
-             WaitConfigureCount= x.SkuCount,
+                WareType = x.WareType,
-            } ).ToList();  
+                SkuCount = x.SkuCount,
+                SkuId = x.SkuId,
+                SkuName = x.SkuName,
+                TaskId = x.TaskId,
+                TaskState = x.TaskState,
+                WaitConfigureCount = x.SkuCount,
+            }).ToList();
 
             SetSealBoxPolicyWindow setSealBoxPolicyWindow = new SetSealBoxPolicyWindow(data, ReflashTask, 0);
             setSealBoxPolicyWindow.ShowDialog();
@@ -494,7 +506,7 @@ namespace BBWY.Client.ViewModels.PackTask
         }
 
         private List<TaskState> waitSealBoxTaskStates = new List<TaskState> {
-              Models.TaskState.待落仓, Models.TaskState.待封箱, Models.TaskState.待出库
+              Models.TaskState.待落仓, Models.TaskState.待封箱, Models.TaskState.待出库, Models.TaskState.商家自取
         };//配置封箱的任务状态范围
 
 
@@ -1045,6 +1057,38 @@ namespace BBWY.Client.ViewModels.PackTask
                         IsLoading = false;
                     });
                 }
+                if (TaskState == Models.TaskState.商家自取)
+                {
+                    Task.Factory.StartNew(() =>
+                    {
+                        StoreGetSelfDataList = new ObservableCollection<StoreGetSelfData>();
+                        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;
+                            OrderCount = dataModel.TotalCount;
+                            foreach (var item in dataModel.StoreGetSelfResponseList)
+                            {
+                                App.Current.Dispatcher.Invoke(new Action(() =>
+                                {
+                                    StoreGetSelfDataList.Add(item);
+                                }));
+
+                            }
+                           
+                        }
+                        else
+                        {
+                            App.Current.Dispatcher.Invoke(new Action(() =>
+                            {
+                                MessageBox.Show(datas?.Msg);
+                            }));
+                         
+                        }
+                        IsLoading = false;
+                    });
+
+                }
             }
 
 

BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs

@@ -525,108 +525,111 @@ namespace BBWY.Client.ViewModels.PackTask
                     Brand = productApiResponse.Data.Items[0].BrandName;
 
                 }
-                var productSku = packPurchaseTaskService.GetConfigPack(SkuId, "", OrderId);
+            }
+            else
+            {
 
-                if (productSku == null || !productSku.Success || productSku.Data == null)
+                App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku失败"));
-                {
+            }
-                    MessageBox.Show(productSku.Msg);
-                    return false;
-                }
 
+            var productSku = packPurchaseTaskService.GetConfigPack(SkuId, "", OrderId);
 
-                SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId;
+            if (productSku == null || !productSku.Success || productSku.Data == null)
-                BarCodeModel = productSku.Data.BarCode;
+            {
-                if (BarCodeModel == null)
+                MessageBox.Show(productSku.Msg);
-                {
+                return false;
-                    BarCodeModel = new BarCodeModel();
+            }
+
+
+            SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId;
+            BarCodeModel = productSku.Data.BarCode;
+            if (BarCodeModel == null)
+            {
+                BarCodeModel = new BarCodeModel();
 
+            }
+            if (!string.IsNullOrEmpty(Brand))
+                BarCodeModel.Brand = Brand;
+            if (!string.IsNullOrEmpty(BrandName))
+                BarCodeModel.BrandName = BrandName;
+            BarCodeModel.ProductNo = ProductNo;
+            BarCodeModel.SkuId = SkuId;
+            BarCodeModel.SkuName = SkuName;
+            PurchaseSkuList = new ObservableCollection<PurchaseSku>();
+            foreach (var item in productSku.Data.PurchaseSkus)
+            {
+                var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
+                if (list == null || !list.Success || list.Data == null)
+                    continue;
+                var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
+                if (skuItem == null)
+                {
+                    MessageBox.Show($"{item.PurchaseProductId}采购商品列表不存在skuid:{item.PurchaseSkuId},sku商品可能被下架了.");
+                    //return false;
                 }
-                if (!string.IsNullOrEmpty(Brand))
+                App.Current.Dispatcher.Invoke(new Action(() =>
-                    BarCodeModel.Brand = Brand;
-                if (!string.IsNullOrEmpty(BrandName))
-                    BarCodeModel.BrandName = BrandName;
-                BarCodeModel.ProductNo = ProductNo;
-                BarCodeModel.SkuId = SkuId;
-                BarCodeModel.SkuName = SkuName;
-                PurchaseSkuList = new ObservableCollection<PurchaseSku>();
-                foreach (var item in productSku.Data.PurchaseSkus)
                 {
-                    var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
+                    PurchaseSkuList.Add(new PurchaseSku
-                    if (list == null ||!list.Success|| list.Data == null)
-                        continue;
-                    var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
-                    if (skuItem == null)
                     {
-                        MessageBox.Show($"{item.PurchaseProductId}采购商品列表不存在skuid:{item.PurchaseSkuId},sku商品可能被下架了.");
+                        Logo = skuItem?.Logo,
-                        //return false;
+                        Title = skuItem?.Title,
+                        IsNeedCer = item.IsNeedCer,
+                        PurchaseSkuId = item.PurchaseSkuId,
+                        CerDTO = item.CerDTO,
+                        IsSetCertificate = item.CerDTO == null ? true : false,
+                    });
+                }));
+            }
+
+            IsNeedBarCode = Need.需要;
+            IsSetBarCode = true;
+            IsSetCertificate = true;
+            if (productSku.Data.PackConfig != null)
+            {
+                var config = productSku.Data.PackConfig;
+                SkuTitle = config.SkuGoodsTitle;
+                BrandName = config.BrandName;
+                GoodsNumber = config.GoodsNumber;
+                PackType = (PackType)config.PackType;
+                BasicPack = (BasicPack)config.BasicPack;
+                //MarkMessage = config.MarkMessage;
+                CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无需合格证 : (CertificatePosition)config.CertificatePosition.Value;
+                // Increment1 = config.Increment1;
+
+                IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
+                IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
+
+                IsSetBarCode = !config.NeedBar;
+                IsSetCertificate = !config.NeedCer;
+
+                string[] increateDatas = config.Increment1?.Split(',');
+                bool isSelected = false;
+
+                IncreateList = new ObservableCollection<IncreateModel>();
+                foreach (var item in increates)
+                {
+                    isSelected = false;
+                    if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item))
+                    {
+                        isSelected = true;
                     }
-                    App.Current.Dispatcher.Invoke(new Action(() =>
+                    App.Current.Dispatcher.Invoke(() =>
                     {
-                        PurchaseSkuList.Add(new PurchaseSku
+                        IncreateList.Add(new IncreateModel
                         {
-                            Logo = skuItem?.Logo,
+                            IncreateName = item,
-                            Title = skuItem?.Title,
+                            IsSelected = isSelected
-                            IsNeedCer = item.IsNeedCer,
-                            PurchaseSkuId = item.PurchaseSkuId,
-                            CerDTO = item.CerDTO,
-                            IsSetCertificate = item.CerDTO == null ? true : false,
                         });
-                    }));
+                    });
                 }
 
-                IsNeedBarCode = Need.需要;
+            }
-                IsSetBarCode = true;
+
-                IsSetCertificate = true;
+
-                if (productSku.Data.PackConfig != null)
-                {
-                    var config = productSku.Data.PackConfig;
-                    SkuTitle = config.SkuGoodsTitle;
-                    BrandName = config.BrandName;
-                    GoodsNumber = config.GoodsNumber;
-                    PackType = (PackType)config.PackType;
-                    BasicPack = (BasicPack)config.BasicPack;
-                    //MarkMessage = config.MarkMessage;
-                    CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无需合格证 : (CertificatePosition)config.CertificatePosition.Value;
-                    // Increment1 = config.Increment1;
-
-                    IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
-                    IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
-
-                    IsSetBarCode = !config.NeedBar;
-                    IsSetCertificate = !config.NeedCer;
-
-                    string[] increateDatas = config.Increment1?.Split(',');
-                    bool isSelected = false;
-
-                    IncreateList = new ObservableCollection<IncreateModel>();
-                    foreach (var item in increates)
-                    {
-                        isSelected = false;
-                        if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item))
-                        {
-                            isSelected = true;
-                        }
-                        App.Current.Dispatcher.Invoke(() =>
-                        {
-                            IncreateList.Add(new IncreateModel
-                            {
-                                IncreateName = item,
-                                IsSelected = isSelected
-                            });
-                        });
-                    }
 
-                }
 
 
-                return true;
-            }
-            else
-            {
 
-                App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
-                return false;
-            }
             return true;
             //加载配置文件
         }

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -21,6 +21,8 @@ using System.Threading;
 using BBWY.Client.Helpers;
 using BBWY.Client.Views.TaskOverTime;
 using BBWY.Client.Views.StorePickSelf;
+using System.Diagnostics.Eventing.Reader;
+using BBWY.Client.Models.SealBox;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -323,6 +325,15 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public ObservableCollection<WareNoSealBoxModel> WareNoSealBoxModels { get => wareNoSealBoxModels; set { Set(ref wareNoSealBoxModels, value); } }
 
+        /// <summary>
+        /// 分箱列表
+        /// </summary>
+        public List<WareNoSealBoxData> WaitSealBoxModelList { get; set; }
+
+
+
+
+
 
         private ObservableCollection<SealBoxModel> waitSealBoxModels;
         /// <summary>
@@ -338,6 +349,12 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
+        private ObservableCollection<StoreGetSelfData> storeGetSelfDataList;
+        /// <summary>
+        /// 商家自取记录任务列表
+        /// </summary>
+        public ObservableCollection<StoreGetSelfData> StoreGetSelfDataList { get => storeGetSelfDataList; set { Set(ref storeGetSelfDataList, value); } }
+
         private string searchShopName;
         public string SearchShopName
         {
@@ -625,6 +642,24 @@ namespace BBWY.Client.ViewModels.PackTask
             SendToSetSkuConfigureCommand = new RelayCommand<PackTaskModel>(SendToSetSkuConfigure);
             SelectSku = "SKU";
             SelectExpress = "物流单号";
+            LoadSkuDataCommand = new RelayCommand<WareNoSealBoxModel>(LoadSkuData);
+        }
+
+        private void LoadSkuData(WareNoSealBoxModel model)
+        {
+
+            if (model.SealBoxSkus==null|| model.SealBoxSkus.Count<=0)
+            {
+              var skuDatas =WaitSealBoxModelList.SingleOrDefault(w => w.ShopId == model.ShopId);
+              WareNoSealBoxModels.SingleOrDefault(w => w.ShopId == model.ShopId).SealBoxSkus = skuDatas.SealBoxSkus;
+            }
+            else
+            {
+                WareNoSealBoxModels.SingleOrDefault(w => w.ShopId == model.ShopId).SealBoxSkus = new List<WareNoSealBoxSku>();
+            }
+
+
+
         }
 
         private void SendToSetSkuConfigure(PackTaskModel model)
@@ -849,7 +884,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
             }
 
-      
+
             Task.Factory.StartNew(() => SearchTaskList());
         }
 
@@ -1010,6 +1045,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         #region 事件绑定 
 
+
         /// <summary>
         /// 推送sku配置状态
         /// </summary>
@@ -1111,6 +1147,13 @@ namespace BBWY.Client.ViewModels.PackTask
         /// 商家自取
         /// </summary>
         public ICommand StoreGetBySelfCommand { get; set; }
+
+
+        /// <summary>
+        /// 加载事件
+        /// </summary>
+        public ICommand LoadSkuDataCommand { get; set; }
+
         /// <summary>
         /// 完成封箱
         /// </summary>
@@ -1244,6 +1287,7 @@ namespace BBWY.Client.ViewModels.PackTask
         private Thread sealboxOverTimeThread = null;
         private Thread fallwareOverTimeThread = null;
         private Thread waitTransportOverTimeThread = null;
+
         /// <summary>
         /// 搜索任务列表
         /// </summary>
@@ -1295,8 +1339,6 @@ namespace BBWY.Client.ViewModels.PackTask
                     {
                         if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                     }
-                    IsLoadCount();
-                    IsLoading = false;
 
                 }
                 else if (TaskState == Models.TaskState.已超时)
@@ -1321,8 +1363,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     {
                         if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                     }
-                    IsLoadCount();
+
-                    IsLoading = false;
 
                 }
                 else if (TaskState == Models.TaskState.待转运)
@@ -1387,10 +1428,12 @@ namespace BBWY.Client.ViewModels.PackTask
                     {
                         if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                     }
-                    IsLoadCount();
-                    IsLoadWaitTransportCount();
-                    IsLoading = false;
 
+
+                    Task.Factory.StartNew(() =>
+                    {
+                        IsLoadWaitTransportCount();
+                    });
                 }
                 else if (TaskState == Models.TaskState.待落仓)
                 {
@@ -1430,10 +1473,12 @@ namespace BBWY.Client.ViewModels.PackTask
                     {
                         if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                     }
-                    IsLoadCount();
-                    IsLoadFallWareCount();
-                    IsLoading = false;
 
+
+                    Task.Factory.StartNew(() =>
+                    {
+                        IsLoadFallWareCount();
+                    });
                 }
                 else if (TaskState == Models.TaskState.待封箱)
                 {
@@ -1521,29 +1566,29 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
                     if (SealBoxConfigureType == SealBoxConfigureType.待配置)
                     {
-                        WareNoSealBoxModels = new ObservableCollection<WareNoSealBoxModel>();
 
+                        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)
+                            WaitSealBoxModelList = dataModel.WaitSealBoxModels;
-                            {
 
-                                App.Current.Dispatcher.Invoke(new Action(() =>
+                            foreach (var item in WaitSealBoxModelList)
+                            {
+                                App.Current.Dispatcher.Invoke(new Action(() => { 
+                                WareNoSealBoxModels.Add(new WareNoSealBoxModel
                                 {
-                                    WareNoSealBoxModels.Add(new WareNoSealBoxModel
+                                    AcceptUserName = string.Join("|", item.AcceptUserNames),
-                                    {
+                                    DepartmentName = item.DepartmentName,
-                                        AcceptUserName = string.Join("|", item.AcceptUserNames),
+                                    SealBoxSkus = new List<WareNoSealBoxSku>(),
-                                        DepartmentName = item.DepartmentName,
+                                    //  SealBoxSkus = item.SealBoxSkus,
-                                        SealBoxSkus = item.SealBoxSkus,
+                                    ShopId = item.ShopId,
-                                        ShopId = item.ShopId,
+                                    ShopName = item.ShopName,
-                                        ShopName = item.ShopName,
 
-                                    });
+                                });
                                 }));
-
                             }
                         }
                         else
@@ -1551,9 +1596,35 @@ namespace BBWY.Client.ViewModels.PackTask
                             if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
                         }
                     }
-                    IsLoadSealBoxCount();
+
-                    IsLoadCount();
+                    Task.Factory.StartNew(() =>
-                    IsLoading = false;
+                    {
+                        IsLoadSealBoxCount();
+                    });
+
+                }
+                else if (taskState == Models.TaskState.商家自取)
+                {
+                    StoreGetSelfDataList = new ObservableCollection<StoreGetSelfData>();
+                    var datas = packTaskService.SearchStoreGetSelfList(SearchTaskId, SearchOrderSn, SearchSpuId, SearchSkuId, SearchDepartment, SearchShopName, PageIndex, PageSize, null);
+                    if (datas != null && datas.Data != null && datas.Success)
+                    {
+                        var dataModel = datas.Data;
+                        OrderCount = dataModel.TotalCount;
+                        foreach (var item in dataModel.StoreGetSelfResponseList)
+                        {
+                            App.Current.Dispatcher.Invoke(new Action(() =>
+                            {
+                                StoreGetSelfDataList.Add(item);
+                            }));
+
+                        }
+
+                    }
+                    else
+                    {
+                        MessageBox.Show(datas?.Msg);
+                    }
 
                 }
                 else
@@ -1809,25 +1880,38 @@ namespace BBWY.Client.ViewModels.PackTask
                     else
                     {
                     }
-                    IsLoadCount();
-                    IsLoading = false;
 
                 }
 
+
+                Task.Factory.StartNew(() =>
+                {
+                    IsLoadCount();
+                });
+
+                IsLoading = false;
+
             });
 
         }
 
+
+
+
         private void IsLoadWaitTransportCount()
         {
             var res = sealBoxService.GetWareTransportCounts();
             if (res != null && res.Success && res.Data != null)
             {
-                WaitTransportCloudWareCount = res.Data.WaitTransportCloudWareCount;
+                App.Current.Dispatcher.Invoke(new Action(() =>
-                WaitTransportJuShuiTanCount = res.Data.WaitTransportJuShuiTanCount;
+                {
-                WaitTransportStoreWareCount = res.Data.WaitTransportStoreWareCount;
+                    WaitTransportCloudWareCount = res.Data.WaitTransportCloudWareCount;
-                WaitTransportJDWareCount = res.Data.WaitTransportJDWareCount;
+                    WaitTransportJuShuiTanCount = res.Data.WaitTransportJuShuiTanCount;
+                    WaitTransportStoreWareCount = res.Data.WaitTransportStoreWareCount;
+                    WaitTransportJDWareCount = res.Data.WaitTransportJDWareCount;
+                }));
             }
+
         }
 
         private void IsLoadSealBoxCount()
@@ -1835,8 +1919,12 @@ namespace BBWY.Client.ViewModels.PackTask
             var res = sealBoxService.GetWareSealBoxConfigureCounts();
             if (res != null && res.Success && res.Data != null)
             {
-                FallWareWaitConfigureCount = res.Data.SealBoxWaitConfigureCount.ToString();
+                App.Current.Dispatcher.Invoke(new Action(() =>
-                FallWareConfiguredCount = res.Data.SealBoxConfiguredCount.ToString();
+                {
+                    FallWareWaitConfigureCount = res.Data.SealBoxWaitConfigureCount.ToString();
+                    FallWareConfiguredCount = res.Data.SealBoxConfiguredCount.ToString();
+                }));
+
             }
         }
 
@@ -1845,8 +1933,12 @@ namespace BBWY.Client.ViewModels.PackTask
             var res = sealBoxService.GetFallWareConfigureCounts(null);
             if (res != null && res.Success && res.Data != null)
             {
-                FallWareWaitConfigureCount = res.Data.FallWareWaitConfigureCount.ToString();
+                App.Current.Dispatcher.Invoke(new Action(() =>
-                FallWareConfiguredCount = res.Data.FallWareConfiguredCount.ToString();
+                {
+                    FallWareWaitConfigureCount = res.Data.FallWareWaitConfigureCount.ToString();
+                    FallWareConfiguredCount = res.Data.FallWareConfiguredCount.ToString();
+                }));
+
             }
         }
         private void IsLoadCount()

BBWY.Client/ViewModels/ViewModelLocator.cs

@@ -367,6 +367,16 @@ namespace BBWY.Client.ViewModels
             }
         }
 
+        public StorePickSelfViewModel StorePickSelfVM
+        {
+            get
+            {
+                using var s = sp.CreateScope();
+                return s.ServiceProvider.GetRequiredService<StorePickSelfViewModel>();
+            }
+        }
+
+
         //public ShopSealBoxListViewModel ShopSealBoxListVM
         //{
         //    get

BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@@ -96,14 +96,7 @@
                     </ResourceDictionary.MergedDictionaries>
                 </ResourceDictionary>
             </Grid.Resources>
-            <Grid.RowDefinitions>
+            <ScrollViewer x:Name="scrolls" Grid.Row="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Margin="0 0 0 0">
-                <RowDefinition/>
-                <RowDefinition Height="40"/>
-            </Grid.RowDefinitions>
-
-
-
-            <ScrollViewer x:Name="scrolls" Grid.Row="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Height="740">
                 <ScrollViewer.Content>
                     <StackPanel Orientation="Vertical" Grid.Row="1">
                         <StackPanel Orientation="Horizontal"  Background="{StaticResource Border.Background}" Height="32">

BBWY.Client/Views/PackTask/PackTaskTotal.xaml

@@ -38,7 +38,7 @@
             <Grid  Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="900"/>
-                    <ColumnDefinition />
+                    <ColumnDefinition  MinWidth="100"/>
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
@@ -87,23 +87,19 @@
                                />
                 </StackPanel>
 
-                <Grid Grid.Column="1" Grid.RowSpan="3" Margin="50 0 0 0" >
+                <Grid Grid.Column="1" Grid.RowSpan="3"  >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition/>
-                    </Grid.RowDefinitions>
                     <Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchTaskTotalCommand}"
-                           Grid.RowSpan="2" Background="#8080ff" BorderThickness="0" Foreground="White"/>
+                            Background="#8080ff" BorderThickness="0" Foreground="White"/>
-                    <Button Grid.RowSpan="2" Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
+                    <Button  Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
                                Background="#02a7f0" BorderThickness="0" Foreground="White"/>
 
                 </Grid>
 
-                <Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0"  Background="{StaticResource Button.Background}" Width="450"
+                <Grid Grid.Column="2" Grid.RowSpan="3" Margin="20 0 0 0"  Background="{StaticResource Button.Background}" Width="450"
                       Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
                       >
                     <Grid.ColumnDefinitions>

BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs

@@ -272,7 +272,7 @@ namespace BBWY.Client.Views.PackTask
             {
                 var select = test.SelectedItem as GoodsNumberCer;
                 if (select != null)
-                    selectCer = select.CertificateModel.GoodsNumber;
+                    selectCer = select.CertificateModel.GoodsNumber.Value;
             }
             try
             {

BBWY.Client/Views/PackTask/TaskList.xaml

@@ -4,14 +4,14 @@
       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.PackTask"
-         xmlns:waitquality="clr-namespace:BBWY.Client.Views.QualityTask"
+      xmlns:waitquality="clr-namespace:BBWY.Client.Views.QualityTask"
-       xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+      xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
-      xmlns:ctr="clr-namespace:BBWY.Client.Converters"
       xmlns:cmodel="clr-namespace:BBWY.Client.Models"
       xmlns:sealbox="clr-namespace:BBWY.Client.Views.SealBox"
-       xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+      xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-       xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
       DataContext="{Binding TaskList,Source={StaticResource Locator}}"
+      xmlns:store="clr-namespace:BBWY.Client.Views.StorePickSelf"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="2048"
       Title="TaskList">
@@ -163,11 +163,8 @@
                         <Button Content="搜索" Width="100" Height="30" VerticalAlignment="Center"  Margin="66,0,0,0"
                             Command="{Binding SearchTaskCommand}" Grid.Column="1"
                            Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
-
                     </Grid>
                 </StackPanel>
-
-
             </Grid>
 
             <Grid  Grid.Row="2"  HorizontalAlignment="Stretch" Panel.ZIndex="999" Margin="0,5,0,0" >
@@ -187,10 +184,8 @@
             <Grid Grid.Row="3"  Margin="0,5,0,0">
 
                 <local:TaskListControl x:Name="listbox_task" 
-                                   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包装|待出库|待排单:Collapsed:Visible}"
+                                   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包装|待出库|待排单|商家自取:Collapsed:Visible}"
                                    />
-
-
                 <sealbox:ShopSealBoxListControl 
                                          Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓:Visible:Collapsed}"   
                                             />
@@ -201,13 +196,14 @@
                 <local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}"    />
 
                 <local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}"    />
+                <store:ShopStorePickSelfControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=商家自取:Visible:Collapsed}"    />
             </Grid>
 
             <c:PageControl PageIndex="{Binding PageIndex}" 
                            PageSize="{Binding PageSize}"
                            RecordCount="{Binding OrderCount}"
                            Grid.Row="4"
-                           HorizontalAlignment="Left" Width="450">
+                           HorizontalAlignment="Left" Width="auto">
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="OnPageIndexChanged">
                         <b:InvokeCommandAction Command="{Binding TaskPageIndexChangedCommand}" PassEventArgsToCommand="True"/>

BBWY.Client/Views/PackTask/WareHouseList.xaml

@@ -12,6 +12,7 @@
       xmlns:cmodel="clr-namespace:BBWY.Client.Models"
        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
       xmlns:taskovertime="clr-namespace:BBWY.Client.Views.TaskOverTime"
+      xmlns:store="clr-namespace:BBWY.Client.Views.StorePickSelf"
        xmlns:sys="clr-namespace:System;assembly=mscorlib"
       DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
       mc:Ignorable="d"  Background="White"
@@ -146,7 +147,7 @@
 
             <Grid Grid.Row="1" 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:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包装|待转运|已超时|待出库|待排单|商家自取:Collapsed:Visible}" />
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
                 <waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"    />
                 <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"  />
@@ -154,13 +155,14 @@
                 <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}"  />
                 <taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}"  />
                 <local:WaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}"  />
+                <store:StorePickSelfControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=商家自取:Visible:Collapsed}"  />
             </Grid>
 
             <c:PageControl PageIndex="{Binding PageIndex,Mode=TwoWay}" 
                            PageSize="{Binding PageSize,Mode=TwoWay}"
                            RecordCount="{Binding OrderCount,Mode=TwoWay}"
                            Grid.Row="2"
-                           HorizontalAlignment="Left" Width="450">
+                           HorizontalAlignment="Left" Width="auto">
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="OnPageIndexChanged">
                         <b:InvokeCommandAction Command="{Binding TaskPageIndexChangedCommand}" PassEventArgsToCommand="True"/>

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -269,7 +269,6 @@
 
                                     </StackPanel>
                                 </StackPanel>
-
                                 <StackPanel Grid.Column="9" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" 
                                   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
                                         >

BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml

@@ -180,7 +180,7 @@
                                                     </StackPanel>
                                                     <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,0,0 0">
                                                             <Run Text="任务状态:"/>
-                                                            <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待排单|待打包:Red:black}" Text="{Binding TaskState}"/>
+                                                            <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待排单|待包装:Red:black}" Text="{Binding TaskState}"/>
                                                     </TextBlock>
                                                 </StackPanel>
 

BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml

@@ -67,69 +67,76 @@
                 <!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}"  Grid.ColumnSpan="6"/>-->
             </Grid>
         </Border>
-        <ListBox x:Name="listbox_order"  
+        <ListBox x:Name="listbox_order"    
-                     Grid.Row="7"   
+                     Grid.Row="7"    VirtualizingStackPanel.IsVirtualizing="True"   
-                     ItemsSource="{Binding WareNoSealBoxModels}"              
+                     ItemsSource="{Binding WareNoSealBoxModels, IsAsync=True}"              
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
-                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderBrush="{StaticResource Border.Brush}" ScrollViewer.ScrollChanged="listbox_order_ScrollChanged"
-                     BorderThickness="1,1,1,0"
+                     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">
+                            Height="auto">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="30"/>
-                            <RowDefinition  MinHeight="90"/>
+                            <RowDefinition  Height="auto"/>
                         </Grid.RowDefinitions>
                         <Grid Background="#F2F2F2" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="80"/>
-                              
+
                                 <ColumnDefinition MinWidth="80"/>
-                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MaxWidth="100"/>
                             </Grid.ColumnDefinitions>
-                            <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
+                            <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"
+                                <c:BButton Panel.ZIndex="1000" Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    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"/>-->
-
-
-                                <!--<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"
+                                <c:BButton  Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding DepartmentName}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   Margin=" 5,0,0,0"
-
+                                            />
-                                <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
+                                <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0"  />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserName}" Margin="5,0,0,0" />
                             </StackPanel>
+                            <c:BButton Grid.Column="0" Grid.ColumnSpan="4" Background="Transparent"  HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1"
+                                        Command="{Binding DataContext.LoadSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+                                             CommandParameter="{Binding}"
+                                       />
+                            <Grid Grid.Column="3" Panel.ZIndex="-2">
+                                <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding SealBoxSkus.Count,Converter={StaticResource objConverter},ConverterParameter=0:∧:∨}"   FontWeight="Bold"
+                                       Foreground="{StaticResource Text.Link.Color}" FontSize="18"
+                                            />
+                               
+                               
+                            </Grid>
 
                         </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}" Grid.ColumnSpan="2"
+                            <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding SealBoxSkus, IsAsync=True}" Grid.ColumnSpan="2"  
-                                         Style="{StaticResource NoScrollViewListBoxStyle}" 
+                                         Style="{StaticResource NoScrollViewListBoxStyle}"  VirtualizingStackPanel.IsVirtualizing="True"  
-                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" 
+                                     >
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
-
+                                        <Grid MinHeight="100"  Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
-
-                                        <Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition  Width="400"/>
@@ -204,7 +211,7 @@
                                                         </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}"/>
+                                                            <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包装:Red:black}" Text="{Binding TaskState}"/>
                                                     </TextBlock>-->
 
                                                     </StackPanel>
@@ -218,7 +225,7 @@
                                                />
                                                 </Grid>
                                             </Grid>
-                                           
+
                                             <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
                                         </Grid>
                                     </DataTemplate>
@@ -231,7 +238,7 @@
                             </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"/>
@@ -255,7 +262,6 @@
 
                 </DataTemplate>
             </ListBox.ItemTemplate>
-           
         </ListBox>
     </Grid>
 </UserControl>

BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml.cs

@@ -1,5 +1,7 @@
-using System;
+using BBWY.Client.ViewModels.PackTask;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -22,5 +24,29 @@ namespace BBWY.Client.Views.SealBox
         {
             InitializeComponent();
         }
+
+    
+
+        private void listbox_order_ScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            //if (e.ExtentHeight - e.ViewportHeight - e.VerticalOffset < 100)
+            //{
+            //    var vm = this.DataContext as WareHouseListViewModel;//获取绑定的数据
+            //    if (vm.WareNoSealBoxModels!=null&& vm.WaitSealBoxModelList !=null&& vm.WareNoSealBoxModels.Count==vm.WaitSealBoxModelList.Count)
+            //    {
+            //        var datas =   vm.WareNoSealBoxModels.Where(w => w.SealBoxSkus.Count == 0).FirstOrDefault();
+            //        if (datas!=null)
+            //        {
+            //            datas.SealBoxSkus = vm.WaitSealBoxModelList.FirstOrDefault(w => w.ShopId == datas.ShopId).SealBoxSkus;
+            //        } 
+            //    }
+
+            //    // 滚动到底部
+            //}
+        }
+
+   
+
+     
     }
 }

BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

@@ -210,7 +210,7 @@
                                                     </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}"/>
+                                                            <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待排单|待包装:Red:black}" Text="{Binding TaskState}"/>
                                                     </TextBlock>
 
                                                 </StackPanel>

BBWY.Client/Views/StorePickSelf/ShopStorePickSelfControl.xaml

@@ -0,0 +1,347 @@
+<UserControl x:Class="BBWY.Client.Views.StorePickSelf.ShopStorePickSelfControl"
+             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.StorePickSelf"
+             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 TaskList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             mc:Ignorable="d"  Background="White"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <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="590,15,0,0" 
+                     Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=部门:Visible:Collapsed}"
+                    >
+            <c:BTextBox x:Name="tb"  Width="150"  TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称"
+                      BorderThickness="1 0 0 1"  Margin="0 0 0 1" Height="30"
+                        />
+            <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="590,15,0,0"
+                Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=店铺:Visible:Collapsed}"
+              >
+            <c:BTextBox x:Name="tbShop"   Width="150" Height="30" TextChanged="tbShop_TextChanged"       Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"
+                       BorderThickness="1 0 0 1"  Margin="0 0 0 1"
+                        />
+            <ListBox MaxHeight="300"  x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged"     Background="{StaticResource Border.Background}">
+
+            </ListBox>
+        </StackPanel>-->
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition  Height="0"/>
+                <RowDefinition Height="45"/>
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <!--<Grid  Grid.Row="0" HorizontalAlignment="Stretch"  Panel.ZIndex="999" Margin="0,5,0,0" >
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="auto"/>
+                </Grid.ColumnDefinitions>
+                --><!--<StackPanel Orientation="Horizontal"   Height="30"  >
+                    <StackPanel.Resources>
+                        <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>
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  BorderThickness="0"  Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
+                            <UniformGrid   Width="150"  Rows="1" Columns="1">
+                                <c:BTextBox Width="150" BorderThickness="1 0 0 0"  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"  BorderThickness="1 0 0 0"   WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+
+
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  BorderThickness="0" Width="80" VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
+
+                            <UniformGrid  Width="150" Rows="1" Columns="1">
+                                <c:BTextBox Width="150"  WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                 BorderThickness="1 0 0 0"     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}"
+                                BorderThickness="1 0 0 0"   Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  BorderThickness="0" Width="80" VerticalContentAlignment="Center" ItemsSource="{Binding SelectShopList}" HorizontalContentAlignment="Center" Text="{Binding SelectShop ,Mode=TwoWay}" />
+
+                            <UniformGrid  Width="150" Rows="1" Columns="1">
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+
+                    --><!--<TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
+                    <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" />-->
+
+
+                    <!--<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  Width="125" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
+                            <UniformGrid  Width="150" Margin="0,0,0,0" Rows="1" Columns="1">
+                                <c:BTextBox Width="150"  Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索" 
+                               BorderThickness="1 0 0 0"      Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
+                                    />
+                                <c:BTextBox Width="150"  Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                            BorderThickness="1 0 0 0"          Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>-->
+
+                    <!--<Grid Grid.Column="1" Grid.Row="1" Margin="5,0,0,0"   
+                          Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货:Visible:Collapsed}"
+                          >
+                        <Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
+                        <StackPanel Orientation="Horizontal" Margin="1">
+                            <ComboBox  Width="100" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectTitleList}" Text="{Binding SelectTitle }"/>
+                            <UniformGrid  Width="150" Margin="0,0,0,0" Rows="1" Columns="1">
+                                <c:BTextBox Width="150"  Text="{Binding SearchSkuTitle,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="模糊搜索" 
+                               BorderThickness="1 0 0 0"      Visibility="{Binding SelectTitle,Converter={StaticResource objConverter},ConverterParameter=SKU名称:Visible:Collapsed}"
+                                    />
+                                <c:BTextBox Width="150"  Text="{Binding SearchSpuTitle,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                            BorderThickness="1 0 0 0"          Visibility="{Binding SelectTitle,Converter={StaticResource objConverter},ConverterParameter=标题:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Grid>--><!--
+
+
+                    <c:BButton Content="搜索" Width="94" Height="30"  VerticalAlignment="Stretch" Margin="10,0,0,0"
+                            Command="{Binding SearchTaskCommand}"
+                           Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
+                </StackPanel>--><!--
+
+
+
+            </Grid>-->
+
+            <Border Height="1" Grid.Row="1"  Margin="0 10 0 0" Background="{StaticResource Border.Brush}" VerticalAlignment="Top"/>
+            <Grid Grid.Row="1" Margin="0 10 0 0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="300"/>
+                    <ColumnDefinition Width="90"/>
+                    <ColumnDefinition MinWidth="100"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+
+
+
+                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+            </Grid>
+            <!--ItemsSource="{Binding OrderList}"-->
+            <ListBox x:Name="listbox_order"
+                     Grid.Row="2"   
+                     ItemsSource="{Binding StoreGetSelfDataList}"              
+                     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="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
+                                    <TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
+                                    <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm}" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                    <TextBlock VerticalAlignment="Center" Text="任务ID:" Margin="16,0,0,0" />
+                                    <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,7,0"/>
+                                    <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+                                        Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
+                                         Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
+                                       />
+
+                                    <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="14,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,0,0"/>
+                                    <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
+                                        <TextBlock  VerticalAlignment="Center" Text="取货人:" Margin="16,0,0,0"  />
+                                        <TextBlock  VerticalAlignment="Center" Text="{Binding PickerUserName}" Margin="5,0,0,0" />
+
+
+                                    </StackPanel>
+                                </StackPanel>
+
+                            </Grid>
+                            <Grid Grid.Row="1">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="90"/>
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="11,9,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,12,0,10">
+
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Text="SKU:"/>
+                                            <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,11"/>
+
+                                        </StackPanel>
+                                        <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding SkuName}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+                                                         <Run Text="SKU名称:"/>
+                                                         <Run Text="{Binding SkuName}"/>
+                                                    </TextBlock>
+                                        <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,11">
+                                                            <Run Text="品名:"/>
+                                                            <Run Text="{Binding BrandName}"/>
+                                        </TextBlock>
+                                    </StackPanel>
+
+                                </Grid>
+                                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+                                <Grid Grid.Column="1" >
+                                    <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                        <TextBlock x:Name="txt_storeName" 
+                                               Text="{Binding StoreGetCount}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+                                    </StackPanel>
+                                </Grid>
+
+                                <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+
+                            </Grid>
+                            <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </Grid>
+    </Grid>
+
+</UserControl>

BBWY.Client/Views/StorePickSelf/ShopStorePickSelfControl.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.StorePickSelf
+{
+    /// <summary>
+    /// ShopStorePickSelfControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class ShopStorePickSelfControl : UserControl
+    {
+        public ShopStorePickSelfControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml

@@ -0,0 +1,347 @@
+<UserControl x:Class="BBWY.Client.Views.StorePickSelf.StorePickSelfControl"
+             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: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"
+             xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             mc:Ignorable="d"  Background="White"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <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="590,15,0,0" 
+                     Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=部门:Visible:Collapsed}"
+                    >
+            <c:BTextBox x:Name="tb"  Width="150"  TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称"
+                      BorderThickness="1 0 0 1"  Margin="0 0 0 1" Height="30"
+                        />
+            <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="590,15,0,0"
+                Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=店铺:Visible:Collapsed}"
+              >
+            <c:BTextBox x:Name="tbShop"   Width="150" Height="30" TextChanged="tbShop_TextChanged"       Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"
+                       BorderThickness="1 0 0 1"  Margin="0 0 0 1"
+                        />
+            <ListBox MaxHeight="300"  x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged"     Background="{StaticResource Border.Background}">
+
+            </ListBox>
+        </StackPanel>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition  Height="54"/>
+                <RowDefinition Height="45"/>
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid  Grid.Row="0" HorizontalAlignment="Stretch"  Panel.ZIndex="999" Margin="0,5,0,0" >
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="auto"/>
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal"   Height="30"  >
+                    <StackPanel.Resources>
+                        <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>
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  BorderThickness="0"  Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
+                            <UniformGrid   Width="150"  Rows="1" Columns="1">
+                                <c:BTextBox Width="150" BorderThickness="1 0 0 0"  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"  BorderThickness="1 0 0 0"   WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+
+
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  BorderThickness="0" Width="80" VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
+
+                            <UniformGrid  Width="150" Rows="1" Columns="1">
+                                <c:BTextBox Width="150"  WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                 BorderThickness="1 0 0 0"     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}"
+                                BorderThickness="1 0 0 0"   Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  BorderThickness="0" Width="80" VerticalContentAlignment="Center" ItemsSource="{Binding SelectShopList}" HorizontalContentAlignment="Center" Text="{Binding SelectShop ,Mode=TwoWay}" />
+
+                            <UniformGrid  Width="150" Rows="1" Columns="1">
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+
+                    <!--<TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
+                    <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" />-->
+
+
+                    <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal">
+                            <ComboBox  Width="125" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
+                            <UniformGrid  Width="150" Margin="0,0,0,0" Rows="1" Columns="1">
+                                <c:BTextBox Width="150"  Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="精准搜索" 
+                               BorderThickness="1 0 0 0"      Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
+                                    />
+                                <c:BTextBox Width="150"  Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                            BorderThickness="1 0 0 0"          Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Border>
+
+                    <Grid Grid.Column="1" Grid.Row="1" Margin="5,0,0,0"   
+                          Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货:Visible:Collapsed}"
+                          >
+                        <Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
+                        <StackPanel Orientation="Horizontal" Margin="1">
+                            <ComboBox  Width="100" BorderThickness="0"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  ItemsSource="{Binding SelectTitleList}" Text="{Binding SelectTitle }"/>
+                            <UniformGrid  Width="150" Margin="0,0,0,0" Rows="1" Columns="1">
+                                <c:BTextBox Width="150"  Text="{Binding SearchSkuTitle,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  WaterRemark="模糊搜索" 
+                               BorderThickness="1 0 0 0"      Visibility="{Binding SelectTitle,Converter={StaticResource objConverter},ConverterParameter=SKU名称:Visible:Collapsed}"
+                                    />
+                                <c:BTextBox Width="150"  Text="{Binding SearchSpuTitle,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
+                            BorderThickness="1 0 0 0"          Visibility="{Binding SelectTitle,Converter={StaticResource objConverter},ConverterParameter=标题:Visible:Collapsed}"
+                                    />
+
+                            </UniformGrid>
+                        </StackPanel>
+                    </Grid>
+
+
+                    <c:BButton Content="搜索" Width="94" Height="30"  VerticalAlignment="Stretch" Margin="10,0,0,0"
+                            Command="{Binding SearchTaskCommand}"
+                           Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
+                </StackPanel>
+
+
+
+            </Grid>
+
+            <Border Height="1" Grid.Row="1"  Margin="0 10 0 0" Background="{StaticResource Border.Brush}" VerticalAlignment="Top"/>
+            <Grid Grid.Row="1" Margin="0 10 0 0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="300"/>
+                    <ColumnDefinition Width="90"/>
+                    <ColumnDefinition MinWidth="100"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+
+
+
+                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+            </Grid>
+            <!--ItemsSource="{Binding OrderList}"-->
+            <ListBox x:Name="listbox_order"
+                     Grid.Row="2"   
+                     ItemsSource="{Binding StoreGetSelfDataList}"              
+                     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="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
+                                    <TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
+                                    <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm}" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                    <TextBlock VerticalAlignment="Center" Text="任务ID:" Margin="16,0,0,0" />
+                                    <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,7,0"/>
+                                    <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+                                        Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
+                                         Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
+                                       />
+
+                                    <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="14,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,0,0"/>
+                                    <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
+                                        <TextBlock  VerticalAlignment="Center" Text="取货人:" Margin="16,0,0,0"  />
+                                        <TextBlock  VerticalAlignment="Center" Text="{Binding PickerUserName}" Margin="5,0,0,0" />
+
+
+                                    </StackPanel>
+                                </StackPanel>
+
+                            </Grid>
+                            <Grid Grid.Row="1">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="90"/>
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="11,9,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,12,0,10">
+
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Text="SKU:"/>
+                                            <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,11"/>
+
+                                        </StackPanel>
+                                        <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding SkuName}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+                                                         <Run Text="SKU名称:"/>
+                                                         <Run Text="{Binding SkuName}"/>
+                                                    </TextBlock>
+                                        <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,11">
+                                                            <Run Text="品名:"/>
+                                                            <Run Text="{Binding BrandName}"/>
+                                        </TextBlock>
+                                    </StackPanel>
+
+                                </Grid>
+                                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+                                <Grid Grid.Column="1" >
+                                    <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                        <TextBlock x:Name="txt_storeName" 
+                                               Text="{Binding StoreGetCount}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+                                    </StackPanel>
+                                </Grid>
+
+                                <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12" Margin="-1 0 0 0"/>
+                                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+
+                            </Grid>
+                            <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </Grid>
+    </Grid>
+
+</UserControl>

BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml.cs

@@ -0,0 +1,253 @@
+using BBWY.Client.Helpers;
+using BBWY.Client.Models.PackTask;
+using BBWY.Client.ViewModels;
+using BBWY.Common.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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;
+using WebSocketSharp;
+
+namespace BBWY.Client.Views.StorePickSelf
+{
+    /// <summary>
+    /// StorePickSelfControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class StorePickSelfControl : UserControl
+    {
+        public StorePickSelfControl()
+        {
+            InitializeComponent();
+            this.Loaded += Load;
+        }
+        GlobalContext globalContext;
+
+        public void LoadShops(GlobalContext globalContext)
+        {
+            this.globalContext = globalContext;
+            shops = globalContext.User.ShopList.Select(s => s.ShopName).ToList();
+            departments = globalContext.User.DepartmentList.Select(s => s.Name).ToList();
+
+        }
+
+        private void Load(object sender, RoutedEventArgs e)
+        {
+
+            try
+            {
+                var model = (App.Current.Resources["Locator"] as ViewModelLocator).Main;
+
+                LoadShops(model.GlobalContext);
+            }
+            catch
+            {
+
+
+            }
+        }
+        public string QKApiHost { get; set; }
+        public void SelectionChangeCommand(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                var list = (ListBox)sender;
+                if (list.Items.Count <= 0)
+                {
+                    return;
+                }
+                var value = (ListBoxItem)list.SelectedValue;
+                var content = (Label)value.Content;
+                tb.Text = content.Content.ToString();
+                tipBox.Visibility = Visibility.Collapsed;
+            }
+            catch (Exception)
+            {
+
+
+            }
+
+        }
+        List<string> departments = new List<string>();
+
+        List<string> shops = new List<string>();
+        private void tb_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+            if (tipBox != null)
+                try
+                {
+                    var textBoxt = (TextBox)sender;
+                    //创建一个ListBox
+
+                    if (tipBox != null && tipBox.Items.Count > 0)
+                    {
+                        tipBox.Items.Clear();
+
+                    }
+
+                    if (departments.Count <= 0)
+                    {
+                        if (QKApiHost.IsNullOrEmpty()) QKApiHost = "http://qiku.qiyue666.com";
+                        HttpClientHelper helper = new HttpClientHelper(QKApiHost);
+
+                        string url = $"{QKApiHost}/api/PackTask/GetAllDepartment";//获取所有数据
+                        var data = helper.Get(url);
+
+                        var res = JsonConvert.DeserializeObject<ApiResponse<UserDepartment[]>>(data);
+                        //创建一个ListBoxIem
+                        if (res.Success)
+                        {
+                            if (res.Data != null && res.Data.Count() > 0)
+                            {
+                                foreach (var department in res.Data)
+                                {
+                                    if (!departments.Contains(department.DePartmentName))
+                                    {
+                                        departments.Add(department.DePartmentName);
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+
+                    if (string.IsNullOrEmpty(textBoxt.Text))
+                    {
+                        tipBox.Visibility = Visibility.Collapsed;
+                        return;
+                    }
+                    foreach (var department in departments)
+                    {
+                        if (department.Contains(textBoxt.Text))
+                        {
+                            ListBoxItem item = new ListBoxItem();
+                            Label lb = new Label();
+                            lb.Content = department;
+                            item.Content = lb;
+                            tipBox.Items.Add(item);
+                        }
+
+                    }
+
+                    tipBox.Visibility = Visibility.Visible;
+                }
+                catch (Exception)
+                {
+
+
+                }
+
+        }
+
+        private void tbShop_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            try
+            {
+                var textBoxt = (TextBox)sender;
+                //创建一个ListBox
+
+                if (tipBoxShop != null && tipBoxShop.Items.Count > 0)
+                {
+                    tipBoxShop.Items.Clear();
+
+                }
+
+                if (shops.Count <= 0)
+                {
+                    if (globalContext != null)
+                        LoadShops(globalContext);
+                }
+
+                if (string.IsNullOrEmpty(textBoxt.Text))
+                {
+                    tipBoxShop.Visibility = Visibility.Collapsed;
+                    return;
+                }
+                foreach (var department in shops)
+                {
+                    if (department.Contains(textBoxt.Text))
+                    {
+                        ListBoxItem item = new ListBoxItem();
+                        Label lb = new Label();
+                        lb.Content = department;
+                        item.Content = lb;
+                        tipBoxShop.Items.Add(item);
+                    }
+
+                }
+                if (tipBoxShop != null)
+                    tipBoxShop.Visibility = Visibility.Visible;
+            }
+            catch (Exception)
+            {
+
+
+            }
+        }
+
+        private void tipBoxShop_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                var list = (ListBox)sender;
+                if (list.Items.Count <= 0)
+                {
+                    return;
+                }
+                var value = (ListBoxItem)list.SelectedValue;
+                var content = (Label)value.Content;
+                tbShop.Text = content.Content.ToString();
+                tipBoxShop.Visibility = Visibility.Collapsed;
+            }
+            catch (Exception)
+            {
+
+
+            }
+        }
+
+        private void tb_LostFocus(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (tipBox != null && tipBox.Items.Count > 0)
+                {
+                    tipBox.Items.Clear();
+
+                }
+            }
+            catch (Exception)
+            {
+
+
+            }
+        }
+
+        private void tbShop_LostFocus(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (tipBoxShop != null && tipBoxShop.Items.Count > 0)
+                {
+                    tipBoxShop.Items.Clear();
+
+                }
+            }
+            catch (Exception)
+            {
+
+
+            }
+        }
+    }
+}

BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml

@@ -37,7 +37,7 @@
             <Grid  Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="750"/>
-                    <ColumnDefinition />
+                    <ColumnDefinition  MinWidth="100"/>
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
@@ -84,7 +84,7 @@
                  
                 </StackPanel>
 
-                <Grid Grid.Column="1" Grid.RowSpan="3" Margin="50 0 0 0" >
+                <Grid Grid.Column="1" Grid.RowSpan="3"  >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
                         <ColumnDefinition/>