1

BBWY.Client/APIServices/QiKu/QualityTaskService.cs

@@ -0,0 +1,65 @@
+using BBWY.Client.Models;
+using BBWY.Client.Models.APIModel;
+using BBWY.Common.Http;
+using BBWY.Common.Models;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+
+namespace BBWY.Client.APIServices.QiKu
+{
+    public class QualityTaskService : BaseApiService, IDenpendency
+    {
+        public QualityTaskService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
+        {
+        }
+
+        public ApiResponse<SearchQualityTaskListResponse> SearchQualityTaskList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
+                                                 string spuId = null, string orderSn = null,
+                                                QualityTaskExceptionState? QualityTaskExceptionState = null,
+                                                string ShopName = null,
+                                                int pageIndex = 1,
+                                                int pageSize = 10,
+                                                string SkuTitle = null,
+                                                string SpuTitle = null,
+                                                string PackUserName = null
+                                               )
+        {
+
+            return SendRequest<SearchQualityTaskListResponse>(globalContext.QKApiHost, "api/QualityTask/SearchQualityTaskList", new
+            {
+                SkuTitle,
+                SpuTitle,
+                DepartmentName = departmentName,
+                SkuId = skuId,
+                TaskId = taskId,
+                QualityTaskExceptionState,
+                PageIndex = pageIndex,
+                PageSize = pageSize,
+                ShopName = ShopName,
+                WayBillNo = WayBillNo,
+                SourceExpressName = SourceExpressName,
+                spuId,
+                orderSn,
+                PackUserName
+            }, null, HttpMethod.Post);
+        }
+
+     
+
+
+
+        public ApiResponse<object> QualityTaskException(long TaskId, TaskExceptionType TaskExceptionType, string RemarkMsg)
+        {
+            return SendRequest<object>(globalContext.QKApiHost, $"api/QualityTask/QualityTaskException?TaskId={TaskId}",
+              new {
+                  TaskId,
+                  TaskExceptionType,
+                  RemarkMsg,
+                  UserName=globalContext.User.Name
+              }
+                , null, HttpMethod.Post);
+        }
+    }
+}

BBWY.Client/Models/APIModel/Response/QualityTask/SearchQualityTaskListResponse.cs

@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.APIModel
+{
+    public class SearchQualityTaskListResponse
+    {
+        /// <summary>
+        /// 验收异常总数
+        /// </summary>
+        public int QualityExceptionCount { get; set; }
+
+        /// <summary>
+        /// 查询总数据(判断总页数)
+        /// </summary>
+        public int TotalCount { get; set; }
+
+        /// <summary>
+        /// 页面返回的数据
+        /// </summary>
+        public List<QualityPackTaskData> Items { get; set; }
+    }
+
+    /// <summary>
+    /// 待验收数据
+    /// </summary>
+    public class QualityPackTaskData:NotifyObject
+    {
+        /// <summary>
+        /// 图片链接
+        /// </summary>
+        public string Logo { get; set; }
+
+        /// <summary>
+        /// 任务id
+        /// </summary>
+        public long TaskId { get; set; }
+
+        /// <summary>
+        /// 需求方创建日期
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public TaskState TaskState { get; set; }
+
+        /// <summary>
+        /// 需求方团队
+        /// </summary>
+        public string DepartmentName { get; set; }
+
+        /// <summary>
+        /// 需求方店铺
+        /// </summary>
+        public string ShopName { get; set; }
+
+
+        /// <summary>
+        /// 货号品名
+        /// </summary>
+        public string BrandName { get; set; }
+
+        /// <summary>
+        /// 对接人
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// skuid
+        /// </summary>
+        public string SkuId { get; set; }
+        /// <summary>
+        /// SKU标题
+        /// </summary>
+        public string SkuName { get; set; }
+        /// <summary>
+        /// sku数量
+        /// </summary>
+        public int SkuCount { get; set; }
+        /// <summary>
+        /// 打包类型（单件=0，多件=1）
+        /// </summary>
+        public int PackType { get; set; }
+
+        ///// <summary>
+        ///// 落仓(本地仓=0，齐越仓=1，京东仓=2,聚水潭=3)
+        ///// </summary>
+        //public string PositionType { get; set; }
+
+        /// <summary>
+        /// 基础包装（快递袋=0，纸箱=1，麻袋=2）
+        /// </summary>
+        public int BasicPack { get; set; }
+
+        /// <summary>
+        /// 增量1()
+        /// </summary>
+        public string Increment1 { get; set; }
+
+
+        ///// <summary>
+        ///// 合格证位置（外部包装=0，产品包装=1）
+        ///// </summary>
+        //public int? CertificatePosition { get; set; }
+
+
+        /// <summary>
+        /// sku配件名称
+        /// </summary>
+        public string SkuGoodsTitle { get; set; }
+
+        /// <summary>
+        /// 配件数
+        /// </summary>
+        public int GoodsNumber { get; set; }
+
+
+
+
+        ///// <summary>
+        ///// 条形码数据
+        ///// </summary>
+        //public BarCodeDTO BarCodeDTO { get; set; }
+
+        ///// <summary>
+        ///// 合格证数据
+        ///// </summary>
+        //public CerDTO[] Cers { get; set; }
+
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        public string Brand { get; set; }
+
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 增量配件数(旧版计费)移除
+        /// </summary>
+        public int? IncrementPartCount { get; set; }
+
+
+        /// <summary>
+        /// 质检超时时间
+        /// </summary>
+        public DateTime? QualityCompletionOverTime { get; set; }
+
+
+        /// <summary>
+        /// 质检超时备注信息
+        /// </summary>
+        public string QualityOverTimeMarkMsg { get; set; }
+
+        /// <summary>
+        /// 打包超时备注信息
+        /// </summary>
+        public string PackOverTimeMarkMsg { get; set; }
+
+
+        /// <summary>
+        /// 消息列表
+        /// </summary>
+        public List<MarkMessageModel> MarkMessageModelList { get; set; }
+
+        /// <summary>
+        /// 采购方案
+        /// </summary>
+        public string SkuPurchaseSchemeId { get; set; }
+
+
+        /// <summary>
+        /// 店铺id(采购店铺)
+        /// </summary>
+        public string ShopId { get; set; }
+
+        /// <summary>
+        /// 排单超时时间
+        /// </summary>
+        public DateTime? SendToSetSkuConfigureTime { get; set; }
+
+
+        /// <summary>
+        /// 物流状态
+        /// </summary>
+        public List<ExpressOrderResponse> ExpressOrderResponses { get; set; }
+
+        /// <summary>
+        /// 任务挂起时间
+        /// </summary>
+        public DateTime? TaskAbortTime { get; set; }
+    }
+}

BBWY.Client/Models/Enums.cs

@@ -555,10 +555,7 @@
 
     }
 
-    public enum QualityLookState
-    {
 
-    }
 
     /// <summary>
     /// 配送方式(自送=1,快递配送=2)
@@ -577,4 +574,16 @@
         待包装 = 1, 已完成 = 2
     }
 
+    public enum TaskExceptionType
+    {
+        配件未到齐 = 0,
+    }
+
+    /// <summary>
+    /// 验收状态 (  待验收=1,验收异常 =2)
+    /// </summary>
+    public enum QualityTaskExceptionState
+    {
+        待验收 = 1, 验收异常 = 2
+    }
 }

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -5,6 +5,7 @@ using BBWY.Client.ViewModels;
 using BBWY.Client.ViewModels.PackTask;
 using BBWY.Client.Views.PackTask;
 using BBWY.Client.Views.QualityTask;
+using BBWY.Client.Views.QualityTipWindows;
 using GalaSoft.MvvmLight.Command;
 using NPOI.Util;
 using System;
@@ -88,9 +89,9 @@ namespace BBWY.Client.Models
             catch (Exception)
             {
 
-                
+
             }
-            
+
         }
 
 
@@ -111,12 +112,56 @@ namespace BBWY.Client.Models
             //加载数据
             QualityWindow service = new QualityWindow(this, ReflashTask);
             service.Show();
+            QualityProductWindow qualityProduct = new QualityProductWindow("商品合格证情况", "商品包装有合格证信息", "商品包装无合格证信息", (isTrue) => {
+
+                if (isTrue)
+                {
+                    QualityProductWindow qualityProduct = new QualityProductWindow("商品品牌情况", "商品包装有品牌信息", "商品包装无品牌信息", (isTrue) => {
+
+                        if (isTrue)
+                        {
+
+                        }
+                        else
+                        {
+
+                        }
+
+
+
+                    });
+                    qualityProduct.ShowDialog();
+                }
+                else
+                {
+                    if (this.CertificateModel==null|| !this.CertificateModel.Any())//未配置
+                    {
+
+                    }
+                    else
+                    {
+                      
+                    }
+
+
+
+                }
+            
+            
+            
+            });
+
+            qualityProduct.ShowDialog();
+
+
+
+
         }
 
         private void SetService()
         {
 
-            if (this.PackProcessType==null&&this.FeesMoney>0)
+            if (this.PackProcessType == null && this.FeesMoney > 0)
             {
                 ServiceWindow window = new ServiceWindow(this, ReflashTask);
                 window.ShowDialog();
@@ -237,16 +282,6 @@ namespace BBWY.Client.Models
         public int SkuCount { get => skuCount; set { Set(ref skuCount, value); } }
 
 
-        private Availability availability;
-        /// <summary>
-        /// 到货情况(待收货=0，部分收货=1，已到货=2)
-        /// </summary>
-        public Availability Availability { get => availability; set { Set(ref availability, value); } }
-
-
-
-
-
 
         private TaskState taskState;
         /// <summary>
@@ -417,7 +452,10 @@ namespace BBWY.Client.Models
         public DateTime? QualityCompletionOverTime { get; set; }
 
 
-
+        /// <summary>
+        /// 任务挂起时间
+        /// </summary>
+        public DateTime? TaskAbortTime { get; set; }
 
         private string packRemainTime;
         /// <summary>
@@ -503,7 +541,7 @@ namespace BBWY.Client.Models
         public PackProcessType? PackProcessType { get => packProcessType; set { Set(ref packProcessType, value); } }
 
 
-        public string  ShopId { get; set; }
+        public string ShopId { get; set; }
 
         /// <summary>
         /// 发送信息不全时间
@@ -555,7 +593,7 @@ namespace BBWY.Client.Models
 
 
 
-        
+
 
 
     }

BBWY.Client/Models/QualityTask/QualityPackTaskModel.cs

@@ -0,0 +1,40 @@
+using BBWY.Client.Models.APIModel;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.QualityTask
+{
+    public class QualityPackTaskModel : QualityPackTaskData
+    {
+        private string qualityRemainTime;
+        /// <summary>
+        /// 质检剩余时间
+        /// </summary>
+        public string QualityRemainTime { get => qualityRemainTime; set { Set(ref qualityRemainTime, value); } }
+
+        private bool isQualityOverTime;
+        public bool IsQualityOverTime { get => isQualityOverTime; set { Set(ref isQualityOverTime, value); } }
+
+        private bool showSendMsg = false;
+        /// <summary>
+        /// 展示留言信息
+        /// </summary>
+        public bool ShowSendMsg { get => showSendMsg; set { Set(ref showSendMsg, value); } }
+
+
+        private string taskMarkMsg;
+        /// <summary>
+        /// 展示留言信息
+        /// </summary>
+        public string TaskMarkMsg { get => taskMarkMsg; set { Set(ref taskMarkMsg, value); } }
+
+
+
+        private bool showMoreMsg = true;
+        /// <summary>
+        /// 展示留言信息
+        /// </summary>
+        public bool ShowMoreMsg { get => showMoreMsg; set { Set(ref showMoreMsg, value); } }
+    }
+}

BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@@ -426,7 +426,6 @@ namespace BBWY.Client.ViewModels.PackTask
             CertificateModel = model.CertificateModel;
             SkuTitle = model.SkuTitle;
             GoodsNumber = model.GoodsNumber;
-            Availability = model.Availability;
   
 
             if (string.IsNullOrEmpty(model.OrderId))

BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@@ -769,7 +769,6 @@ namespace BBWY.Client.ViewModels.PackTask
             CertificateModel = model.CertificateModel;
             SkuTitle = model.SkuTitle;
             GoodsNumber = model.GoodsNumber;
-            Availability = model.Availability;
 
             if (model.ExpressOrderList!=null&&model.ExpressOrderList.Any())
             {

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -40,7 +40,17 @@ namespace BBWY.Client.ViewModels.PackTask
     public partial class TaskListViewModel : BaseVM, IDenpendency//注入服务
     {
 
-
+        private QualityTaskExceptionState? qualityTaskExceptionState;
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public QualityTaskExceptionState? QualityTaskExceptionState
+        {
+            get => qualityTaskExceptionState; set
+            {
+                Set(ref qualityTaskExceptionState, value);
+            }
+        }
 
         #region 属性绑定
 
@@ -348,7 +358,9 @@ namespace BBWY.Client.ViewModels.PackTask
 
         public ICommand AppendMarkMessageCommand { get; set; }
 
-        public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, ProductService productService, MarkMessageService markMessageService)
+        public ICommand SetQualityTaskExceptionStateCommand { get; set; }
+
+    public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, ProductService productService, MarkMessageService markMessageService)
         {
             this.globalContext = globalContext;
             this.markMessageService = markMessageService;
@@ -415,6 +427,11 @@ namespace BBWY.Client.ViewModels.PackTask
 
             AppendMarkMessageCommand = new RelayCommand<long>(AppendMarkMessage);
 
+
+            SetQualityTaskExceptionStateCommand = new RelayCommand(() => {
+                SearchTaskList();
+            });
+
         }
         MarkMessageService markMessageService;
 

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -28,6 +28,8 @@ using System.Diagnostics;
 using BBWY.Client.Extensions;
 using BBWY.Client.APIServices.QiKu;
 using BBWY.Client.Views.PackerTask;
+using BBWY.Client.Models.QualityTask;
+using BBWY.Client.Views.QualityTask;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -292,7 +294,7 @@ namespace BBWY.Client.ViewModels.PackTask
             }
         }
 
-        
+
         private string searchExpressName;
         public string SearchExpressName
         {
@@ -386,7 +388,6 @@ namespace BBWY.Client.ViewModels.PackTask
         public ObservableCollection<PackTaskModel> PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } }
 
 
-
         private ObservableCollection<StoreGetSelfData> storeGetSelfDataList;
         /// <summary>
         /// 商家自取记录任务列表
@@ -590,6 +591,19 @@ namespace BBWY.Client.ViewModels.PackTask
         private WareType selectWareType;
 
         public WareType SelectWareType { get => selectWareType; set { Set(ref selectWareType, value); } }
+
+
+        private QualityTaskExceptionState? qualityTaskExceptionState = Models.QualityTaskExceptionState.待验收;
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public QualityTaskExceptionState? QualityTaskExceptionState
+        {
+            get => qualityTaskExceptionState; set
+            {
+                Set(ref qualityTaskExceptionState, value);
+            }
+        }
         #endregion
 
         private readonly PackTaskService packTaskService;
@@ -734,7 +748,12 @@ namespace BBWY.Client.ViewModels.PackTask
         public ICommand PackTaskMarkMessageCommand { get; set; }
 
         public ICommand AppendMarkMessageCommand { get; set; }
-        public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService, MarkMessageService markMessageService)
+
+        public ICommand SetQualityTaskExceptionStateCommand { get; set; }
+
+
+        public ICommand QualityTaskExceptionCommand { get; set; }
+        public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService, MarkMessageService markMessageService, QualityTaskService qualityTaskService)
         {
 
 
@@ -833,8 +852,22 @@ namespace BBWY.Client.ViewModels.PackTask
             PackTaskMarkMessageCommand = new RelayCommand<long>(PackTaskMarkMessage);
 
             AppendMarkMessageCommand = new RelayCommand<long>(AppendMarkMessage);
+            SetQualityTaskExceptionStateCommand = new RelayCommand(() =>
+            {
+                SearchTaskList();
+            });
+            this.qualityTaskService = qualityTaskService;
 
+            QualityTaskExceptionCommand = new RelayCommand<long>(QualityTaskException);
         }
+
+        private void QualityTaskException(long taskId)
+        {
+
+            AddExceptionWindow addExceptionWindow = new AddExceptionWindow(qualityTaskService, taskId);
+            addExceptionWindow.ShowDialog();
+        }
+
         MarkMessageService markMessageService;
         private void AppendMarkMessage(long taskId)
         {
@@ -875,6 +908,8 @@ namespace BBWY.Client.ViewModels.PackTask
         }
         private void ShowMoreMessage(long taskId)
         {
+
+
             var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
             if (model != null)
             {
@@ -883,6 +918,9 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
             }
+
+
+
         }
 
         private void LoadCompletedSkuData(WareWaitCompleted model)
@@ -1043,7 +1081,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
 
             }
-            
+
             var data = LSOrderPurchaseListRes.Data;
             lsdTaskMsg.CustomerName = model.ShopName;
             lsdTaskMsg.CustomerUserName = model.ShopName;
@@ -1197,13 +1235,13 @@ namespace BBWY.Client.ViewModels.PackTask
                 Task.Factory.StartNew(() => SearchTaskList());
 
                 return true;
-            },false);
+            }, false);
             sorePickProductWindow.ShowDialog();
 
 
 
         }
-        
+
         private void QualityStoreGetBySelf(long taskId)
         {
             var data = packTaskService.GetStoreGetSelfData(taskId);
@@ -1230,7 +1268,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 Task.Factory.StartNew(() => SearchTaskList());
 
                 return true;
-            },true);
+            }, true);
             sorePickProductWindow.ShowDialog();
 
 
@@ -1346,7 +1384,7 @@ namespace BBWY.Client.ViewModels.PackTask
         private void SetSealBox(object obj)
         {
 
-            
+
         }
 
 
@@ -1373,7 +1411,8 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
             }
 
-            SetSealBoxWindow setSealBoxWindow = new SetSealBoxWindow(new Action<int>((boxCount) => {
+            SetSealBoxWindow setSealBoxWindow = new SetSealBoxWindow(new Action<int>((boxCount) =>
+            {
 
 
 
@@ -1508,6 +1547,13 @@ namespace BBWY.Client.ViewModels.PackTask
         private Thread fallwareOverTimeThread = null;
         private Thread waitTransportOverTimeThread = null;
 
+        QualityTaskService qualityTaskService;
+
+        private string qualityExceptionCount;
+        /// <summary>
+        /// 验收异常总数
+        /// </summary>
+        public string QualityExceptionCount { get => qualityExceptionCount; set { Set(ref qualityExceptionCount, value); } }
         /// <summary>
         /// 搜索任务列表
         /// </summary>
@@ -1834,7 +1880,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     });
 
                 }
-                else if (taskState == Models.TaskState.商家自取)
+                else if (TaskState == Models.TaskState.商家自取)
                 {
                     StoreGetSelfDataList = new ObservableCollection<StoreGetSelfData>();
                     var datas = packTaskService.SearchStoreGetSelfList(SearchTaskId, SearchOrderSn, SearchSpuId, SearchSkuId, SearchDepartment, SearchShopName, PageIndex, PageSize, null);
@@ -1858,6 +1904,177 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
 
                 }
+                else if (TaskState == Models.TaskState.待验收)
+                {
+                    PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
+                    var datas = qualityTaskService.SearchQualityTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, SearchSpuId, SearchOrderSn, this.QualityTaskExceptionState, SearchShopName,
+                        PageIndex, PageSize, SearchSkuTitle, SearchSpuTitle, SearchPackUserName);
+                    stopwatch.Stop();
+                    App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        Debug.WriteLine($"查询接口耗时:{stopwatch.ElapsedMilliseconds}毫秒");
+                    }));
+                    stopwatch.Restart();
+                    if (datas != null && datas.Data != null && datas.Success)
+                    {
+                        var dataModel = datas.Data;
+                        OrderCount = dataModel.TotalCount;
+                        QualityExceptionCount = dataModel.QualityExceptionCount.ToString();
+                        foreach (var item in dataModel.Items)
+                        {
+
+                            var data = JsonConvert.DeserializeObject<PackTaskModel>(JsonConvert.SerializeObject(item));
+                            data.ItemList = new List<SkuMessage>() { new SkuMessage
+                            {    BrandName = item.BrandName,
+                                 Logo= item.Logo,
+                                 SkuName = item.SkuName,
+                                 SkuId = item.SkuId
+                            } };
+                            data.ExpressOrderList = item.ExpressOrderResponses;
+                            data.EndTime = item.CreateTime;
+                            data.SkuTitle = item.SkuGoodsTitle;
+                            data.AcceptName = item.UserName;
+                            //if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
+                            //{
+
+                            //    data.BarCodeModel = item.BarCodeDTO;
+                            //    if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板)
+                            //        data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
+
+                            //}
+                            //if (item.Cers != null)
+                            //{
+                            //    data.CertificateModel = item.Cers;
+
+                            //}
+                            data.ReflashTask = ReflashTask;
+
+                            App.Current.Dispatcher.Invoke(new Action(() =>
+                            {
+                                PackTaskList.Add(data);
+                            }));
+
+
+                        }
+
+
+                        if (TaskState == Models.TaskState.待验收)
+                        {
+                            if (QualityTaskExceptionState == Models.QualityTaskExceptionState.待验收)
+                            {
+                                qualityOverTimeThread = new Thread(() =>
+                                {
+                                    var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待验收 && p.QualityCompletionOverTime != null).ToList();
+                                    if (packtasks.Count() > 0)
+                                    {
+                                        IsStartThread = true;
+                                        while (IsStartThread)
+                                        {
+                                            App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                            {
+                                                foreach (var item in packtasks)
+                                                {
+                                                    TimeSpan datetime;
+                                                    if (item.SendToSetSkuConfigureTime != null)
+                                                        datetime = item.QualityCompletionOverTime.Value.Subtract(item.SendToSetSkuConfigureTime.Value);
+                                                    else
+                                                        datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now);
+                                                    item.QualityRemainTime = OverTimeHelper.GetTimeString(datetime);
+                                                    if (datetime.TotalMilliseconds > 0)
+                                                    {
+                                                        item.IsQualityOverTime = false;
+
+                                                    }
+                                                    else
+                                                    {
+                                                        item.IsQualityOverTime = true;
+                                                    }
+
+                                                }
+                                            }));
+                                            Thread.Sleep(1000);
+                                        }
+                                    }
+
+
+
+
+
+
+                                });
+                                //任务倒计时数据
+                                qualityOverTimeThread.IsBackground = true;
+                                qualityOverTimeThread.Start();
+                                //任务状态为待验收
+                            }
+
+                            if (QualityTaskExceptionState == Models.QualityTaskExceptionState.验收异常)
+                            {
+                                var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待验收 && p.TaskAbortTime != null).ToList();
+                                App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                {
+                                    foreach (var item in packtasks)
+                                    {
+                                        TimeSpan datetime;
+                                        datetime = item.QualityCompletionOverTime.Value.Subtract(item.TaskAbortTime.Value);
+                                        item.QualityRemainTime = OverTimeHelper.GetTimeString(datetime);
+                                        if (datetime.TotalMilliseconds > 0)
+                                        {
+                                            item.IsQualityOverTime = false;
+
+                                        }
+                                        else
+                                        {
+                                            item.IsQualityOverTime = true;
+                                        }
+
+                                    }
+                                }));
+                            }
+
+                        }
+
+                        //任务状态为待打包
+
+
+
+                        Task.Factory.StartNew(() =>
+                        {
+                            foreach (var item in PackTaskList)
+                            {
+                                if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())
+                                {
+                                    var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
+                                    if (expressData != null && expressData.Success && expressData.Data != null)
+                                    {
+
+                                        App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                        {
+                                            expressData.Data.ForEach(e =>
+                                            {
+                                                e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
+
+
+                                            });
+                                            item.ExpressOrderList = expressData.Data;
+                                        }));
+
+
+
+
+                                    }
+                                }
+                            }
+
+
+
+
+                        });
+                    }
+                    else
+                    {
+                    }
+                }
                 else
                 {
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
@@ -1876,7 +2093,7 @@ namespace BBWY.Client.ViewModels.PackTask
                         foreach (var item in dataModel.Items)
                         {
 
-                            var data = JsonConvert.DeserializeObject<PackTaskModel>( JsonConvert.SerializeObject(item));
+                            var data = JsonConvert.DeserializeObject<PackTaskModel>(JsonConvert.SerializeObject(item));
 
 
                             data.ItemList = new List<SkuMessage>() { new SkuMessage
@@ -2062,7 +2279,8 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
-                        Task.Factory.StartNew(() => {
+                        Task.Factory.StartNew(() =>
+                        {
                             foreach (var item in PackTaskList)
                             {
                                 if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())
@@ -2070,7 +2288,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                     var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
                                     if (expressData != null && expressData.Success && expressData.Data != null)
                                     {
-                                      
+
                                         App.Current.Dispatcher.BeginInvoke(new Action(() =>
                                         {
                                             expressData.Data.ForEach(e =>
@@ -2081,14 +2299,14 @@ namespace BBWY.Client.ViewModels.PackTask
                                             });
                                             item.ExpressOrderList = expressData.Data;
                                         }));
-                                       
+
 
 
 
                                     }
                                 }
                             }
-                           
+
 
 
 
@@ -2113,7 +2331,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     Debug.WriteLine($"查询耗时:{stopwatch.ElapsedMilliseconds}毫秒");
                 }));
 
-               
+
             });
         }
 

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -855,6 +855,10 @@ namespace BBWY.Client.ViewModels
 
 
             });
+
+
+
+
         }
         public Action ReflashWindow { get; set; }
 

BBWY.Client/Views/PackTask/WareHouseList.xaml

@@ -149,7 +149,7 @@
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
                 <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}"    />
+                <waitquality:WaitQualityList Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"    />
                 <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"  />
                 <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}"  />
                 <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}"  />

BBWY.Client/Views/QualityTask/AddExceptionWindow.xaml

@@ -0,0 +1,70 @@
+<c:BWindow x:Class="BBWY.Client.Views.QualityTask.AddExceptionWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.QualityTask"
+       xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+WindowStartupLocation="CenterScreen"
+CloseButtonVisibility="Visible"
+xmlns:hc="https://handyorg.github.io/handycontrol"
+CloseButtonColor="{StaticResource WindowButtonColor}"
+MinButtonVisibility="Collapsed"
+MaxButtonVisibility="Collapsed"
+Width="384" Height="300" ResizeMode="NoResize"
+RightButtonGroupMargin="0,5,5,0">
+    <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="39"/>
+            <RowDefinition/>
+            <RowDefinition Height="36"/>
+
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+        Background="{StaticResource Button.Background}">
+            <TextBlock Text="添加异常"  HorizontalAlignment="Left"  Foreground="White"  Margin="20 0 0 0" VerticalAlignment="Center"/>
+        </Border>
+        <Grid Grid.Row="1" Margin="20 20 20 20">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
+
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0"  Height="30" Margin="0">
+                <Rectangle    HorizontalAlignment="Stretch"  Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
+                <Grid   Height="30" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Label  HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  Content="异常类型:"/>
+                    <Grid  Grid.Column="1">
+                        <Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1" HorizontalAlignment="Stretch"/>
+                        <ComboBox Height="30" HorizontalAlignment="Stretch"   ItemsSource="{Binding TaskExceptionTypeList}"  Text="{Binding ExceptionType}" BorderThickness="0" Margin="1" >
+                            <ComboBox.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>
+                            </ComboBox.Resources>
+                        </ComboBox>
+
+                    </Grid>
+
+                </Grid>
+            </Grid>
+
+            <c:BTextBox Grid.Row="1"  Text="{Binding RemarkMsg}"  HorizontalContentAlignment="Left" VerticalContentAlignment="Top" WaterRemark="备注消息" Height="NaN" VerticalAlignment="Stretch"/>
+
+        </Grid>
+
+        <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="2" VerticalAlignment="Top"/>
+        <c:BButton Grid.Row="2" Content="确定" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click"  
+      />
+
+    </Grid>
+</c:BWindow>

BBWY.Client/Views/QualityTask/AddExceptionWindow.xaml.cs

@@ -0,0 +1,84 @@
+using BBWY.Client.APIServices.QiKu;
+using BBWY.Client.Models;
+using BBWY.Controls;
+using EnumsNET;
+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.Shapes;
+using WebSocketSharp;
+
+namespace BBWY.Client.Views.QualityTask
+{
+    /// <summary>
+    /// AddExceptionWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class AddExceptionWindow : BWindow
+    {
+        public AddExceptionWindow(QualityTaskService qualityTaskService, long taskId)
+        {
+            InitializeComponent();
+            this.qualityTaskService = qualityTaskService;
+            this.TaskId = taskId;
+            this.DataContext = this;
+      
+        }
+        QualityTaskService qualityTaskService;
+
+
+        private long taskId;
+        /// <summary>
+        /// 任务id
+        /// </summary>
+        public long TaskId { get=> taskId; set {Set(ref taskId,value); } }
+
+
+        private TaskExceptionType taskExceptionType;
+        /// <summary>
+        /// 验收异常类型
+        /// </summary>
+        public TaskExceptionType TaskExceptionType { get => taskExceptionType; set { Set(ref taskExceptionType, value); } }
+
+
+        private List<TaskExceptionType> taskExceptionTypeList=new List<TaskExceptionType> { 
+         TaskExceptionType.配件未到齐
+        };
+        /// <summary>
+        /// 验收异常类型
+        /// </summary>
+        public List< TaskExceptionType> TaskExceptionTypeList { get => taskExceptionTypeList; set { Set(ref taskExceptionTypeList, value); } }
+
+
+        private string remarkMsg;
+        /// <summary>
+        /// 备注消息
+        /// </summary>
+        public string RemarkMsg { get => remarkMsg; set { Set(ref remarkMsg, value); } }
+
+        private void BButton_Click(object sender, RoutedEventArgs e)
+        {
+
+            if (RemarkMsg.IsNullOrEmpty())
+            {
+                MessageBox.Show("请输入具体问题描述.");
+                return;
+            }
+
+            var res = qualityTaskService.QualityTaskException(TaskId, TaskExceptionType, RemarkMsg);
+            if (res==null||!res.Success)
+            {
+                MessageBox.Show(res?.Msg);
+                return;
+            }
+
+            this.Close();
+        }
+    }
+}

BBWY.Client/Views/QualityTask/QualityControl.xaml

@@ -0,0 +1,500 @@
+<UserControl x:Class="BBWY.Client.Views.QualityTask.QualityControl"
+             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"  
+             mc:Ignorable="d" Background="White"
+             xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+    </UserControl.Resources>
+
+
+
+    <Grid>
+        <Grid.RowDefinitions>
+
+            <RowDefinition Height="45"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <Border Height="1" Grid.Row="0"  Margin="0 0 0 0" Background="{StaticResource Border.Brush}" VerticalAlignment="Top"/>
+        <Grid Grid.Row="0" Margin="0 0 0 0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="300"/>
+                <ColumnDefinition Width="80"/>
+                <ColumnDefinition Width="140"/>
+                <ColumnDefinition Width="200"/>
+                <ColumnDefinition MinWidth="280"/>
+                <ColumnDefinition  MinWidth="280"/>
+                <ColumnDefinition  Width="160"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="任务时限" Grid.Column="2"  Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="包装组合类型" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="包装配件" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="操作" Grid.Column="6"   Style="{StaticResource middleTextBlock}"/>
+            <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="1"   
+                     ItemsSource="{Binding PackTaskList}"              
+                     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="80"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition Width="200"/>
+                                <ColumnDefinition MinWidth="280"/>
+                                <ColumnDefinition  MinWidth="280"/>
+                                <ColumnDefinition  Width="160"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
+                                <TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
+                                <TextBlock Text="{Binding EndTime,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"
+       
+      />
+                                <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 AcceptName}" Margin="5,0,0,0" />
+
+
+                                </StackPanel>
+                            </StackPanel>
+
+                            <StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" 
+                                  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
+                                        >
+                                <!-- -->
+                                <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
+                                <!--<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
+                                   Margin="5,0,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>-->
+                            </StackPanel>
+                        </Grid>
+                        <Grid Grid.Row="1">
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="300"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition Width="200"/>
+                                <ColumnDefinition MinWidth="280"/>
+                                <ColumnDefinition  MinWidth="280"/>
+                                <ColumnDefinition  Width="160"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition />
+                                    <!--<ColumnDefinition  />-->
+                                </Grid.ColumnDefinitions>
+
+                                <!--{Binding Logo}-->
+                                <c:BAsyncImage UrlSource="{Binding  ItemList[0].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>
+                                <!--<StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
+        <TextBlock Foreground="{StaticResource Text.Gray}">
+                    <Run Text="货号:" />
+        </TextBlock>
+        <c:BButton Content="{Binding GoodsNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
+                           Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                           CommandParameter="{Binding GoodsNo}"
+                           Margin=" 5,0,0,0"/>
+    </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 SkuCount}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="2" >
+
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"  
+                                            Visibility="{Binding SendToSetSkuConfigureTime,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
+                                    <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                        Visibility="{Binding QualityRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                        >
+                                        <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                Visibility="{Binding IsQualityOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+                                            >
+                                            <TextBlock  Text="剩余: " />
+                                            <TextBlock  Text="{Binding  QualityRemainTime}"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Margin="10,5"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                             Visibility="{Binding IsQualityOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
+                                            <StackPanel  Orientation="Horizontal"   
+                                            >
+                                                <TextBlock  Foreground="Red"  Text="超时: "/>
+                                                <TextBlock  Foreground="Red"  Text="{Binding  QualityRemainTime}"/>
+                                            </StackPanel>
+
+                                        </StackPanel>
+                                        <c:BButton Margin="0 10 0 0"    Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                               >
+                                            <b:Interaction.Triggers>
+                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                    <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                        <b:InvokeCommandAction.CommandParameter>
+                                                            <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                <Binding Path="TaskId"/>
+                                                                <Binding Path="QualityOverTimeMarkMsg"/>
+                                                            </MultiBinding>
+                                                        </b:InvokeCommandAction.CommandParameter>
+                                                    </b:InvokeCommandAction>
+                                                </b:EventTrigger>
+                                            </b:Interaction.Triggers>
+                                        </c:BButton>
+                                    </StackPanel>
+                                </StackPanel>
+
+
+
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"  
+                                            Visibility="{Binding SendToSetSkuConfigureTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
+                                    <TextBlock Style="{StaticResource middleTextBlock}" Text="待合格证信息补全"/>
+                                </StackPanel>
+
+                            </Grid>
+                            <Grid Grid.Column="3" >
+                                <StackPanel VerticalAlignment="Center" >
+
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                        <TextBlock  Text="组合类型:"/>
+                                        <TextBlock  Text="{Binding  PackType}"/>
+                                    </StackPanel>
+                                    <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                        <TextBlock  Text="配件数量:"/>
+                                        <TextBlock  Text="{Binding GoodsNumber}"/>
+                                    </StackPanel>
+
+
+
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="4" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock 
+                                               Text="{Binding SkuTitle}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </Grid>
+
+                            <Grid Grid.Column="5">
+                                <ListBox x:Name="listbox_expressorder"   ItemsSource="{Binding ExpressOrderList}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0" 
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" VerticalAlignment="Stretch"
+                                          Visibility="{Binding ExpressOrderList,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                         >
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_expressorder,Converter={StaticResource widthConverter},ConverterParameter=-0}"
+                                                  
+                                                  >
+                                                <!--Height="{Binding ActualHeight,ElementName=listbox_expressorder,Converter={StaticResource widthConverter},ConverterParameter=-0}"-->
+
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition/>
+                                                    <RowDefinition/>
+                                                    <RowDefinition/>
+                                                </Grid.RowDefinitions>
+                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="0" Margin="10 11 0 0">
+                                                    <TextBlock Text="物流状态:" Foreground="Gray"/>
+                                                    <TextBlock  Text="{Binding ExpressState}"/>
+                                                    <TextBlock  Foreground="Gray" Text="{Binding TargetExpressName,StringFormat=\{0\}:}" Margin="10 0 2 0"/>
+                                                    <c:BButton Style="{StaticResource LinkButton}" Content="{Binding  WaybillNo}"
+                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding WaybillNo}"
+                                                                   />
+
+                                                </StackPanel>
+                                                <TextBlock Text="{Binding ExpressChangedTime,StringFormat=yyyy-MM-dd HH:mm:ss}"  Grid.Row="1" Margin="10 12 0 0"/>
+
+                                                <TextBlock  Foreground="Gray" TextTrimming="CharacterEllipsis" Margin="10 11 10 11" Grid.Row="2">
+                                                    <TextBlock.ToolTip>
+                                                        <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                            <TextBlock Text="{Binding ExpressContent}"/>
+                                                        </ToolTip>
+                                                    </TextBlock.ToolTip>
+                                                         <Run Text="{Binding ExpressContent}"/>
+                                                    </TextBlock>
+
+
+
+                                                <Border Background="{StaticResource Border.Brush}" Height="1" Grid.Row="0" VerticalAlignment="Top"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+
+
+
+                            </Grid>
+
+                         
+                            <Grid Grid.Column="6" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="商品验收" 
+                                                   Command="{Binding QualityTaskCommand}"
+                                                   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" 
+                                                    />
+
+                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收异常" 
+             Command="{Binding  DataContext.QualityTaskExceptionCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"
+             Visibility="{Binding DataContext.QualityTaskExceptionState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" 
+              />
+
+                                    <!--Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" -->
+                                    <!--<StackPanel >
+                                        <StackPanel.Visibility>
+                                            <MultiBinding Converter="{StaticResource mobjConverter}"
+                                      ConverterParameter="9;待验收:&amp;:Visible:Collapsed:1">
+                                                <Binding Path="ShopId"/>
+                                                <Binding Path="TaskState"/>
+                                            </MultiBinding>
+                                        </StackPanel.Visibility>
+                                        <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="信息不全" 
+                                                  CommandParameter="{Binding }"
+                                                  Command="{Binding DataContext.SendToSetSkuConfigureCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                            <c:BButton.Visibility>
+                                                <MultiBinding Converter="{StaticResource mobjConverter}"
+                                      ConverterParameter=";:amp;:Visible:Collapsed:1">
+                                                    <Binding Path="BarCodeModel"/>
+                                                    <Binding Path="CertificateModel"/>
+                                                </MultiBinding>
+
+                                            </c:BButton.Visibility>
+                                        </c:BButton>
+                                    </StackPanel>-->
+
+
+
+                                    <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="商家自取" 
+                                                  CommandParameter="{Binding TaskId}"
+                                                  Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                                   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待排单|待包装:Visible:Collapsed}" 
+                                                    />
+
+                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 5 0 5 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
+
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Row="1"  Grid.ColumnSpan="4" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="30"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"  SelectionMode="Single" IsEnabled="False"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                <DockPanel  VerticalAlignment="Center">
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red" TextWrapping="Wrap"/>
+
+                                                </DockPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                            </Grid>
+
+                            <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+
+
+                            <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                <TextBlock.ToolTip>
+                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                        <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                    </ToolTip>
+                                </TextBlock.ToolTip>
+                                    <Run Text="超时原因:"/>
+                                    <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+
+
+
+                            <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="120"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                    <ColumnDefinition  Width="100"/>
+                                    <ColumnDefinition Width="150"/>
+                                    <ColumnDefinition Width="120"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
+                            </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>
+
+
+
+
+</UserControl>

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

BBWY.Client/Views/QualityTask/QualityWindow.xaml

@@ -471,10 +471,7 @@
 Command="{Binding CompeteQualityTaskCommand}"
 CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
 Background="{StaticResource  Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
-            <c:BButton Content="验收异常" Width="100" DockPanel.Dock="Right"    VerticalAlignment="Stretch"   HorizontalAlignment="Right"
+        
-                    Command="{Binding QualityTaskExceptionCommand}"
-                    CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
-                    Background=" #ec808d" BorderThickness="0" Foreground="White"/>
            
         </DockPanel>
         <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="1" VerticalAlignment="Bottom"/>

BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@@ -579,10 +579,16 @@
                                 </Grid>
                                 <Grid Grid.Column="12" >
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                        <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收" 
+                                        <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="商品验收" 
                                                    Command="{Binding QualityTaskCommand}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" 
                                                     />
+
+                                        <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收异常" 
+             Command="{Binding QualityTaskExceptionCommand}"
+             Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" 
+              />
+                                       
                                         <!--Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" -->
                                         <StackPanel >
                                             <StackPanel.Visibility>

BBWY.Client/Views/QualityTask/WaitQualityList.xaml

@@ -0,0 +1,224 @@
+<UserControl x:Class="BBWY.Client.Views.QualityTask.WaitQualityList"
+             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" Background="White"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:local="clr-namespace:BBWY.Client.Views.QualityTask"
+            
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+              mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+        <Style TargetType="RadioButton">
+
+            <Setter Property="IsChecked" Value="False" />
+            <Setter Property="Background" Value="#8080FF" />
+            <Setter Property="Foreground" Value="Black" />
+            <!--<Setter Property="Content" Value="{Binding ElementName=txt,Path=Text}"/>-->
+            <Setter  Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid  Background="#F2F2F2"  >
+                            <Rectangle x:Name="_Rect"   Fill="#F2F2F2" HorizontalAlignment="Center" Height="35"  VerticalAlignment="Center" Width="{TemplateBinding Width}" RenderTransformOrigin="0.5,0.5">
+                                <Rectangle.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform ScaleY="-1"/>
+                                        <SkewTransform/>
+                                        <RotateTransform/>
+                                        <TranslateTransform/>
+                                    </TransformGroup>
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="35">
+                                <TextBlock   VerticalAlignment="Center" Text="{TemplateBinding Content}"  />
+                                <TextBlock   VerticalAlignment="Center" Text="{TemplateBinding  Tag}"  Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
+                            </StackPanel>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="true">
+                                <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
+                                <Setter Property="Foreground" Value="white"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </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" Height="30" TextChanged="tb_TextChanged"   Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称"
+                        BorderThickness="1 0 0 1"  Margin="0 0 0 1"
+                        />
+            <ListBox MaxHeight="300"  x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}"/>
+
+
+        </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="50"/>
+                <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" Margin="0,0,0,0" 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">
+                                <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>
+
+
+                    <!--<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="20,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="20,0,0,0">
+                        <Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
+                        <StackPanel Orientation="Horizontal" Margin="1">
+                            <ComboBox  Width="125" 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>
+
+
+            <StackPanel Orientation="Horizontal" Grid.Row="1">
+                <RadioButton Content="待验收"  Height="35" Width="130"   IsChecked="{Binding QualityTaskExceptionState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
+                      Command="{Binding SetQualityTaskExceptionStateCommand}" CommandParameter="{x:Static cmodel:QualityTaskExceptionState.待验收}"
+                      />
+                <RadioButton Content="验收异常"   Height="35" Width="130" Tag="{Binding QualityExceptionCount,Mode=TwoWay}" IsChecked="{Binding QualityTaskExceptionState,Converter={StaticResource objConverter},ConverterParameter=验收异常:True:False}"
+                       Command="{Binding SetQualityTaskExceptionStateCommand}" CommandParameter="{x:Static cmodel:QualityTaskExceptionState.验收异常}"
+                      />
+            </StackPanel>
+
+            <Grid Grid.Row="2">
+                <local:QualityControl/>
+            </Grid>
+
+        </Grid>
+    </Grid>
+   
+</UserControl>

BBWY.Client/Views/QualityTask/WaitQualityList.xaml.cs

@@ -0,0 +1,245 @@
+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.Windows;
+using System.Windows.Controls;
+using WebSocketSharp;
+
+namespace BBWY.Client.Views.QualityTask
+{
+    /// <summary>
+    /// WaitQualityList.xaml 的交互逻辑
+    /// </summary>
+    public partial class WaitQualityList : UserControl
+    {
+        public WaitQualityList()
+        {
+            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/QualityTipWindows/QualityProductWindow.xaml

@@ -0,0 +1,38 @@
+<c:BWindow x:Class="BBWY.Client.Views.QualityTipWindows.QualityProductWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.QualityTipWindows"
+    xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+    WindowStartupLocation="CenterScreen"
+    CloseButtonVisibility="Visible"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
+    CloseButtonColor="{StaticResource WindowButtonColor}"
+    MinButtonVisibility="Collapsed"
+    MaxButtonVisibility="Collapsed"
+    Width="330" Height="200" ResizeMode="NoResize"
+    RightButtonGroupMargin="0,5,5,0">
+    <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35"/>
+            <RowDefinition/>
+
+
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+            Background="{StaticResource Border.Background}">
+            <TextBlock Text="{Binding Title}"  HorizontalAlignment="Center"  Margin="20 0 0 0" VerticalAlignment="Center"/>
+        </Border>
+        <Grid Grid.Row="1" Margin="50 0 50 0">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+
+            </Grid.RowDefinitions>
+            <c:BButton Grid.Row="0" Name="btn_true" Click="btn_true_Click" Content="{Binding IsTrueMsg}" Margin="0,20,0,0"  VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="40"/>
+            <c:BButton Grid.Row="1" Name="btn_false" Click="btn_false_Click" Content="{Binding IsFalseMsg}" Margin="0,10,0,0"  VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="40"/>
+        </Grid>
+    </Grid>
+</c:BWindow>

BBWY.Client/Views/QualityTipWindows/QualityProductWindow.xaml.cs

@@ -0,0 +1,68 @@
+using BBWY.Client.Models;
+using BBWY.Controls;
+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.Shapes;
+
+namespace BBWY.Client.Views.QualityTipWindows
+{
+    /// <summary>
+    /// ProductCerWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class QualityProductWindow : BWindow
+    {
+        public QualityProductWindow(string title, string isTrueMsg, string isFalseMsg, Action<bool> clickReturn)
+        {
+            InitializeComponent();
+            this.DataContext = this;
+            Title = title;
+            IsTrueMsg = isTrueMsg;
+            IsFalseMsg = isFalseMsg;
+            ClickReturn = clickReturn;
+        }
+
+        private string   title;
+        /// <summary>
+        /// 封箱配置状态
+        /// </summary>
+        public string Title { get => title; set { Set(ref title, value); } }
+
+
+        private string isTrueMsg;
+        /// <summary>
+        /// 封箱配置状态
+        /// </summary>
+        public string IsTrueMsg { get => isTrueMsg; set { Set(ref isTrueMsg, value); } }
+
+        private string isFalseMsg;
+        /// <summary>
+        /// 封箱配置状态
+        /// </summary>
+        public string IsFalseMsg { get => isFalseMsg; set { Set(ref isFalseMsg, value); } }
+
+
+        public Action<bool> ClickReturn { get; set; }
+
+        private void btn_true_Click(object sender, RoutedEventArgs e)
+        {
+            this.Visibility = Visibility.Collapsed;
+            ClickReturn?.Invoke(true);
+            this.Close();
+        }
+
+        private void btn_false_Click(object sender, RoutedEventArgs e)
+        {
+            this.Visibility = Visibility.Collapsed;
+            ClickReturn.Invoke(false);
+            this.Close();
+        }
+    }
+}