添加过期时间

BBWY.Client/APIServices/QiKu/PackTaskService.cs

@@ -178,6 +178,8 @@ namespace BBWY.Client.APIServices
           , null, HttpMethod.Post);
         }
 
+        
+
         public ApiResponse<long> SaveBarCode(BarCodeRequest barCodeModel)
         {
             return SendRequest<long>(globalContext.QKApiHost, "api/PackTask/CommitBarCode", barCodeModel
@@ -283,6 +285,11 @@ namespace BBWY.Client.APIServices
             return SendRequest<bool>(globalContext.QKApiHost, $"api/PackTask/StoreGetBySelf?TaskId={taskId}", null, null, HttpMethod.Post);
         }
 
+        public ApiResponse<bool> CompletedPackTask(long taskId)
+        {
+            return SendRequest<bool>(globalContext.QKApiHost, $"api/PackTask/CompletedPackTask?taskId={taskId}", null, null, HttpMethod.Post);
+        }
+
     }
 
     public class CompeteSealBox

BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs

@@ -88,10 +88,10 @@ namespace BBWY.Client.Models.APIModel.Request
         /// </summary>
         public int GoodProductQuantity { get; set; }
 
-        /// <summary>
-        /// 预计完成时间
-        /// </summary>
-        public DateTime? PreCompeteTime { get; set; }
+        ///// <summary>
+        ///// 预计完成时间
+        ///// </summary>
+        //public DateTime? PreCompeteTime { get; set; }
 
         /// <summary>
         /// 地拖摆放编号

BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs

@@ -5,6 +5,11 @@ namespace BBWY.Client.Models
 {
     public class PurchaseOrderV2Response
     {
+
+        /// <summary>
+        /// 拳探订单独有Sn号
+        /// </summary>
+        public string OrderSn { get; set; }
         /// <summary>
         /// 采购单号
         /// </summary>

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

@@ -169,5 +169,48 @@ namespace BBWY.Client.Models.APIModel
         /// 地托编号
         /// </summary>
         public int? FloorDragNumber { get; set; }
+
+        /// <summary>
+        /// 质检超时时间
+        /// </summary>
+        public DateTime? QualityCompletionOverTime { get; set; }
+
+        /// <summary>
+        /// 打包完成时间(超时时间)
+        /// </summary>
+        public DateTime? PackCompletionOverTime { get; set; }
+
+
+        /// <summary>
+        /// 物流信息
+        /// </summary>
+        public List<ExpressOrderResponse> ExpressOrderList { get; set; }
+    }
+    public class ExpressOrderResponse
+    {
+        /// <summary>
+        /// 快递单号
+        /// </summary>
+        public string WaybillNo { get; set; }
+
+        /// <summary>
+        /// 物流状态 (ZaiTu,LanShou,QianShou,PaiJian,Unknow)
+        /// </summary>
+        public string ExpressState { get; set; }
+
+        /// <summary>
+        /// 物流内容
+        /// </summary>
+        public string ExpressContent { get; set; }
+
+        /// <summary>
+        /// 目标快递公司名称(kuaidi100)
+        /// </summary>
+        public string TargetExpressName { get; set; }
+
+        /// <summary>
+        /// 变更时间
+        /// </summary>
+        public DateTime? ExpressChangedTime { get; set; }
     }
 }

BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs

@@ -19,6 +19,11 @@ namespace BBWY.Client.Models.APIModel
 
     public class WareSealBoxData
     {
+        /// <summary>
+        /// 过期时间
+        /// </summary>
+        public DateTime? SealBoxPackOverTime { get; set; }
+
         public long SealBoxId { get; set; }
         /// <summary>
         /// 店铺Id

BBWY.Client/Models/Enums.cs

@@ -243,7 +243,9 @@
         已取消 = 7,
         待落仓 = 8,
         待完结 = 9,
-        商家自取 = 10
+        商家自取 = 10,
+        待转运=11
+
     }
 
 

BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 namespace BBWY.Client.Models.FallWare
 {
-   public class FallWareConfiguredModel
+   public class FallWareConfiguredModel:NotifyObject
     { /// <summary>
       /// 商品名称
       /// </summary>
@@ -48,10 +48,23 @@ namespace BBWY.Client.Models.FallWare
         /// </summary>
         public int SealBoxTotalCount { get; set; }
 
+        /// <summary>
+        /// 提交采购单过期时间
+        /// </summary>
+        public DateTime? SetPurchaseOrderOverTime { get; set; }
         /// <summary>
         /// 仓库任务列表
         /// </summary>
         public IList<FallWareConfigureTask> SealBoxConfigureTasks { get; set; }
+
+
+
+
+        private string fallWareRemainTime;
+        public string FallWareRemainTime { get => fallWareRemainTime; set { Set(ref fallWareRemainTime, value); } }
+
+        private bool isFallWareOverTime;
+        public bool IsFallWareOverTime { get => isFallWareOverTime; set { Set(ref isFallWareOverTime, value); } }
     }
     public class FallWareConfigureTask : SealBoxConfigureTask
     {

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -1,4 +1,5 @@
 using BBWY.Client.APIServices;
+using BBWY.Client.Models.APIModel;
 using BBWY.Client.Models.APIModel.Response.PackTask;
 using BBWY.Client.ViewModels;
 using BBWY.Client.ViewModels.PackTask;
@@ -26,14 +27,9 @@ namespace BBWY.Client.Models
 
         private bool isShowFees;
         public bool IsShowFees { get => isShowFees; set { Set(ref isShowFees, value); } }
-
         private long id;
-
         public long Id { get => id; set { Set(ref id, value); } }
-
-
         public ICommand PrintBarcodeCommand { get; set; }
-
         public ICommand PrintCerCommand { get; set; }
         public ICommand LookCerCommand { get; set; }
         public ICommand LookBarCommand { get; set; }
@@ -42,15 +38,8 @@ namespace BBWY.Client.Models
         /// 修改任务
         /// </summary>
         public ICommand UpdateTaskCommand { get; set; }
-
         public ICommand QualityTaskCommand { get; set; }
-
-
-
         public Action ReflashTask { get; set; }
-
-
-
         private void UpdateTask()
         {
 
@@ -64,19 +53,6 @@ namespace BBWY.Client.Models
 
             PublishTaskWindow publish = new PublishTaskWindow(ReflashTask, this);
             publish.Show();
-
-            //CreatePackTask create = new CreatePackTask();
-
-            //ViewModelLocator viewModel = new ViewModelLocator();
-            //var createViewModel = viewModel.CreateTaskView;
-            //if (createViewModel.ReflashWindow == null)
-            //{
-            //    createViewModel.ReflashWindow = ReflashTask;
-            //}
-            //create.SendData(this);//初始化数据
-            //create.ShowDialog();
-
-
         }
 
 
@@ -408,13 +384,49 @@ namespace BBWY.Client.Models
         public string OrderId { get; set; }
         private int? floorDragNumber;
         public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } }
+
+        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); } }
+
+        /// <summary>
+        /// 质检超时时间
+        /// </summary>
+        public DateTime? QualityCompletionOverTime { get; set; }
+
+
+
+
+        private string packRemainTime;
+        /// <summary>
+        /// 打包剩余时间
+        /// </summary>
+        public string PackRemainTime { get => packRemainTime; set { Set(ref packRemainTime, value); } }
+
+        /// <summary>
+        /// 打包完成时间(超时时间)
+        /// </summary>
+        public DateTime? PackCompletionOverTime { get; set; }
+
+        private bool isPackOverTime;
+        public bool IsPackOverTime { get => isPackOverTime; set { Set(ref isPackOverTime, value); } }
+        /// <summary>
+        /// 物流信息
+        /// </summary>
+        public List<ExpressOrderResponse> ExpressOrderList { get; set; }
+       
     }
 
     public class SkuMessage : NotifyObject
     {
-        private string id;
+        private string skuId;
 
-        public string Id { get => id; set { Set(ref id, value); } }
+        public string SkuId { get => skuId; set { Set(ref skuId, value); } }
 
         /// <summary>
         /// 店铺Sku图链接

BBWY.Client/Models/PackTask/SealBoxModel.cs

@@ -5,8 +5,11 @@ using System.Text;
 
 namespace BBWY.Client.Models.PackTask
 {
-    public class SealBoxModel
-    {
+    public class SealBoxModel : NotifyObject
+    {      /// <summary>
+           /// 过期时间
+           /// </summary>
+        public DateTime? SealBoxPackOverTime { get; set; }
         /// <summary>
         /// /封箱id
         /// </summary>
@@ -43,10 +46,19 @@ namespace BBWY.Client.Models.PackTask
         /// </summary>
         public List<WareSealBoxSku> SealBoxSkus { get; set; }
 
-
         /// <summary>
         /// 封箱数
         /// </summary>
-        public int? SealBoxCount{ get; set; }
+        private int? sealBoxCount;
+        /// <summary>
+        /// 封箱数
+        /// </summary>
+        public int? SealBoxCount { get => sealBoxCount; set { Set(ref sealBoxCount, value); } }
+
+        private string sealBoxRemainTime;
+        public string SealBoxRemainTime { get => sealBoxRemainTime; set { Set(ref sealBoxRemainTime, value); } }
+
+        private bool isSealBoxOverTime;
+        public bool IsSealBoxOverTime { get => isSealBoxOverTime; set { Set(ref isSealBoxOverTime, value); } }
     }
 }

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -278,20 +278,20 @@ namespace BBWY.Client.ViewModels.PackTask
                 PurchaseOrder = fallware.PurchaseOrder,
                 WaybillNo = fallware.WaybillNo
             };
-            if (fallware.WareType== WareType.京仓)
-            {
+            //if (fallware.WareType== WareType.京仓)
+            //{
 
                 //SetJDWareBoxWindow window = new SetJDWareBoxWindow(model,sealBoxService,fallware.WareType.Value,ReflashTask);
                 //window.Show();
                 var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType.Value, ReflashTask);
                 w.ShowDialog();
-            }
-            if (fallware.WareType == WareType.云仓)
-            {
+            //}
+            //if (fallware.WareType == WareType.云仓)
+            //{
 
-                SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType.Value, ReflashTask);
-                window.Show();
-            }
+            //    SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType.Value, ReflashTask);
+            //    window.Show();
+            //}
         }
 
         private void UpdateSealBoxConfigured(SealBoxConfiguredModel model)
@@ -469,11 +469,21 @@ namespace BBWY.Client.ViewModels.PackTask
         private List<TaskState> waitSealBoxTaskStates = new List<TaskState> {
               Models.TaskState.待落仓, Models.TaskState.待封箱
         };//配置封箱的任务状态范围
+
+
+
+
+
+
+
+        private bool IsStartThread = false;
+        private Thread fallwareOverTimeThread = null;
         /// <summary>
         /// 搜索任务列表
         /// </summary>
         public void SearchTaskList()
         {
+            IsStartThread = false;
             long? taskId = null;
             try
             {
@@ -520,7 +530,7 @@ namespace BBWY.Client.ViewModels.PackTask
                             {    BrandName = item.BrandName,
                                  GoodsNo = item.ProductItemNum, Logo= item.Logo,
                                  ShopName = item.ShopName, SkuName = item.SkuName,
-                                  Id = item.SkuId
+                                  SkuId = item.SkuId
 
                             } },
                                     MarkMessage = item.MarkMessage,
@@ -696,6 +706,50 @@ namespace BBWY.Client.ViewModels.PackTask
                                         FallWareWaitConfigureList.Add(item);
                                     }));
                                 }
+
+                                Thread.Sleep(100);
+                                var fallWareTasks = FallWareWaitConfigureList.Where(p => p.SetPurchaseOrderOverTime != null).ToList();
+                                if (fallWareTasks.Count() > 0 && TaskState == Models.TaskState.待落仓&& SealBoxConfigureType == SealBoxConfigureType.待配置)
+                                {
+                                    //if (packOverTimeThread!=null)
+                                    //{
+                                    //    packOverTimeThread.Abort();
+                                    //}
+
+                                    fallwareOverTimeThread = new Thread(() =>
+                                    {
+                                        IsStartThread = true;
+                                        while (IsStartThread)
+                                        {
+                                            App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                            {
+                                                foreach (var item in fallWareTasks)
+                                                {
+                                                    var datetime = item.SetPurchaseOrderOverTime.Value.Subtract(DateTime.Now);
+                                                    if (datetime.TotalMilliseconds > 0)
+                                                    {
+                                                        item.IsFallWareOverTime = false;
+                                                        item.FallWareRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分";
+                                                    }
+                                                    else
+                                                    {
+                                                        item.IsFallWareOverTime = true;
+                                                        item.FallWareRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
+                                                    }
+
+                                                }
+                                            }));
+                                            Thread.Sleep(1000);
+                                        }
+
+                                    });
+                                    //任务倒计时数据
+                                    fallwareOverTimeThread.IsBackground = true;
+                                    fallwareOverTimeThread.Start();
+
+
+                                }
+
                             }
                             if (SealBoxConfigureType == SealBoxConfigureType.已配置)
                             {

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -25,13 +25,14 @@ using BBWY.Client.Views.SealBox;
 using BBWY.Client.Views.FallWare;
 using BBWY.Client.Models.FallWare;
 using WebSocketSharp;
+using System.Threading;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
 
     public partial class WareHouseListViewModel : BaseVM, IDenpendency//注入服务
     {
-
+        //public RelayCommand<string> SelectCmd => new RelayCommand<string>(str => Growl.Info(str));
         #region 属性绑定
 
         private string searchWayBillNo;
@@ -294,17 +295,51 @@ namespace BBWY.Client.ViewModels.PackTask
 
             DeletedTaskCommand = new RelayCommand<object>(DeletedTask);
 
-            StoreGetBySelfCommand = new RelayCommand<object>(StoreGetBySelf);
+            StoreGetBySelfCommand = new RelayCommand<long>(StoreGetBySelf);
+
+            CompletedPackTaskCommand = new RelayCommand<object>(CompletedPackTask);
+
+
         }
 
-        private void StoreGetBySelf(object obj)
+        private void CompletedPackTask(object obj)
         {
-            var packTaskmodel = (PackTaskModel)obj;
-            MessageBoxResult result = System.Windows.MessageBox.Show($"确定商家自取,任务id:{packTaskmodel.TaskId}?", "提示",
+            var model = (PackTaskModel)obj;
+
+            if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.DiscountAllFees == 0)
+            {
+                System.Windows.MessageBox.Show("请先设置打包费用!");
+                return;
+            }
+            if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
+                         MessageBoxButton.YesNo,
+                         MessageBoxImage.Warning) != MessageBoxResult.Yes)
+                return;
+           var  res = packTaskService.CompletedPackTask(model.TaskId);
+            if (res == null)
+            {
+                return;
+            }
+            if (!res.Success)
+            {
+                System.Windows.MessageBox.Show(res.Msg);
+                return;
+            }
+            Task.Factory.StartNew(() => SearchTaskList());
+        }
+
+        private void StoreGetBySelf(long taskId)
+        {
+
+            MessageBoxResult result = System.Windows.MessageBox.Show($"确定商家自取,任务id:{taskId}?", "提示",
                                MessageBoxButton.YesNo,
                                MessageBoxImage.Warning);
             if (result != MessageBoxResult.Yes) return;
-            var res = packTaskService.StoreGetBySelf(packTaskmodel.TaskId);
+            var res = packTaskService.StoreGetBySelf(taskId);
+            if (res == null)
+            {
+                return;
+            }
             if (!res.Success)
             {
                 System.Windows.MessageBox.Show(res.Msg, "错误信息");
@@ -446,6 +481,8 @@ namespace BBWY.Client.ViewModels.PackTask
         public ICommand CompeteFallWareCommand { get; set; }
         public ICommand CompeteSealBoxCommand { get; set; }
 
+        public ICommand CompletedPackTaskCommand { get; set; }
+
         public ICommand SetTaskStatusCommand { get; set; }
         /// <summary>
         /// 打开图片链接
@@ -570,8 +607,6 @@ namespace BBWY.Client.ViewModels.PackTask
                 case Models.TaskState.待封箱:
                     break;
                 case Models.TaskState.待出库:
-
-
                     break;
                 case Models.TaskState.已完成:
                     break;
@@ -608,13 +643,16 @@ namespace BBWY.Client.ViewModels.PackTask
 
         }
 
-
-
+        private bool IsStartThread = false;
+        private Thread qualityOverTimeThread = null;
+        private Thread packOverTimeThread = null;
+        private Thread sealboxOverTimeThread = null;
         /// <summary>
         /// 搜索任务列表
         /// </summary>
         public void SearchTaskList()
         {
+            IsStartThread = false;
             long? taskId = null;
             try
             {
@@ -706,9 +744,49 @@ namespace BBWY.Client.ViewModels.PackTask
                                         WareId = item.WareId,
                                         WareName = item.WareName,
                                         SealBoxId = item.SealBoxId,
+                                        SealBoxPackOverTime= item .SealBoxPackOverTime
                                     });
                                 }));
 
+                            }
+                            Thread.Sleep(500);
+                            var sealboxTasks = WaitSealBoxModels.Where(p => p.SealBoxPackOverTime != null).ToList();
+                            if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.待封箱)
+                            {
+           
+
+                                sealboxOverTimeThread = new Thread(() =>
+                                {
+                                    IsStartThread = true;
+                                    while (IsStartThread)
+                                    {
+                                        App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                        {
+                                            foreach (var item in sealboxTasks)
+                                            {
+                                                var datetime = item.SealBoxPackOverTime.Value.Subtract(DateTime.Now);
+                                                if (datetime.TotalMilliseconds > 0)
+                                                {
+                                                    item.IsSealBoxOverTime = false;
+                                                    item.SealBoxRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分";
+                                                }
+                                                else
+                                                {
+                                                    item.IsSealBoxOverTime = true;
+                                                    item.SealBoxRemainTime = datetime.Days==0? $"{-datetime.Hours}小时{-datetime.Minutes}分" :$"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
+                                                }
+
+                                            }
+                                        }));
+                                        Thread.Sleep(1000);
+                                    }
+
+                                });
+                                //任务倒计时数据
+                                sealboxOverTimeThread.IsBackground = true;
+                                sealboxOverTimeThread.Start();
+
+
                             }
                         }
                         else
@@ -761,6 +839,7 @@ namespace BBWY.Client.ViewModels.PackTask
             else
                 Task.Factory.StartNew(() =>
                 {
+
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
                     var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName,
@@ -785,7 +864,7 @@ namespace BBWY.Client.ViewModels.PackTask
                             {    BrandName = item.BrandName,
                                  GoodsNo = item.ProductItemNum, Logo= item.Logo,
                                  ShopName = item.ShopName, SkuName = item.SkuName,
-                                 Id = item.SkuId
+                                 SkuId = item.SkuId
 
                             } },
                                 MarkMessage = item.MarkMessage,
@@ -800,8 +879,9 @@ namespace BBWY.Client.ViewModels.PackTask
                                 SkuId = item.SkuId,
                                 SkuName = item.SkuName,
                                 FloorDragNumber = item.FloorDragNumber,
-
-
+                                QualityCompletionOverTime = item.QualityCompletionOverTime,
+                                PackCompletionOverTime = item.PackCompletionOverTime,
+                                ExpressOrderList = item.ExpressOrderList,
                             };
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                             {
@@ -814,7 +894,6 @@ namespace BBWY.Client.ViewModels.PackTask
                                 data.CertificateModel = item.Cers;
 
                             }
-
                             data.ReflashTask = ReflashTask;
 
                             if (item.FeesItemResponse != null)
@@ -842,7 +921,97 @@ namespace BBWY.Client.ViewModels.PackTask
                                 PackTaskList.Add(data);
                             }));
 
+
                         }
+                        Thread.Sleep(500);
+                        //任务状态为待质检
+                        var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待质检 && p.QualityCompletionOverTime != null).ToList();
+                        if (packtasks.Count() > 0&& TaskState ==  Models.TaskState.待质检)
+                        {
+                            //if (qualityOverTimeThread!=null)
+                            //{
+                            //    qualityOverTimeThread.Abort();
+                            //}
+
+                            qualityOverTimeThread = new Thread(() =>
+                            {
+                                IsStartThread = true;
+                                while (IsStartThread)
+                                {
+                                    App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                    {
+                                        foreach (var item in packtasks)
+                                        {
+                                            var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now);
+                                            if (datetime.TotalMilliseconds > 0)
+                                            {
+                                                item.IsQualityOverTime = false;
+                                                //item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分{datetime.Seconds}秒";
+                                                item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
+                                            }
+                                            else
+                                            {
+                                                item.IsQualityOverTime = true;
+                                                //item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分{-datetime.Seconds}秒";
+                                                item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
+                                            }
+
+                                        }
+                                    }));
+                                    Thread.Sleep(1000);
+                                }
+
+                            });
+                            //任务倒计时数据
+                            qualityOverTimeThread.IsBackground = true;
+                            qualityOverTimeThread.Start();
+
+
+                        }
+                        var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待打包 && p.PackCompletionOverTime != null).ToList();
+                        if (packCompletedTasks.Count() > 0&& TaskState== Models.TaskState.待打包)
+                        {
+                            //if (packOverTimeThread!=null)
+                            //{
+                            //    packOverTimeThread.Abort();
+                            //}
+
+                            packOverTimeThread = new Thread(() =>
+                            {
+                                IsStartThread = true;
+                                while (IsStartThread)
+                                {
+                                    App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                    {
+                                        foreach (var item in packCompletedTasks)
+                                        {
+                                            var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now);
+                                            if (datetime.TotalMilliseconds > 0)
+                                            {
+                                                item.IsPackOverTime = false;
+                                                item.PackRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
+                                            }
+                                            else
+                                            {
+                                                item.IsPackOverTime = true;
+                                                item.PackRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
+                                            }
+
+                                        }
+                                    }));
+                                    Thread.Sleep(1000);
+                                }
+
+                            });
+                            //任务倒计时数据
+                            packOverTimeThread.IsBackground = true;
+                            packOverTimeThread.Start();
+
+
+                        }
+
+                        //任务状态为待打包
+
                     }
                     else
                     {
@@ -852,6 +1021,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 });
         }
 
+
         private void IsLoadSealBoxCount()
         {
             var res = sealBoxService.GetWareSealBoxConfigureCounts();

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -42,10 +42,10 @@ namespace BBWY.Client.ViewModels
         /// </summary>
         public int GoodProductQuantity { get => goodProductQuantity; set { Set(ref goodProductQuantity, value); } }
 
-        /// <summary>
-        /// 预计完成时间
-        /// </summary>
-        public DateTime? PreCompeteTime { get; set; }
+        ///// <summary>
+        ///// 预计完成时间
+        ///// </summary>
+        //public DateTime? PreCompeteTime { get; set; }
 
         private ObservableCollection<PurchaseSku> purchaseSkuList;
         public ObservableCollection<PurchaseSku> PurchaseSkuList { get => purchaseSkuList; set { Set(ref purchaseSkuList, value); } }
@@ -108,42 +108,42 @@ namespace BBWY.Client.ViewModels
 
 
 
-        private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string>
-        {
+        //private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string>
+        //{
 
-        };
-        public ObservableCollection<string> PreCompeteTimeDayList
-        {
-            get => preCompeteTimeDayList; set
-            {
+        //};
+        //public ObservableCollection<string> PreCompeteTimeDayList
+        //{
+        //    get => preCompeteTimeDayList; set
+        //    {
 
-                Set(ref preCompeteTimeDayList, value);
+        //        Set(ref preCompeteTimeDayList, value);
 
-            }
-        }
+        //    }
+        //}
 
 
-        private ObservableCollection<string> preCompeteTimeHourList = new ObservableCollection<string> {
+        //private ObservableCollection<string> preCompeteTimeHourList = new ObservableCollection<string> {
                 
-             };
-        public ObservableCollection<string> PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } }
+        //     };
+        //public ObservableCollection<string> PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } }
 
-        //
-        public string preCompeteTimeDay;
-        public string PreCompeteTimeDay
-        {
-            get => preCompeteTimeDay; set
-            {
+        ////
+        //public string preCompeteTimeDay;
+        //public string PreCompeteTimeDay
+        //{
+        //    get => preCompeteTimeDay; set
+        //    {
 
-                Set(ref preCompeteTimeDay, value);
-                PreCompeteTimeDayOnChanged();//
-            }
-        }
+        //        Set(ref preCompeteTimeDay, value);
+        //        PreCompeteTimeDayOnChanged();//
+        //    }
+        //}
 
      
 
-        public string preCompeteTimeHour;
-        public string PreCompeteTimeHour { get => preCompeteTimeHour; set { Set(ref preCompeteTimeHour, value); } }
+        //public string preCompeteTimeHour;
+        //public string PreCompeteTimeHour { get => preCompeteTimeHour; set { Set(ref preCompeteTimeHour, value); } }
 
 
         private ObservableCollection<WareHourseDTO> wareHourseList = new ObservableCollection<WareHourseDTO> { };
@@ -499,77 +499,77 @@ namespace BBWY.Client.ViewModels
 
             }
 
-            int hour = Convert.ToInt32(PreCompeteTimeHour.Replace("点前", ""));
-
-
-            DateTime date = DateTime.Now;
-
-            switch (preCompeteTimeDay)
-            {
-                case "今天":
-                    date = DateTime.Now;
-                    break;
-                case "明天":
-                    date = DateTime.Now.AddDays(1);
-                    break;
-                case "后天":
-                    date = DateTime.Now.AddDays(2);
-                    break;
-                default:
-                    break;
-            }
-
-            //date = Convert.ToDateTime(PreCompeteTimeDay);
-
-
-            var competeTime = date.Date.AddHours(hour);
-
-
-
-            if (competeTime < DateTime.Now)
-            {
-                MessageBox.Show($"预计完成时间不能小于当前时间,请重新选择预计完成时间");
-                return;
-            }
-
-
-            var now = DateTime.Now;
-            if (now.Hour < 12)
-            {
-                if (competeTime > now.AddDays(1).Date.AddHours(12))
-                {
-                    MessageBox.Show($"预计完成时间不能超过明天12点,请重新选择预计完成时间");
-                    return;
-                }
-
-
-            }
-            else if (now.Hour < 18)
-            {
-                if (competeTime > now.AddDays(1).Date.AddHours(18))
-                {
-                    MessageBox.Show($"预计完成时间不能超过明天18点,请重新选择预计完成时间");
-                    return;
-                }
-            }
-            else if (now.Hour < 22)
-            {
-                if (competeTime > now.AddDays(1).Date.AddHours(22))
-                {
-                    MessageBox.Show($"预计完成时间不能超过明天22点,请重新选择预计完成时间");
-                    return;
-                }
-            }
-            else
-            {
-                if (competeTime > now.AddDays(2).Date.AddHours(12))
-                {
-                    MessageBox.Show($"预计完成时间不能超过后天12点,请重新选择预计完成时间");
-                    return;
-                }
-            }
-
-            request.PreCompeteTime = competeTime;
+            //int hour = Convert.ToInt32(PreCompeteTimeHour.Replace("点前", ""));
+
+
+            //DateTime date = DateTime.Now;
+
+            //switch (preCompeteTimeDay)
+            //{
+            //    case "今天":
+            //        date = DateTime.Now;
+            //        break;
+            //    case "明天":
+            //        date = DateTime.Now.AddDays(1);
+            //        break;
+            //    case "后天":
+            //        date = DateTime.Now.AddDays(2);
+            //        break;
+            //    default:
+            //        break;
+            //}
+
+            ////date = Convert.ToDateTime(PreCompeteTimeDay);
+
+
+            //var competeTime = date.Date.AddHours(hour);
+
+
+
+            //if (competeTime < DateTime.Now)
+            //{
+            //    MessageBox.Show($"预计完成时间不能小于当前时间,请重新选择预计完成时间");
+            //    return;
+            //}
+
+
+            //var now = DateTime.Now;
+            //if (now.Hour < 12)
+            //{
+            //    if (competeTime > now.AddDays(1).Date.AddHours(12))
+            //    {
+            //        MessageBox.Show($"预计完成时间不能超过明天12点,请重新选择预计完成时间");
+            //        return;
+            //    }
+
+
+            //}
+            //else if (now.Hour < 18)
+            //{
+            //    if (competeTime > now.AddDays(1).Date.AddHours(18))
+            //    {
+            //        MessageBox.Show($"预计完成时间不能超过明天18点,请重新选择预计完成时间");
+            //        return;
+            //    }
+            //}
+            //else if (now.Hour < 22)
+            //{
+            //    if (competeTime > now.AddDays(1).Date.AddHours(22))
+            //    {
+            //        MessageBox.Show($"预计完成时间不能超过明天22点,请重新选择预计完成时间");
+            //        return;
+            //    }
+            //}
+            //else
+            //{
+            //    if (competeTime > now.AddDays(2).Date.AddHours(12))
+            //    {
+            //        MessageBox.Show($"预计完成时间不能超过后天12点,请重新选择预计完成时间");
+            //        return;
+            //    }
+            //}
+
+            //request.PreCompeteTime = competeTime;
 
 
             try
@@ -610,94 +610,94 @@ namespace BBWY.Client.ViewModels
 
         }
 
-        // "12点前","18点前","22点前"
-        private void PreCompeteTimeDayOnChanged()
-        {
-            var now = DateTime.Now;
-            if (now.Hour < 12)
-            {
-                if (PreCompeteTimeDay=="今天")
-                {
-                   PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("12点前");
-                    PreCompeteTimeHourList.Add("18点前");
-                    PreCompeteTimeHourList.Add("22点前");
-                    PreCompeteTimeHour = "12点前";
-                }
-
-
-                if (PreCompeteTimeDay == "明天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("12点前");
-                    PreCompeteTimeHour = "12点前";
-                }
-
-
-            }
-            else if (now.Hour < 18)
-            {
-                if (PreCompeteTimeDay == "今天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("18点前");
-                    PreCompeteTimeHourList.Add("22点前");
-
-                    PreCompeteTimeHour = "18点前";
-                }
-
-
-                if (PreCompeteTimeDay == "明天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("12点前");
-                    PreCompeteTimeHourList.Add("18点前");
-                    PreCompeteTimeHour = "12点前";
-                }
-            }
-            else if (now.Hour < 22)
-            {
-                if (PreCompeteTimeDay == "今天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("22点前");
-                    PreCompeteTimeHour = "22点前";
-                }
-
-
-                if (PreCompeteTimeDay == "明天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("12点前");
-                    PreCompeteTimeHourList.Add("18点前");
-                    PreCompeteTimeHourList.Add("22点前");
-                    PreCompeteTimeHour = "12点前";
-                }
-            }
-            else
-            {
-                if (PreCompeteTimeDay == "明天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("12点前");
-                    PreCompeteTimeHourList.Add("18点前");
-                    PreCompeteTimeHourList.Add("22点前");
-                    PreCompeteTimeHour = "12点前";
-                }
-
-                if (PreCompeteTimeDay == "后天")
-                {
-                    PreCompeteTimeHourList.Clear();
-                    PreCompeteTimeHourList.Add("12点前");
-                    PreCompeteTimeHour = "12点前";
-                }
-            }
-
-
-
-
-
-        }
+        //// "12点前","18点前","22点前"
+        //private void PreCompeteTimeDayOnChanged()
+        //{
+        //    var now = DateTime.Now;
+        //    if (now.Hour < 12)
+        //    {
+        //        if (PreCompeteTimeDay=="今天")
+        //        {
+        //           PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("12点前");
+        //            PreCompeteTimeHourList.Add("18点前");
+        //            PreCompeteTimeHourList.Add("22点前");
+        //            PreCompeteTimeHour = "12点前";
+        //        }
+
+
+        //        if (PreCompeteTimeDay == "明天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("12点前");
+        //            PreCompeteTimeHour = "12点前";
+        //        }
+
+
+        //    }
+        //    else if (now.Hour < 18)
+        //    {
+        //        if (PreCompeteTimeDay == "今天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("18点前");
+        //            PreCompeteTimeHourList.Add("22点前");
+
+        //            PreCompeteTimeHour = "18点前";
+        //        }
+
+
+        //        if (PreCompeteTimeDay == "明天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("12点前");
+        //            PreCompeteTimeHourList.Add("18点前");
+        //            PreCompeteTimeHour = "12点前";
+        //        }
+        //    }
+        //    else if (now.Hour < 22)
+        //    {
+        //        if (PreCompeteTimeDay == "今天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("22点前");
+        //            PreCompeteTimeHour = "22点前";
+        //        }
+
+
+        //        if (PreCompeteTimeDay == "明天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("12点前");
+        //            PreCompeteTimeHourList.Add("18点前");
+        //            PreCompeteTimeHourList.Add("22点前");
+        //            PreCompeteTimeHour = "12点前";
+        //        }
+        //    }
+        //    else
+        //    {
+        //        if (PreCompeteTimeDay == "明天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("12点前");
+        //            PreCompeteTimeHourList.Add("18点前");
+        //            PreCompeteTimeHourList.Add("22点前");
+        //            PreCompeteTimeHour = "12点前";
+        //        }
+
+        //        if (PreCompeteTimeDay == "后天")
+        //        {
+        //            PreCompeteTimeHourList.Clear();
+        //            PreCompeteTimeHourList.Add("12点前");
+        //            PreCompeteTimeHour = "12点前";
+        //        }
+        //    }
+
+
+
+
+
+        //}
 
 
         private void SetBarCode()
@@ -936,7 +936,7 @@ namespace BBWY.Client.ViewModels
             FloorDragNumber = 0;
             PurchaseSkuList = new ObservableCollection<PurchaseSku>();
             WareHourseList = new ObservableCollection<WareHourseDTO>();
-            PreCompeteTimeDayList = new ObservableCollection<string>();
+            //PreCompeteTimeDayList = new ObservableCollection<string>();
             FloorDragNumberList = new ObservableCollection<int>();
 
             for (int i = 0; i < 30; i++)
@@ -949,40 +949,40 @@ namespace BBWY.Client.ViewModels
 
             }
 
-            var nowTime = DateTime.Now;
-            var hour = nowTime.Hour;
+            //var nowTime = DateTime.Now;
+            //var hour = nowTime.Hour;
 
 
 
-            if (hour < 12)
-            {
-                PreCompeteTimeDayList.Add("今天");
-                PreCompeteTimeDayList.Add("明天");
+            //if (hour < 12)
+            //{
+            //    PreCompeteTimeDayList.Add("今天");
+            //    PreCompeteTimeDayList.Add("明天");
 
-                PreCompeteTimeDay = "今天";
+            //    PreCompeteTimeDay = "今天";
 
 
-            }
-            else if (hour < 18)
-            {
-                PreCompeteTimeDayList.Add("今天");
-                PreCompeteTimeDayList.Add("明天");
-                PreCompeteTimeDay = "今天";
+            //}
+            //else if (hour < 18)
+            //{
+            //    PreCompeteTimeDayList.Add("今天");
+            //    PreCompeteTimeDayList.Add("明天");
+            //    PreCompeteTimeDay = "今天";
 
-            }
-            else if (hour < 22)
-            {
-                PreCompeteTimeDayList.Add("今天");
-                PreCompeteTimeDayList.Add("明天");
-                PreCompeteTimeDay = "今天";
+            //}
+            //else if (hour < 22)
+            //{
+            //    PreCompeteTimeDayList.Add("今天");
+            //    PreCompeteTimeDayList.Add("明天");
+            //    PreCompeteTimeDay = "今天";
 
-            }
-            else
-            {
-                PreCompeteTimeDayList.Add("明天");
-                PreCompeteTimeDayList.Add("后天");
-                PreCompeteTimeDay = "明天";
-            }
+            //}
+            //else
+            //{
+            //    PreCompeteTimeDayList.Add("明天");
+            //    PreCompeteTimeDayList.Add("后天");
+            //    PreCompeteTimeDay = "明天";
+            //}
 
 
 

BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml

@@ -199,9 +199,9 @@
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}" VerticalAlignment="Center" Margin="5,0,0,0"/>
                                     <TextBlock VerticalAlignment="Center" Text="订单号:" Margin="5,0,0,0" />
-                                    <c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
+                                    <c:BButton Content="{Binding OrderSn}" Style="{StaticResource LinkButton}"
                                                Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
-                                               CommandParameter="{Binding Id}" Margin="5,0,0,0"/>
+                                               CommandParameter="{Binding OrderSn}" Margin="5,0,0,0"/>
                                     <c:BButton x:Name="btn_orderState" Content="{Binding OrderState}" Margin="5,0,0,0" Height="25" Padding="5,0" Background="{Binding OrderState,ConverterParameter=已取消:#EC808D:#02A7F0,Converter={StaticResource objConverter}}"/>
                                     <Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
                                     <StackPanel x:Name="txt_consignee" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">

BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml

@@ -37,15 +37,16 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="400"/>
                     <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="160"/>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition MinWidth="80"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
                 <!--<TextBlock Text="任务信息" Grid.Column="1" 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="2"   Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="操作" Grid.Column="3"   Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text=" " Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
@@ -84,6 +85,7 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="160"/>
                                 <ColumnDefinition Width="100"/>
                                 <ColumnDefinition MinWidth="80"/>
                             </Grid.ColumnDefinitions>
@@ -112,6 +114,7 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="160"/>
                                 <ColumnDefinition Width="100"/>
                                 <ColumnDefinition MinWidth="80"/>
                             </Grid.ColumnDefinitions>
@@ -207,13 +210,36 @@
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
                             </ListBox>
-                            <Grid Grid.Column="2">
+
+
+
+                            <Grid Grid.Column="2" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                            Visibility="{Binding FallWareRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                            >
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                    Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Text="剩余: " />
+                                        <TextBlock  Text="{Binding  FallWareRemainTime}"/>
+                                    </StackPanel>
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"    VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                 Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Foreground="Red"  Text="超时: "/>
+                                        <TextBlock  Foreground="Red"  Text="{Binding  FallWareRemainTime}"/>
+                                    </StackPanel>
+                                </StackPanel>
+
+                            </Grid>
+
+                            <Grid Grid.Column="3">
                                 <c:BButton Style="{StaticResource LinkButton}" Content="设置" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
                             </Grid>
 
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
 
-                            <Grid Grid.Column="3" >
+                            <Grid Grid.Column="4" >
 
                             </Grid>
 

BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml

@@ -75,7 +75,7 @@
             <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
             <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
 
-            <TextBlock Style="{StaticResource middleTextBlock}" Text="供应商名称"/>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="店铺名称"/>
             <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
 
             <TextBlock Style="{StaticResource middleTextBlock}" Text="CLPS采购单号" Grid.Row="1"/>

BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml

@@ -5,12 +5,53 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BBWY.Client.Views.FallWare"
         mc:Ignorable="d"
+            xmlns:cmodel="clr-namespace:BBWY.Client.Models"
         xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
-        Title="SetJDWareBoxWindow2" Height="250" Width="250"
+        Title="SetJDWareBoxWindow2" Height="250" Width="300"
            MinButtonVisibility="Collapsed"
            MaxButtonVisibility="Collapsed"
            CloseButtonVisibility="Visible"
            Style="{StaticResource  bwstyle}">
+    <Window.Resources>
+        <Style TargetType="RadioButton">
+
+            <Setter Property="IsChecked" Value="False" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="Background" Value="White" />
+            <!--<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}"  />
+                            </StackPanel>
+
+
+
+
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="true">
+                                <Setter TargetName="_Rect" Property="Fill" Value="white" />
+                                <Setter Property="Foreground" Value="#8080FF"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30"/>
@@ -23,10 +64,18 @@
             <TextBlock Text="箱唛设置" Style="{StaticResource middleTextBlock}"/>
         </Border>
         <StackPanel Grid.Row="1" Background="#F5F7FA" Orientation="Horizontal">
-            <c:BButton Content="京仓" Width="60" Background="White" Foreground="{StaticResource  Button.Background}"/>
-            <c:BButton Content="云仓" Width="60" Background="#F5F7FA" Foreground="{StaticResource Text.Color}"/>
+            <RadioButton Height="35" Width="80" VerticalAlignment="Center"      Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.京仓}"  Content="京仓"  
+                             IsChecked="{Binding wareType,Mode=TwoWay,Converter={StaticResource objConverter},ConverterParameter=京仓:True:False}" 
+                       Name="btn_jingcang"      />
+            <RadioButton Height="35" Width="80" VerticalAlignment="Center"     Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.云仓}"  Content="云仓" 
+                        Name="btn_yuncang"     IsChecked="{Binding wareType,Converter={StaticResource objConverter},ConverterParameter=云仓:True:False}" 
+                             />
+            <RadioButton Height="35" Width="80" VerticalAlignment="Center"     Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.聚水潭齐越仓}"  Content="聚水潭"   
+                   Name="btn_jushuitang"          IsChecked="{Binding wareType,Converter={StaticResource objConverter},ConverterParameter=聚水潭齐越仓:True:False}" 
+                             />
+
         </StackPanel>
-        <StackPanel Grid.Row="2" Margin="5,0">
+        <StackPanel Grid.Row="2" Margin="5,0"  Name="panel_jingcang" Visibility="Collapsed">
             <Grid Margin="0,10,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="80"/>
@@ -56,6 +105,36 @@
                 <c:BTextBox Grid.Column="1" Margin="5,0,0,0" Height="25"
                             Text="{Binding JDWareBoxModel.ProductTitle}"/>
             </Grid>
+        </StackPanel>
+        <StackPanel Grid.Row="2" Margin="5,0"  Name="panel_yuncang">
+           
+
+            <Grid Margin="0,50,0,0" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="90"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="CLPS采购单号:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="10 0 0 0"/>
+                <c:BTextBox Grid.Column="1" Margin="5,0,10,0" Height="25" 
+                            Text="{Binding JDWareBoxModel.PurchaseOrder}"/>
+            </Grid>
+
+           
+        </StackPanel>
+        <StackPanel Grid.Row="2" Margin="5,0"  Name="panel_jst" Visibility="Collapsed">
+
+
+            <Grid Margin="0,50,0,0" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="80"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="采购单号:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="10 0 0 0"/>
+                <c:BTextBox Grid.Column="1" Margin="5,0,10,0" Height="25" 
+                            Text="{Binding JDWareBoxModel.PurchaseOrder}"/>
+            </Grid>
+
+
         </StackPanel>
         <c:BButton Grid.Row="3" Content="保存" HorizontalAlignment="Right" Width="80" VerticalAlignment="Center" Click="btn_save_Click"
                 Name="btn_save" Margin="0,0,5,0"/>

BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs

@@ -5,6 +5,8 @@ using BBWY.Controls;
 using System;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media;
+using WebSocketSharp;
 
 namespace BBWY.Client.Views.FallWare
 {
@@ -19,7 +21,7 @@ namespace BBWY.Client.Views.FallWare
 
         private Action reflashWindow;
 
-        private WareType wareType;
+        public WareType wareType { get; set; }
 
         public bool IsEnabled { get; set; }
         public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
@@ -36,42 +38,108 @@ namespace BBWY.Client.Views.FallWare
             JDWareBoxModel = model;
             this.IsEnabled = isEnabled;
             this.DataContext = this;
+
+            switch (wareType)
+            {
+                case WareType.京仓:
+                    btn_yuncang.IsEnabled = false;
+                    btn_jushuitang.IsEnabled = false;
+                     panel_jingcang.Visibility= Visibility.Visible;
+                    panel_yuncang.Visibility= Visibility.Collapsed; 
+                    panel_jst.Visibility= Visibility.Collapsed;
+                    break;
+                case WareType.云仓:
+                    btn_jingcang.IsEnabled = false;
+                    btn_jushuitang.IsEnabled = false;
+                    panel_jingcang.Visibility = Visibility.Collapsed;
+                    panel_yuncang.Visibility = Visibility.Visible;
+                    panel_jst.Visibility = Visibility.Collapsed;
+                    break;
+                case WareType.商家仓:
+                    break;
+                case WareType.聚水潭齐越仓:
+                    btn_yuncang.IsEnabled = false;
+                    btn_jingcang.IsEnabled = false;
+                    panel_jingcang.Visibility = Visibility.Collapsed;
+                    panel_yuncang.Visibility = Visibility.Collapsed;
+                    panel_jst.Visibility = Visibility.Visible;
+                    break;
+                default:
+                    break;
+            }
+
+
         }
 
         private void btn_save_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            if (string.IsNullOrEmpty(JDWareBoxModel.ProductTitle) ||
-                string.IsNullOrEmpty(JDWareBoxModel.PrewOrder) ||
-                string.IsNullOrEmpty(JDWareBoxModel.PurchaseOrder))
+          
+        
+            if (wareType == WareType.京仓)
             {
-                MessageBox.Show("信息不完整", "提示");
-                return;
-            }
-            IsLoading = true;
-            Task.Factory.StartNew(() =>
-            {
-                var getDetailResponse = sealBoxService.GetJDSupplierNameAndStoreName(JDWareBoxModel.PurchaseOrder);
-                if (!getDetailResponse.Success)
+                if (string.IsNullOrEmpty(JDWareBoxModel.ProductTitle) ||
+               string.IsNullOrEmpty(JDWareBoxModel.PrewOrder) ||
+               string.IsNullOrEmpty(JDWareBoxModel.PurchaseOrder))
                 {
-                    IsLoading = false;
-                    this.Dispatcher.Invoke(() => MessageBox.Show(getDetailResponse.Msg, "提示"));
+                    MessageBox.Show("信息不完整", "提示");
                     return;
                 }
-
-                var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, getDetailResponse.Data.SupplierName, getDetailResponse.Data.StoreName);
-                if (!res.Success)
+                IsLoading = true;
+                Task.Factory.StartNew(() =>
                 {
+                    var getDetailResponse = sealBoxService.GetJDSupplierNameAndStoreName(JDWareBoxModel.PurchaseOrder);
+                    if (!getDetailResponse.Success)
+                    {
+                        IsLoading = false;
+                        this.Dispatcher.Invoke(() => MessageBox.Show(getDetailResponse.Msg, "提示"));
+                        return;
+                    }
+
+                    var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, getDetailResponse.Data.SupplierName, getDetailResponse.Data.StoreName);
+                    if (!res.Success)
+                    {
+                        IsLoading = false;
+                        this.Dispatcher.Invoke(() => MessageBox.Show(res.Msg, "提示"));
+                        return;
+                    }
                     IsLoading = false;
-                    this.Dispatcher.Invoke(() => MessageBox.Show(res.Msg, "提示"));
+                    this.Dispatcher.Invoke(() =>
+                    {
+                        reflashWindow?.Invoke();
+                        this.Close();
+                    });
+                });
+                return;
+            }
+            if (wareType == WareType.云仓|| wareType == WareType.聚水潭齐越仓)
+            {
+
+                if (JDWareBoxModel.PurchaseOrder.IsNullOrEmpty())
+                {
+                    MessageBox.Show("采购单号不能为空");
                     return;
                 }
-                IsLoading = false;
-                this.Dispatcher.Invoke(() =>
+                Task.Factory.StartNew(() =>
                 {
-                    reflashWindow?.Invoke();
-                    this.Close();
+
+                    var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, null, null);
+                    if (!res.Success)
+                    {
+                        IsLoading = false;
+                        this.Dispatcher.Invoke(() => MessageBox.Show(res.Msg, "提示"));
+                        return;
+                    }
+                    IsLoading = false;
+                    this.Dispatcher.Invoke(() =>
+                    {
+                        reflashWindow?.Invoke();
+                        this.Close();
+                    });
                 });
-            });
+            }
+            
+
+
         }
     }
 }

BBWY.Client/Views/PackTask/PublishTaskWindow.xaml

@@ -129,12 +129,12 @@
                     <StackPanel Height="30" VerticalAlignment="Top" Margin="19 23 0 0" Orientation="Horizontal"  HorizontalAlignment="Left" >
                         <TextBlock Text="数量:"  VerticalAlignment="Center"/>
                         <c:BTextBox WaterRemark="打包数量" Height="25" Width="90" Text="{Binding SkuCount}" />
-                        <TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/>
+                        <!--<TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/>
                         <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}">
                             <ComboBox BorderThickness="0"   VerticalContentAlignment="Center"  ItemsSource="{Binding AvailabilityList}" Text="{Binding Availability}"   >
 
                         </ComboBox>
-                         </Border>
+                         </Border>-->
                         <TextBlock Text="落仓去向:" VerticalAlignment="Center" Margin="30 0 0 0" />
                         <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}">
                             <ComboBox  VerticalContentAlignment="Center"  BorderThickness="0"  ItemsSource="{Binding PositionTypeList}"  Text="{Binding PositionType}"   >

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

@@ -82,7 +82,7 @@ namespace BBWY.Client.Views.PackTask
         public ICommand BarLabelCheckCommand { get; set; }
         public void BarLabelCheck(BarcodeLabelModel labelModel)
         {
-            if (labelModel == BarcodeLabelModel.标准模板)//标准版 判断数据是否异常
+            if (BarCodeModel != null && labelModel == BarcodeLabelModel.标准模板)//标准版 判断数据是否异常
             {
                 if (string.IsNullOrEmpty(BarCodeModel.ProductNo) || BarCodeModel.ProductNo == "待填写")
                 {

BBWY.Client/Views/PackTask/TaskListControl.xaml

@@ -98,7 +98,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                                 <ColumnDefinition MinWidth="140"/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition />
                                 <ColumnDefinition/>
                                 <ColumnDefinition Width="120"/>
                                 <ColumnDefinition/>
@@ -115,6 +115,12 @@
                                 <Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/>
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding DepartmentName}" Margin="5,0,0,0" />
+
+                                <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
+                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
+                                                                   Margin=" 5,0,0,0"/>
                                 <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
                             </StackPanel>
@@ -176,7 +182,17 @@
                                                 </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,7,11"/>
+
+                                                </StackPanel>
                                                 <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
                                                     <TextBlock.ToolTip>
                                                         <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
@@ -190,21 +206,16 @@
                                                             <Run Text="品名:"/>
                                                             <Run Text="{Binding BrandName}"/>
                                                 </TextBlock>
-                                                <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
-                                                    <TextBlock.ToolTip>
-                                                        <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                                            <TextBlock Text="{Binding ShopName}"/>
-                                                        </ToolTip>
-                                                    </TextBlock.ToolTip>
-                                                         <Run Text="店铺:"/>
-                                                         <Run Text="{Binding ShopName}"/>
-                                                </TextBlock>
+
+
+
+
                                             </StackPanel>
-                                            <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="20,11,0,5">
+                                            <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5">
                                                 <TextBlock Foreground="{StaticResource Text.Gray}">
                                                             <Run Text="货号:" />
                                                 </TextBlock>
-                                                <c:BButton Content="{Binding GoodsNo}" HorizontalAlignment="Left" VerticalAlignment="Top"  Style="{StaticResource LinkButton}"
+                                                <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"/>

BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@@ -0,0 +1,556 @@
+<UserControl x:Class="BBWY.Client.Views.PackTask.WaitPackageControl"
+             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:hc="https://handyorg.github.io/handycontrol"
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             xmlns:viewmodel="clr-namespace:BBWY.Client.ViewModels.PackTask"
+             xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="350"/>
+                <ColumnDefinition Width="80"/>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition MinWidth="100"/>
+                <ColumnDefinition Width="150"/>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="140"/>
+                <ColumnDefinition  Width="200"/>
+                <ColumnDefinition MinWidth="100"/>
+                <ColumnDefinition Width="120"/>
+
+            </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="SKU配件商品" 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}"/>
+            <TextBlock Text="任务时间" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="注意事项/对接备注" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="操作" Grid.Column="9"   Style="{StaticResource middleTextBlock}"/>
+
+
+            <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+        </Grid>
+        <!--ItemsSource="{Binding OrderList}"-->
+        <ListBox x:Name="listbox_order"
+                     Grid.Row="7"   
+                     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="350"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition  Width="200"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition Width="120"/>
+
+
+
+                            </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 UserControl}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,7,0"/>
+
+                                <Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>
+
+                                <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
+                                <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+                                                                   CommandParameter="{Binding DepartmentName}"
+                                                                   Margin=" 5,0,0,0"/>
+
+                                <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
+                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+                                                                   CommandParameter="{Binding ItemList[0].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 Orientation="Horizontal" Visibility="{Binding QualityRemainTime, Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
+
+                                    <TextBlock Foreground="Red"  VerticalAlignment="Center" Text="{Binding QualityRemainTime}" Margin="20,0,0,0" />
+
+
+                                </StackPanel>-->
+
+                            </StackPanel>
+                            <!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                                <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
+                                 Style="{StaticResource LinkButton}"       Content="取消任务" Margin="0 5 0 5 "
+                                            Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
+                                           
+                                           />
+                            </StackPanel>-->
+                            <!--<StackPanel Grid.Column="9" 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.ColumnDefinitions>
+                                <ColumnDefinition Width="350"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition  Width="200"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition Width="120"/>
+
+                            </Grid.ColumnDefinitions>
+                            <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="90"/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+
+                                            <!--{Binding Logo}-->
+                                            <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="11,9,0,10"
+                                                           Cursor="Hand">
+                                                <b:Interaction.Triggers>
+                                                    <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                        <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                            <b:InvokeCommandAction.CommandParameter>
+                                                                <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                    <Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
+                                                                    <Binding Path="Id"/>
+                                                                </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,7,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="20,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>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <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" >
+
+                                    <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="3" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock 
+                                               Text="{Binding SkuTitle}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="4" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Left">
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                        <TextBlock  Text="基础打包:"/>
+                                        <TextBlock  Text="{Binding  BasicPack}"/>
+                                    </StackPanel>
+                                    <Grid Margin="10,5"  VerticalAlignment="Center"   HorizontalAlignment="Left" >
+                                        <TextBlock   TextWrapping="Wrap">
+                                            <Run Text="增量耗材:"/>
+                                            <Run Text="{Binding Increment1}"/>
+                                        </TextBlock>
+                                    </Grid>
+
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="5">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding CertificatePosition}"/>
+                            </Grid>
+                            <!--<Grid Grid.Column="7" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                        <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                            <TextBlock  Text="条形码:"/>
+                                            <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
+                                                <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                  Command="{Binding LookBarCommand}" />
+
+                                                <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding PrintBarcodeCommand}"/>
+                                            </StackPanel>
+                                            <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                                       Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                                       />
+
+
+                                        </StackPanel>
+                                        <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                            <TextBlock  Text="合格证:"/>
+                                            <StackPanel Orientation="Horizontal"
+                                                        Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
+                                                        >
+
+                                                <StackPanel Orientation="Horizontal"
+                                                            Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
+                                                            >
+                                                    <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding LookCerCommand}"/>
+
+                                                    <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding PrintCerCommand}"/>
+
+                                                </StackPanel>
+                                                <TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                                       Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
+                                                       />
+
+                                            </StackPanel>
+                                            <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                                       Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                                       />
+
+                                        </StackPanel>
+                                    </StackPanel>
+
+
+
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="8" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+
+                                    <TextBlock 
+                                               Text="{Binding CertificatePosition}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+
+                                </StackPanel>
+                            </Grid>-->
+                            <Grid Grid.Column="6">
+
+                                <Grid>
+
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                                Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
+                                                >
+                                        <TextBlock  Text="收费: "/>
+                                        <TextBlock 
+                                               Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center" 
+                                               />
+                                        <Path x:Name="path_fees_name" 
+                                              Style="{StaticResource path_question}" 
+                                              Width="14"  Fill="{StaticResource Text.Pink}"
+                                              ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="30000"
+                                              
+                                              >
+
+                                            <Path.ToolTip>
+                                                <ToolTip  Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <local:FeesExcelControl  IsWareHouse="True"  FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
+                                                                               />
+                                                </ToolTip>
+                                            </Path.ToolTip>
+                                        </Path>
+
+                                    </StackPanel>
+
+                                    <!--<Grid Grid.Row="1"  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检|已取消|商家自取:Collapsed:Visible}">
+                                        <Border Grid.Row="0" VerticalAlignment="Top" Height="1"  Background="{StaticResource Border.Brush}"/>
+
+                                        <StackPanel  Orientation="Horizontal" HorizontalAlignment="Center"
+                                                     
+                                                     >
+                                            <c:BButton HorizontalAlignment="Center" Height="20"  Style="{StaticResource LinkButton}"  VerticalAlignment="Center"  Grid.Row="1"  Content="设置" 
+                                                   Command="{Binding SetServiceCommand}"
+                                                   
+                                                   Visibility="Visible" />
+                                        </StackPanel>
+
+
+
+                                    </Grid>-->
+                                </Grid>
+                            </Grid>
+
+                            <Grid Grid.Column="7">
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                            Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                            >
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                    Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Text="剩余: " />
+                                        <TextBlock  Text="{Binding  PackRemainTime}"/>
+                                    </StackPanel>
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"    VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                 Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Foreground="Red"  Text="超时: "/>
+                                        <TextBlock  Foreground="Red"  Text="{Binding  PackRemainTime}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="8" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock 
+                                               Text="{Binding MarkMessage}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </Grid>
+      
+                           
+                            <Grid Grid.Column="9" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+
+
+
+        
+                                        <c:BButton HorizontalAlignment="Center" Height="20"  Style="{StaticResource LinkButton}"  VerticalAlignment="Center"  Grid.Row="1"  
+                                                   Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }" 
+                                                   Command="{Binding SetServiceCommand}"
+                                                   
+                                                   Visibility="Visible" />
+                       
+                                    <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}" 
+                                                    />
+                                    <StackPanel
+                                         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="完成" 
+                                               CommandParameter="{Binding}"
+                                               Command="{Binding DataContext.CompletedPackTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+                                               Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
+                                              />
+                                    </StackPanel>
+                                  
+
+
+                             
+
+                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}" Margin="0 5 0 5 "    VerticalAlignment="Center" Content="完成" 
+                                               Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" 
+                                               >
+                                        <b:Interaction.Triggers>
+                                            <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                <b:InvokeCommandAction Command="{Binding DataContext.SetTaskStatusCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                    <b:InvokeCommandAction.CommandParameter>
+                                                        <MultiBinding Converter="{StaticResource mptConverter}">
+                                                            <Binding Path="TaskId" />
+                                                            <Binding Path="OrderId"/>
+                                                        </MultiBinding>
+                                                    </b:InvokeCommandAction.CommandParameter>
+                                                </b:InvokeCommandAction>
+                                            </b:EventTrigger>
+                                        </b:Interaction.Triggers>
+                                    </c:BButton>
+                                    <Grid Margin="0 5 0 5 "
+                                        Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" 
+                                        >
+
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="确认收货" 
+                                               
+                                                     CommandParameter="{Binding}"
+                                               Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                               >
+
+                                        </c:BButton>
+
+                                    </Grid>
+                                    <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}" 
+                                                    />
+                                    <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0"  HorizontalAlignment="Stretch">
+                                        <hc:SplitButton.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>
+                                        </hc:SplitButton.Resources>
+                                        <hc:SplitButton.DropDownContent >
+                                            <StackPanel  >
+                                                <MenuItem Header="打印条码" Command="{Binding PrintBarcodeCommand}" HorizontalAlignment="Center"/>
+                                                <MenuItem Header="打印合格证" Command="{Binding PrintCerCommand}" HorizontalAlignment="Center" />
+                                                <!--<MenuItem Header="商家自取" HorizontalAlignment="Center"
+                                                          Command="{Binding  DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+                                                           CommandParameter="{Binding TaskId}" 
+                                                          />-->
+                                            </StackPanel>
+                                        </hc:SplitButton.DropDownContent>
+                                    </hc:SplitButton>
+                                
+
+                                </StackPanel>
+                            </Grid>
+                            <!--<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/PackTask/WaitPackageControl.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.PackTask
+{
+    /// <summary>
+    /// WaitPackageControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class WaitPackageControl : UserControl
+    {
+        public WaitPackageControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

BBWY.Client/Views/PackTask/WareHouseList.xaml

@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
       xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
+      xmlns:waitquality="clr-namespace:BBWY.Client.Views.QualityTask"
        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
       xmlns:ctr="clr-namespace:BBWY.Client.Converters"
       xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@@ -155,7 +156,7 @@
                              />
 
 
-                <RadioButton Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检"   
+                <RadioButton Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待验收"   
                              IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:True:False}" 
                              />
 
@@ -167,6 +168,10 @@
                              IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}" 
                               />
 
+                <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运" 
+                             IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:True:False}" 
+                              />
+
                 <RadioButton  Height="35" Width="126" VerticalAlignment="Center"  Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"
                               IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:True:False}" 
                               />
@@ -198,10 +203,11 @@
                     />
             <Grid Grid.Row="2" Margin="0,5,0,0">
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
-                <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓:Collapsed:Visible}" />
+                <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待质检|待打包:Collapsed:Visible}" />
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
-                
 
+                <waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}"    />
+                <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"  />
             </Grid>
 
             <c:PageControl PageIndex="{Binding PageIndex,Mode=TwoWay}" 

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -33,31 +33,25 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="350"/>
                 <ColumnDefinition Width="80"/>
-                <ColumnDefinition Width="80"/>
                 <ColumnDefinition Width="100"/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
+                <ColumnDefinition MinWidth="100"/>
+                <ColumnDefinition Width="150"/>
+                <ColumnDefinition MinWidth="280"/>
                 <ColumnDefinition MinWidth="140"/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="120"/>
-                <ColumnDefinition/>
+                <ColumnDefinition  Width="100"/>
                 <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="120"/>
             </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="SKU配件商品" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="打包需求" Grid.Column="5"  Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="落仓"   Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="合格证.条形码" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="合格证位置" Grid.Column="8"  Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="打包员" Grid.Column="11"  Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="操作" Grid.Column="12"   Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="SKU配件商品" 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}"/>
+            <TextBlock Text="费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="打包员" Grid.Column="8"  Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="操作" Grid.Column="9"   Style="{StaticResource middleTextBlock}"/>
 
 
             <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
@@ -96,17 +90,15 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="350"/>
                                 <ColumnDefinition Width="80"/>
-                                <ColumnDefinition Width="80"/>
                                 <ColumnDefinition Width="100"/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition MinWidth="280"/>
                                 <ColumnDefinition MinWidth="140"/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="120"/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition  Width="100"/>
                                 <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="120"/>
+
                             </Grid.ColumnDefinitions>
                             <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
                                 <TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
@@ -124,37 +116,54 @@
                                                                    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 ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ItemList[0].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 Orientation="Horizontal" Visibility="{Binding QualityRemainTime, Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
+
+                                    <TextBlock Foreground="Red"  VerticalAlignment="Center" Text="{Binding QualityRemainTime}" Margin="20,0,0,0" />
+
+
+                                </StackPanel>-->
 
                             </StackPanel>
-                            <StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                            <!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
                                 <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
                                  Style="{StaticResource LinkButton}"       Content="取消任务" Margin="0 5 0 5 "
                                             Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
                                            
                                            />
+                            </StackPanel>-->
+                            <StackPanel Grid.Column="9" 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.ColumnDefinitions>
                                 <ColumnDefinition Width="350"/>
                                 <ColumnDefinition Width="80"/>
-                                <ColumnDefinition Width="80"/>
                                 <ColumnDefinition Width="100"/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition MinWidth="280"/>
                                 <ColumnDefinition MinWidth="140"/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="120"/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition  Width="100"/>
                                 <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="120"/>
                             </Grid.ColumnDefinitions>
                             <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
                                          Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
@@ -187,7 +196,17 @@
                                                 </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,7,11"/>
+
+                                                </StackPanel>
                                                 <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
                                                     <TextBlock.ToolTip>
                                                         <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
@@ -203,17 +222,10 @@
                                                 </TextBlock>
 
 
-                                                <StackPanel Orientation="Horizontal">
-                                                    <TextBlock Text="店铺:"/>
-                                                    <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ShopName}"
-                                                                   Margin=" 5,0,7,0"/>
 
-                                                </StackPanel>
 
                                             </StackPanel>
-                                            <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="20,11,0,5">
+                                            <StackPanel   Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5">
                                                 <TextBlock Foreground="{StaticResource Text.Gray}">
                                                             <Run Text="货号:" />
                                                 </TextBlock>
@@ -236,16 +248,8 @@
                                                />
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="2" Background="{Binding Availability,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:Availability}  }">
-                                <TextBlock    Text="{Binding Availability}" 
-                                            VerticalAlignment="Center"
-                                               TextWrapping="Wrap"
-                                               HorizontalAlignment="Center"
-                                              
-                                               >
-                                </TextBlock>
-                            </Grid>
-                            <Grid Grid.Column="3" >
+                         
+                            <Grid Grid.Column="2" >
                                 <StackPanel VerticalAlignment="Center" >
 
                                     <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
@@ -261,7 +265,7 @@
 
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="4" >
+                            <Grid Grid.Column="3" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                     <TextBlock 
                                                Text="{Binding SkuTitle}" 
@@ -272,7 +276,7 @@
 
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="5" >
+                            <Grid Grid.Column="4" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Left">
                                     <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                         <TextBlock  Text="基础打包:"/>
@@ -287,18 +291,54 @@
 
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="6" >
-                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                    <TextBlock  
-                                               Text="{Binding  PositionType}" 
-                                               TextWrapping="Wrap"
-                                               HorizontalAlignment="Center"
-                                               />
+                            <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>
 
-                                </StackPanel>
+
+
+                                                <Border Background="{StaticResource Border.Brush}" Height="1" Grid.Row="0" VerticalAlignment="Top"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
                             </Grid>
-                            <Grid Grid.Column="7" >
+                            <!--<Grid Grid.Column="7" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                         <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
@@ -360,8 +400,8 @@
 
 
                                 </StackPanel>
-                            </Grid>
-                            <Grid Grid.Column="9" >
+                            </Grid>-->
+                            <Grid Grid.Column="6" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                     <TextBlock 
                                                Text="{Binding MarkMessage}" 
@@ -372,7 +412,7 @@
 
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="10">
+                            <Grid Grid.Column="7">
 
                                 <Grid>
                                     <Grid.RowDefinitions>
@@ -420,7 +460,7 @@
                                     </Grid>
                                 </Grid>
                             </Grid>
-                            <Grid Grid.Column="11" >
+                            <Grid Grid.Column="8" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                     <TextBlock 
                                                Text="{Binding PackUser}" 
@@ -431,7 +471,7 @@
 
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="12" >
+                            <Grid Grid.Column="9" >
                                 <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}"
@@ -446,7 +486,7 @@
 
 
                                     <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="商家自取" 
-                                                  CommandParameter="{Binding}"
+                                                  CommandParameter="{Binding TaskId}"
                                                   Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Visible:Collapsed}" 
                                                     />
@@ -472,7 +512,7 @@
                                         >
 
                                         <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="确认收货" 
-                                                Visibility="{Binding OrderId,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" 
+                                               
                                                      CommandParameter="{Binding}"
                                                Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                >

BBWY.Client/Views/QualityTask/QualityWindow.xaml

@@ -136,7 +136,7 @@
                                     <Run Text="份数:"/>
                                     <Run Text="{Binding WareHourseCount,Mode=TwoWay}"/>
                                 </TextBlock>
-                                <StackPanel Orientation="Horizontal" Margin="10 0 0 0" Height="30">
+                                <!--<StackPanel Orientation="Horizontal" Margin="10 0 0 0" Height="30">
                                     <TextBlock Text="预计完成时间: " VerticalAlignment="Center" />
                                     <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">
                                         <ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeDayList,Mode=TwoWay}" SelectedIndex="0"  Text="{Binding PreCompeteTimeDay,Mode=TwoWay}">
@@ -148,7 +148,7 @@
                                
                                         </hc:ComboBox>
                                     </Border>
-                                </StackPanel>
+                                </StackPanel>-->
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Style="{StaticResource middleTextBlock}" Text="摆放地托编号:" Margin="10 0 0 0"/>
                                     <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">

BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@@ -0,0 +1,563 @@
+<UserControl x:Class="BBWY.Client.Views.QualityTask.WaitQualityControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
+             mc:Ignorable="d" 
+             xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="350"/>
+                <ColumnDefinition Width="80"/>
+                <ColumnDefinition Width="140"/>
+                <ColumnDefinition MinWidth="100"/>
+                <ColumnDefinition MinWidth="280"/>
+                <ColumnDefinition  Width="160"/>
+                <ColumnDefinition Width="140"/>
+                <ColumnDefinition MinWidth="140"/>
+                <ColumnDefinition Width="100"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="SKU配件商品" 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}"/>
+            <TextBlock Text="注意事项/对接备注" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+            <!--<TextBlock Text="合格证位置" Grid.Column="8"  Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="打包员" Grid.Column="11"  Style="{StaticResource middleTextBlock}"/>-->
+            <TextBlock Text="操作" Grid.Column="8"   Style="{StaticResource middleTextBlock}"/>
+
+
+            <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+        </Grid>
+        <!--ItemsSource="{Binding OrderList}"-->
+        <ListBox x:Name="listbox_order"
+                     Grid.Row="7"   
+                     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="350"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition MinWidth="280"/>
+                                <ColumnDefinition  Width="160"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition MinWidth="140"/>
+                                <ColumnDefinition Width="100"/>
+                            </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="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>
+
+                                <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
+                                <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding DepartmentName}"
+                                                                   Margin=" 5,0,0,0"/>
+
+                                <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
+                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ItemList[0].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 Orientation="Horizontal" Visibility="{Binding QualityRemainTime, Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
+
+                                    <TextBlock Foreground="Red"  VerticalAlignment="Center" Text="{Binding QualityRemainTime}" Margin="20,0,0,0" />
+
+
+                                </StackPanel>-->
+
+                            </StackPanel>
+                            <!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                                <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
+                                 Style="{StaticResource LinkButton}"       Content="取消任务" Margin="0 5 0 5 "
+                                            Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
+                                           
+                                           />
+                            </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.ColumnDefinitions>
+                                <ColumnDefinition Width="350"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition MinWidth="280"/>
+                                <ColumnDefinition  Width="160"/>
+                                <ColumnDefinition Width="140"/>
+                                <ColumnDefinition MinWidth="140"/>
+                                <ColumnDefinition Width="100"/>
+                            </Grid.ColumnDefinitions>
+                            <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
+                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="90"/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+
+                                            <!--{Binding Logo}-->
+                                            <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="11,9,0,10"
+                                                           Cursor="Hand">
+                                                <b:Interaction.Triggers>
+                                                    <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                        <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                            <b:InvokeCommandAction.CommandParameter>
+                                                                <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                    <Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
+                                                                    <Binding Path="Id"/>
+                                                                </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,7,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="20,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>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <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" >
+
+                                    <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="3" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock 
+                                               Text="{Binding SkuTitle}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </Grid>
+
+                            <Grid Grid.Column="4">
+                                <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="5" >
+                                <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 Margin="10,5" Orientation="Horizontal"    VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                 Visibility="{Binding IsQualityOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Foreground="Red"  Text="超时: "/>
+                                        <TextBlock  Foreground="Red"  Text="{Binding  QualityRemainTime}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                            <!--<Grid Grid.Column="6" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock  
+                                               Text="{Binding  PositionType}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </Grid>-->
+                            <Grid Grid.Column="6" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                        <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                            <TextBlock  Text="条形码:"/>
+                                            <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
+                                                <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                  Command="{Binding LookBarCommand}" />
+
+                                                <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding PrintBarcodeCommand}"/>
+                                            </StackPanel>
+                                            <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                                       Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                                       />
+
+
+                                        </StackPanel>
+                                        <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                            <TextBlock  Text="合格证:"/>
+                                            <StackPanel Orientation="Horizontal"
+                                                        Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
+                                                        >
+
+                                                <StackPanel Orientation="Horizontal"
+                                                            Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
+                                                            >
+                                                    <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding LookCerCommand}"/>
+
+                                                    <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding PrintCerCommand}"/>
+
+                                                </StackPanel>
+                                                <TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                                       Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
+                                                       />
+
+                                            </StackPanel>
+                                            <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                                       Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                                       />
+
+                                        </StackPanel>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                            <!--<Grid Grid.Column="8" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+
+                                    <TextBlock 
+                                               Text="{Binding CertificatePosition}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+
+                                </StackPanel>
+                            </Grid>-->
+                            <Grid Grid.Column="7" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock 
+                                               Text="{Binding MarkMessage}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </Grid>
+                            <!--<Grid Grid.Column="10">
+
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="*"/>
+                                        <RowDefinition Height="30"/>
+                                    </Grid.RowDefinitions>
+                                    <StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                        <TextBlock  Text="收费:"/>
+                                        <TextBlock 
+                                               Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center" 
+                                               />
+                                        <Path x:Name="path_fees_name" 
+                                              Style="{StaticResource path_question}" 
+                                              Width="14" Margin="0,0,0,0" Fill="{StaticResource Text.Pink}"
+                                              ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="20000"
+                                              Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
+                                              >
+
+                                            <Path.ToolTip>
+                                                <ToolTip  Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <local:FeesExcelControl  IsWareHouse="True"  FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
+                                                                               />
+                                                </ToolTip>
+                                            </Path.ToolTip>
+                                        </Path>
+
+                                    </StackPanel>
+
+                                    <Grid Grid.Row="1"  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检|已取消|商家自取:Collapsed:Visible}">
+                                        <Border Grid.Row="0" VerticalAlignment="Top" Height="1"  Background="{StaticResource Border.Brush}"/>
+
+                                        <StackPanel  Orientation="Horizontal" HorizontalAlignment="Center"
+                                                     
+                                                     >
+                                            <c:BButton HorizontalAlignment="Center" Height="20"  Style="{StaticResource LinkButton}"  VerticalAlignment="Center"  Grid.Row="1"  Content="设置" 
+                                                   Command="{Binding SetServiceCommand}"
+                                                   
+                                                   Visibility="Visible" />
+                                        </StackPanel>
+
+
+
+                                    </Grid>
+                                </Grid>
+                            </Grid>-->
+                            <!--<Grid Grid.Column="8" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                    <TextBlock 
+                                               Text="{Binding PackUser}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center"
+                                               />
+
+
+                                </StackPanel>
+                            </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="质检" 
+                                                   Command="{Binding QualityTaskCommand}"
+                                                   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="完成" 
+                                               CommandParameter="{Binding}"
+                                               Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                               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="商家自取" 
+                                                  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="完成" 
+                                               Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" 
+                                               >
+                                        <b:Interaction.Triggers>
+                                            <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                <b:InvokeCommandAction Command="{Binding DataContext.SetTaskStatusCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                    <b:InvokeCommandAction.CommandParameter>
+                                                        <MultiBinding Converter="{StaticResource mptConverter}">
+                                                            <Binding Path="TaskId" />
+                                                            <Binding Path="OrderId"/>
+                                                        </MultiBinding>
+                                                    </b:InvokeCommandAction.CommandParameter>
+                                                </b:InvokeCommandAction>
+                                            </b:EventTrigger>
+                                        </b:Interaction.Triggers>
+                                    </c:BButton>
+                                    <Grid Margin="0 5 0 5 "
+                                        Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" 
+                                        >
+
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="确认收货" 
+                                               
+                                                     CommandParameter="{Binding}"
+                                               Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                               >
+
+                                        </c:BButton>
+
+                                    </Grid>
+
+
+                                </StackPanel>
+                            </Grid>
+                            <!--<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/WaitQualityControl.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>
+    /// WaitQualityControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class WaitQualityControl : UserControl
+    {
+        public WaitQualityControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

@@ -38,14 +38,16 @@
                     <ColumnDefinition Width="400"/>
                     <ColumnDefinition Width="80"/>
                     <ColumnDefinition Width="80"/>
+                    <ColumnDefinition Width="120"/>
                     <ColumnDefinition MinWidth="80"/>
                     <ColumnDefinition Width="100"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="封箱数量" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text=" " Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="操作" Grid.Column="4"   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}"/>
                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
@@ -85,6 +87,7 @@
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="80"/>
                                 <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="120"/>
                                 <ColumnDefinition MinWidth="80"/>
                                 <ColumnDefinition Width="100"/>
                             </Grid.ColumnDefinitions>
@@ -124,6 +127,7 @@
                                 <ColumnDefinition Width="400"/>
                                 <ColumnDefinition Width="80"/>
                                 <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="120"/>
                                 <ColumnDefinition MinWidth="80"/>
                                 <ColumnDefinition Width="100"/>
                             </Grid.ColumnDefinitions>
@@ -248,25 +252,42 @@
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
 
 
-                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="设置" 
-                                             Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
-                                               CommandParameter="{Binding}"
-                                               >
-
-                                    </c:BButton>
+                                    <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxCount}"/>
 
 
 
                                 </StackPanel>
                             </Grid>
                             <Grid Grid.Column="3" >
-                           
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                            Visibility="{Binding SealBoxRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                            >
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                    Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Text="剩余: " />
+                                        <TextBlock  Text="{Binding  SealBoxRemainTime}"/>
+                                    </StackPanel>
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"    VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                                 Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                                                >
+                                        <TextBlock  Foreground="Red"  Text="超时: "/>
+                                        <TextBlock  Foreground="Red"  Text="{Binding  SealBoxRemainTime}"/>
+                                    </StackPanel>
+                                </StackPanel>
+
                             </Grid>
                            
-                            <Grid Grid.Column="4" >
+                            <Grid Grid.Column="5" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                   
 
+                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center"
+                                               Content="{Binding SealBoxCount,Converter={StaticResource objConverter},ConverterParameter=#null:设置:修改}" 
+                                             Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+                                               CommandParameter="{Binding}"
+                                               >
+
+                                    </c:BButton>
                                     <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="完成" 
                                              Command="{Binding DataContext.CompeteSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
                                                CommandParameter="{Binding}"
@@ -282,8 +303,8 @@
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 2 0"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 1 0"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 2 0"/>
                             <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
                             <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>