落仓

BBWY.Client/APIServices/SealBoxService.cs

@@ -1,4 +1,5 @@
-using BBWY.Client.Models.APIModel;
+using BBWY.Client.Models;
+using BBWY.Client.Models.APIModel;
 using BBWY.Client.Models.APIModel.Response.PackTask;
 using BBWY.Client.Views.PackTask;
 using BBWY.Common.Http;
@@ -50,11 +51,12 @@ namespace BBWY.Client.APIServices
                 , null, HttpMethod.Post);
         }
 
-        public ApiResponse<SealBoxConfiguredResponse> GetSealBoxConfiguredList(string SkuId, string TaskId, string shopId, int? PageSize = 10, int? PageIndex = 1, string SpuId = null)
+        public ApiResponse<SealBoxConfiguredResponse> GetSealBoxConfiguredList(PositionState PositionState, string SkuId, string TaskId, string shopId, int? PageSize = 10, int? PageIndex = 1, string SpuId = null)
         {
             return SendRequest<SealBoxConfiguredResponse>(globalContext.QKApiHost, $"api/SealBox/GetSealBoxConfiguredList",
                 new
                 {
+                    PositionState,
                     ShopId = shopId,
                     TaskId = TaskId,
                     SkuId = SkuId,
@@ -112,7 +114,7 @@ namespace BBWY.Client.APIServices
                 , null, HttpMethod.Post);
         }
         /// <summary>
-        /// 获取待落仓列表
+        /// 仓库端获取待落仓列表
         /// </summary>
         /// <param name="ShopName"></param>
         /// <param name="TaskId"></param>
@@ -120,22 +122,80 @@ namespace BBWY.Client.APIServices
         /// <param name="PageIndex"></param>
         /// <param name="PageSize"></param>
         /// <returns></returns>
-        public ApiResponse<SearchWaitFallWareResponse> SearchWaitFallWareList(string ShopName = null, long? TaskId = null, string SkuId = null, int PageIndex = 1
+        public ApiResponse<SearchWaitFallWareResponse> SearchWareFallWareConfigureList(PositionState positionState, string ShopName = null, long? TaskId = null, string SkuId = null, int PageIndex = 1
             , int PageSize = 10)
         {
-            return SendRequest<SearchWaitFallWareResponse>(globalContext.QKApiHost, $"api/SealBox/SearchWaitFallWareList",
+            return SendRequest<SearchWaitFallWareResponse>(globalContext.QKApiHost, $"api/SealBox/SearchWareFallWareConfigureList",
                new
                {
                    ShopName,
                    TaskId,
                    SkuId,
                    PageIndex,
+                   PageSize,
+                   positionState
+               }
+                , null, HttpMethod.Post);
+        }
+
+
+        /// <summary>
+        /// 商家端 获取待落仓列表
+        /// </summary>
+        /// <param name="ShopName"></param>
+        /// <param name="TaskId"></param>
+        /// <param name="SkuId"></param>
+        /// <param name="PageIndex"></param>
+        /// <param name="PageSize"></param>
+        /// <returns></returns>
+        public ApiResponse<SearchFallWareConfiguredResponse> SearchFallWareConfiguredList(PositionState positionState, long? TaskId = null, string SkuId = null, int PageIndex = 1
+            , int PageSize = 10)
+        {
+            return SendRequest<SearchFallWareConfiguredResponse>(globalContext.QKApiHost, $"api/SealBox/SearchFallWareConfiguredList",
+               new
+               {
+                   shopId = globalContext.User.Shop.ShopId.ToString(),
+                   positionState,
+                   TaskId,
+                   SkuId,
+                   PageIndex,
                    PageSize
                }
+               , null, HttpMethod.Post);
+        }
+
+
+
+
+        public ApiResponse<bool> SetFallWareConfigure(long SealBoxId, string ProductTitle, string PurchaseOrder, string PrewOrder, string WaybillNo)
+        {
+            return SendRequest<bool>(globalContext.QKApiHost, $"api/SealBox/SetFallWareConfigure",
+               new
+               {
+                   SealBoxId,
+                   ProductTitle,
+                   PurchaseOrder,
+                   PrewOrder,
+                   WaybillNo
+               }
+                , null, HttpMethod.Post);
+        }
+
+
+        public ApiResponse<FallWareConfigureCountResponse> GetFallWareConfigureCounts(string shopId)
+        {
+            return SendRequest<FallWareConfigureCountResponse>(globalContext.QKApiHost, $"api/SealBox/GetFallWareConfigureCounts?shopId={shopId}",
+            null
+                , null, HttpMethod.Post);
+        }
+
+
+        public ApiResponse<bool> WareCompeteFallWare(long SealBoxId)
+        {
+            return SendRequest<bool>(globalContext.QKApiHost, $"api/SealBox/WareCompeteFallWare?SealBoxId={SealBoxId}",
+               null
                 , null, HttpMethod.Post);
         }
 
-     
-       
     }
 }

BBWY.Client/App.xaml.cs

@@ -125,6 +125,7 @@ namespace BBWY.Client
             serviceCollection.AddTransient<PackSkuSplitConfigViewModel>();
             serviceCollection.AddTransient<SealBoxConfigureViewModel>();
             serviceCollection.AddTransient<PublishTaskViewModel>();
+            serviceCollection.AddTransient<QualityViewModel>();
             //serviceCollection.AddScoped<PackServiceViewModel>();
 
             #region 注册拳探SDK相关类

BBWY.Client/Helpers/MyPrintHelper.cs

@@ -623,24 +623,6 @@ namespace BBWY.Client.Helpers
         }
 
 
-
-
-
-        public static void SetDefaultPrint(string printName)
-        {
-            SetDefaultPrinter(printName);
-        }
-
-        /// <summary>
-        /// 调用win api将指定名称的打印机设置为默认打印机
-        /// </summary>
-        /// <param name="Name"></param>
-        /// <returns></returns>
-        [DllImport("winspool.drv")]
-        public static extern bool SetDefaultPrinter(string Name);
-
-
-
         public static void PrintSealBoxData(SealBoxModel sealBoxModel, string printName, int boxCount, int printCount )
         {
             // 100*180

BBWY.Client/Models/APIModel/Response/FallWare/FallWareConfigureCountResponse.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.APIModel
+{
+    public class FallWareConfigureCountResponse
+    {
+        public int FallWareWaitConfigureCount { get; set; }
+
+        public int FallWareConfiguredCount { get; set; }
+    }
+}

BBWY.Client/Models/APIModel/Response/FallWare/SearchFallWareConfiguredResponse.cs

@@ -0,0 +1,13 @@
+using BBWY.Client.Models.FallWare;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.APIModel
+{
+    public class SearchFallWareConfiguredResponse
+    {
+        public IList<FallWareConfiguredModel> FallWareConfiguredModels { get; set; }
+        public int TotalCount { get; set; }
+    }
+}

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

@@ -21,7 +21,10 @@ namespace BBWY.Client.Models.APIModel
 
 
     public class WaitFallWareModelResponse
-    {
+    {      /// <summary>
+           /// 仓库类型
+           /// </summary>
+        public WareType WareType { get; set; }
         /// <summary>
         /// 店铺Id
         /// </summary>
@@ -62,10 +65,22 @@ namespace BBWY.Client.Models.APIModel
         /// 封箱id
         /// </summary>
         public long SealBoxId { get; set; }
+        /// <summary>
+        /// 落仓材料
+        /// </summary>
+        public BoxConfigureData BoxConfigureData { get; set; }
+        /// <summary>
+        /// 商品数量(封箱sku任务数总和)
+        /// </summary>
+        public int ProductCount { get; set; }
     }
 
     public class WaitFallWareModel
     {
+        /// <summary>
+        /// 仓库类型
+        /// </summary>
+        public WareType WareType { get; set; }
         /// <summary>
         /// 店铺Id
         /// </summary>
@@ -106,6 +121,36 @@ namespace BBWY.Client.Models.APIModel
         /// 封箱id
         /// </summary>
         public long SealBoxId { get; set; }
+        /// <summary>
+        /// 落仓材料
+        /// </summary>
+        public BoxConfigureData BoxConfigureData { get; set; }
+        /// <summary>
+        /// 商品数量(封箱sku任务数总和)
+        /// </summary>
+        public int ProductCount { get; set; }
+    }
+    public class BoxConfigureData
+    {
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaseOrder { get; set; }
+        /// <summary>
+        /// 预约单号
+        /// </summary>
+        public string PrewOrder { get; set; }
+
+        /// <summary>
+        /// 运单号
+        /// </summary>
+        public string WaybillNo { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string ProductTitle { get; set; }
+
     }
 
 }

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

@@ -56,6 +56,8 @@ namespace BBWY.Client.Models.APIModel
 
     public class WareSealBoxSku
     {
+
+        public TaskState TaskState { get; set; }
         /// <summary>
         /// 任务Id
         /// </summary>

BBWY.Client/Models/Enums.cs

@@ -482,7 +482,7 @@
     /// </summary>
     public enum PositionState
     {
-        待封箱, 待落仓, 待完结
+        待封箱=0, 待落仓=1,已配置待落仓=2, 待完结=3
     }
 
     /// <summary>

BBWY.Client/Models/FallWare/CloudWareBoxModel.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.FallWare
+{
+    public class CloudWareBoxModel
+    {
+        /// <summary>
+        /// 箱子id
+        /// </summary>
+        public long SealBoxId { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string ShopName { get; set; }
+
+        /// <summary>
+        /// CLPS采购单号
+        /// </summary>
+        public string CLPSPurchaseOrder { get; set; }
+
+        /// <summary>
+        /// 预约单号
+        /// </summary>
+        public string PrewOrder { get; set; }
+
+        /// <summary>
+        /// 目的城市-仓库
+        /// </summary>
+        public string WareName { get; set; }
+
+        /// <summary>
+        /// 箱子数
+        /// </summary>
+        public int BoxCount { get; set; }
+
+        /// <summary>
+        /// 商品数量
+        /// </summary>
+        public int ProductCount { get; set; }
+    }
+}

BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs

@@ -0,0 +1,60 @@
+using BBWY.Client.Models.SealBox;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.FallWare
+{
+   public class FallWareConfiguredModel
+    { /// <summary>
+      /// 商品名称
+      /// </summary>
+        public string ProductTitle { get; set; }
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaseOrder { get; set; }
+        /// <summary>
+        /// 预约单号
+        /// </summary>
+        public string PrewOrder { get; set; }
+
+        /// <summary>
+        /// 运单号
+        /// </summary>
+        public string WaybillNo { get; set; }
+
+        /// <summary>
+        /// 仓库类型
+        /// </summary>
+        public WareType? WareType { get; set; }
+        /// <summary>
+        /// 封箱id
+        /// </summary>
+        public long SealBoxId { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string WareName { get; set; }
+
+        /// <summary>
+        /// 箱子数
+        /// </summary>
+        public int? BoxCount { get; set; }
+
+        /// <summary>
+        /// 箱子总数量
+        /// </summary>
+        public int SealBoxTotalCount { get; set; }
+
+        /// <summary>
+        /// 仓库任务列表
+        /// </summary>
+        public IList<FallWareConfigureTask> SealBoxConfigureTasks { get; set; }
+    }
+    public class FallWareConfigureTask : SealBoxConfigureTask
+    {
+
+    }
+}

BBWY.Client/Models/FallWare/FallWareWaitConfigureModel.cs

@@ -0,0 +1,36 @@
+using BBWY.Client.Models.SealBox;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+
+namespace BBWY.Client.Models.FallWare
+{
+  public  class FallWareWaitConfigureModel
+    {
+        /// <summary>
+        /// 封箱id
+        /// </summary>
+        public long SealBoxId { get; set; }
+
+        /// <summary>
+        /// 箱子总数量
+        /// </summary>
+        public int SealBoxTotalCount { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string WareName { get; set; }
+
+        /// <summary>
+        /// 仓库类型
+        /// </summary>
+        public WareType? WareType { get; set; }
+
+        /// <summary>
+        /// 仓库任务列表
+        /// </summary>
+        public ObservableCollection<SealBoxConfigureTask> SealBoxConfigureTasks { get; set; }
+    }
+}

BBWY.Client/Models/FallWare/JDWareBoxModel.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.FallWare
+{
+    public class JDWareBoxModel
+    {
+
+        /// <summary>
+        /// 箱子id
+        /// </summary>
+        public long SealBoxId { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string ShopName { get; set; }
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaseOrder { get; set; }
+        /// <summary>
+        /// 预约单号
+        /// </summary>
+        public string PrewOrder { get; set; }
+
+        /// <summary>
+        /// 运单号
+        /// </summary>
+        public string WaybillNo { get; set; }
+
+        /// <summary>
+        /// 目的城市-仓库
+        /// </summary>
+        public string WareName { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string ProductTitle { get; set; }
+
+        /// <summary>
+        /// 箱子数
+        /// </summary>
+        public int BoxCount { get; set; }
+
+        /// <summary>
+        /// 商品数量
+        /// </summary>
+        public int ProductCount { get; set; }
+    }
+}

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -30,8 +30,8 @@ namespace BBWY.Client.Models
         private long id;
 
         public long Id { get => id; set { Set(ref id, value); } }
-       
-        
+
+
         public ICommand PrintBarcodeCommand { get; set; }
 
         public ICommand PrintCerCommand { get; set; }
@@ -49,12 +49,12 @@ namespace BBWY.Client.Models
 
         public Action ReflashTask { get; set; }
 
-       
+
 
         private void UpdateTask()
         {
 
-           
+
             if (!this.OrderId.IsNullOrEmpty())
             {
                 System.Windows.MessageBox.Show("暂不支持修改采购组的任务");
@@ -89,18 +89,13 @@ namespace BBWY.Client.Models
             LookCerCommand = new RelayCommand(LookCer);
             SetServiceCommand = new RelayCommand(SetService);
             UpdateTaskCommand = new RelayCommand(UpdateTask);
-            QualityTaskCommand=new RelayCommand(QualityTask);
+            QualityTaskCommand = new RelayCommand(QualityTask);
         }
 
         private void QualityTask()
         {
-            QualityWindow service = new QualityWindow();
             //加载数据
-            ViewModelLocator viewModelLocator = new ViewModelLocator();
-            var qualityViewModel = viewModelLocator.QualityTask;
-            if (qualityViewModel.ReflashWindow == null)
-                qualityViewModel.ReflashWindow = ReflashTask;
-            qualityViewModel.SearchSku(this);
+            QualityWindow service = new QualityWindow(this, ReflashTask);
             service.Show();
         }
 
@@ -112,19 +107,18 @@ namespace BBWY.Client.Models
             var serviceViewModel = viewModelLocator.PackServiceList;
 
             serviceViewModel.PackTaskModel = this;
-            serviceViewModel.PackTaskList = new System.Collections.ObjectModel.ObservableCollection<PackTaskModel> { this};
+            serviceViewModel.PackTaskList = new System.Collections.ObjectModel.ObservableCollection<PackTaskModel> { this };
             serviceViewModel.FloorDragNumber = this.FloorDragNumber;
             serviceViewModel.TaskCount = SkuCount;
             serviceViewModel.TaskId = TaskId;
-            serviceViewModel.OrderId= OrderId;
-            serviceViewModel.SkuId =SkuId ;
-            serviceViewModel.PackUserName = this.PackUser?.Replace("\r\n",",")?.Replace("\n", ",")?.Replace("\r", ",");
+            serviceViewModel.OrderId = OrderId;
+            serviceViewModel.SkuId = SkuId;
+            serviceViewModel.PackUserName = this.PackUser?.Replace("\r\n", ",")?.Replace("\n", ",")?.Replace("\r", ",");
             serviceViewModel.LoadPackDatas();
 
-           
+
             serviceViewModel.SetAllFees = new Action(() =>
              {
-
                  if (ReflashTask != null) ReflashTask();
              });
             service.Show();
@@ -177,7 +171,7 @@ namespace BBWY.Client.Models
                 return;
             }
             PrintWindow printWindow = new PrintWindow();
-            
+
             printWindow.CertificateModel = certificateModel;
             printWindow.LoadData();
             //printWindow.Datas = LoadCerLabelModels();
@@ -195,7 +189,7 @@ namespace BBWY.Client.Models
                 return;
             }
 
-            PrintWindow printWindow = new PrintWindow();       
+            PrintWindow printWindow = new PrintWindow();
             printWindow.BarCodeModel = new BarCodeModel
             {
                 Brand = BarCodeModel.Brand,
@@ -209,8 +203,8 @@ namespace BBWY.Client.Models
             //printWindow.Datas = LoadBarLabelModels();
             printWindow.Show();
         }
-        
-     
+
+
 
         private DateTime endTime;
         /// <summary>
@@ -485,6 +479,6 @@ namespace BBWY.Client.Models
         /// </summary>
         public string GoodsNo { get => goodsNo; set { Set(ref goodsNo, value); } }
 
- 
+
     }
 }

BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs

@@ -23,6 +23,11 @@ namespace BBWY.Client.Models.SealBox
         /// </summary>
         public string WareName { get; set; }
 
+        /// <summary>
+        /// 仓库类型
+        /// </summary>
+        public WareType? WareType { get; set; }
+
         /// <summary>
         /// 仓库任务列表
         /// </summary>
@@ -50,13 +55,6 @@ namespace BBWY.Client.Models.SealBox
         /// sku图片
         /// </summary>
         public string Logo { get; set; }
-        ///// <summary>
-        ///// 预计完成时间
-        ///// </summary>
-        //public DateTime? PreCompletedTime { get; set; }
-        ///// <summary>
-        ///// 任务状态
-        ///// </summary>
-        //public TaskState? TaskState { get; set; }
+
     }
 }

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -27,6 +27,8 @@ using BBWY.Client.Models.APIModel;
 using BBWY.Client.Views.SealBox;
 using BBWY.Client.Models.SealBox;
 using BBWY.Client.ViewModels.SealBox;
+using BBWY.Client.Views.FallWare;
+using BBWY.Client.Models.FallWare;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -40,6 +42,9 @@ namespace BBWY.Client.ViewModels.PackTask
 
         #region 属性绑定
 
+
+
+
         private string sealBoxWaitConfigureCount;
         /// <summary>
         /// 封箱 待配置数
@@ -58,6 +63,12 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public SealBoxConfigureType SealBoxConfigureType { get => sealBoxConfigureType; set { Set(ref sealBoxConfigureType, value); } }
 
+        //private SealBoxConfigureType fallWareConfigureType;
+        ///// <summary>
+        ///// 落仓配置状态
+        ///// </summary>
+        //public SealBoxConfigureType FallWareConfigureType { get => fallWareConfigureType; set { Set(ref fallWareConfigureType, value); } }
+
 
         private ObservableCollection<SealBoxWaitConfigureModel> sealBoxWaitConfigureList;
         /// <summary>
@@ -71,6 +82,20 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public ObservableCollection<SealBoxConfiguredModel> SealBoxConfiguredList { get => sealBoxConfiguredList; set { Set(ref sealBoxConfiguredList, value); } }
 
+
+
+        private ObservableCollection<FallWareConfiguredModel> fallWareWaitConfigureList;
+        /// <summary>
+        /// 落仓待配置列表
+        /// </summary>
+        public ObservableCollection<FallWareConfiguredModel> FallWareWaitConfigureList { get => fallWareWaitConfigureList; set { Set(ref fallWareWaitConfigureList, value); } }
+
+        private ObservableCollection<FallWareConfiguredModel> fallWareConfiguredList;
+        /// <summary>
+        /// 落仓已配置列表
+        /// </summary>
+        public ObservableCollection<FallWareConfiguredModel> FallWareConfiguredList { get => fallWareConfiguredList; set { Set(ref fallWareConfiguredList, value); } }
+
         /// <summary>
         /// 查询时间段
         /// </summary>
@@ -234,6 +259,37 @@ namespace BBWY.Client.ViewModels.PackTask
             this.sealBoxService = sealBoxService;
 
             SealBoxConfigureType = SealBoxConfigureType.已配置;
+
+            SetFallWareConfiguredCommand = new RelayCommand<object>(SetFallWareConfigured);
+        }
+
+        private void SetFallWareConfigured(object obj)
+        {
+            var fallware = obj as FallWareConfiguredModel;
+            JDWareBoxModel model = new JDWareBoxModel
+            {
+                ShopName = globalContext.User.Shop.ShopName,
+                WareName = fallware.WareName,
+                SealBoxId = fallware.SealBoxId,
+                ProductCount = fallware.SealBoxTotalCount,
+                BoxCount = fallware.BoxCount.Value,
+                PrewOrder = fallware.PrewOrder,
+                ProductTitle = fallware.ProductTitle,
+                PurchaseOrder = fallware.PurchaseOrder,
+                WaybillNo = fallware.WaybillNo
+            };
+            if (fallware.WareType== WareType.京仓)
+            {
+                
+                SetJDWareBoxWindow window = new SetJDWareBoxWindow(model,sealBoxService,fallware.WareType.Value,ReflashTask);
+                window.Show();
+            }
+            if (fallware.WareType == WareType.云仓)
+            {
+
+                SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType.Value, ReflashTask);
+                window.Show();
+            }
         }
 
         private void UpdateSealBoxConfigured(SealBoxConfiguredModel model)
@@ -344,7 +400,10 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
         #region 事件绑定
-
+        /// <summary>
+        /// 设置落仓配置信息(上传材料)
+        /// </summary>
+        public ICommand SetFallWareConfiguredCommand { get; set; }
         /// <summary>
         /// 修改封箱数据
         /// </summary>
@@ -413,10 +472,11 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public void SearchTaskList()
         {
+            long? taskId = null;
             try
             {
                 if (SearchTaskId != null && !string.IsNullOrEmpty(SearchTaskId.Trim()))
-                    Convert.ToInt64(SearchTaskId);
+                    taskId= Convert.ToInt64(SearchTaskId);
             }
             catch
             {
@@ -568,10 +628,7 @@ namespace BBWY.Client.ViewModels.PackTask
                             if (SealBoxConfigureType == SealBoxConfigureType.已配置)
                             {
                                 SealBoxConfiguredList = new ObservableCollection<SealBoxConfiguredModel>();
-
-
-
-                                var sealBoxRes = sealBoxService.GetSealBoxConfiguredList(SearchSkuId, SearchTaskId, globalContext.User.Shop.ShopId.ToString(), PageSize, PageIndex);
+                                var sealBoxRes = sealBoxService.GetSealBoxConfiguredList(PositionState.待封箱, SearchSkuId, SearchTaskId, globalContext.User.Shop.ShopId.ToString(), PageSize, PageIndex);
                                 if (sealBoxRes == null)
                                 {
                                     System.Windows.MessageBox.Show("网络异常"); IsLoading = false; return;
@@ -605,7 +662,77 @@ namespace BBWY.Client.ViewModels.PackTask
                         IsLoading = false;
                     });
                 if (TaskState == Models.TaskState.待落仓)
-                    IsLoading = false;
+                    Task.Factory.StartNew(() =>
+                    {
+
+                        try
+                        {
+                            if (SealBoxConfigureType == SealBoxConfigureType.待配置)
+                            {
+                                FallWareWaitConfigureList = new ObservableCollection<FallWareConfiguredModel>();
+                                var fallWareRes = sealBoxService.SearchFallWareConfiguredList(PositionState.待落仓, taskId, SearchSkuId, PageIndex, PageSize);
+
+                                if (fallWareRes == null)
+                                {
+                                    System.Windows.MessageBox.Show("网络异常"); IsLoading = false; return;
+                                }
+
+                                if (!fallWareRes.Success || fallWareRes.Data == null)
+                                {
+                                    System.Windows.MessageBox.Show(fallWareRes.Msg); IsLoading = false; return;
+                                }
+                                App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                {
+                                    OrderCount = fallWareRes.Data.TotalCount;
+                                }));
+
+                                foreach (var item in fallWareRes.Data.FallWareConfiguredModels)
+                                {
+                                    App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                    {
+                                        FallWareWaitConfigureList.Add(item);
+                                    }));
+                                }
+                            }
+                            if (SealBoxConfigureType == SealBoxConfigureType.已配置)
+                            {
+                                FallWareConfiguredList = new ObservableCollection<FallWareConfiguredModel>();
+                                var fallWareRes = sealBoxService.SearchFallWareConfiguredList(PositionState.已配置待落仓, taskId, SearchSkuId, PageIndex, PageSize);
+
+                                if (fallWareRes == null)
+                                {
+                                    System.Windows.MessageBox.Show("网络异常"); IsLoading = false; return;
+                                }
+
+                                if (!fallWareRes.Success || fallWareRes.Data == null)
+                                {
+                                    System.Windows.MessageBox.Show(fallWareRes.Msg); IsLoading = false; return;
+                                }
+                                App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                {
+                                    OrderCount = fallWareRes.Data.TotalCount;
+                                }));
+
+                                foreach (var item in fallWareRes.Data.FallWareConfiguredModels)
+                                {
+                                    App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                    {
+                                        FallWareConfiguredList.Add(item);
+                                    }));
+                                }
+                            }
+
+                            IsLoadFallWareCount();
+
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(ex.Message);
+
+                        }
+                        IsLoading = false;
+
+                    });
             }
 
 
@@ -614,7 +741,15 @@ namespace BBWY.Client.ViewModels.PackTask
 
         GlobalContext globalContext;
         ProductService productService;
-
+        private void IsLoadFallWareCount()
+        {
+            var res = sealBoxService.GetFallWareConfigureCounts(globalContext.User.Shop.ShopId.ToString());
+            if (res != null && res.Success && res.Data != null)
+            {
+                SealBoxWaitConfigureCount = res.Data.FallWareWaitConfigureCount.ToString();
+                SealBoxConfiguredCount = res.Data.FallWareConfiguredCount.ToString();
+            }
+        }
 
         private void IsLoadSealBoxCount()
         {

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -22,7 +22,8 @@ using GalaSoft.MvvmLight.Messaging;
 using BBWY.Client.Models.APIModel;
 using BBWY.Client.Models.PackTask;
 using BBWY.Client.Views.SealBox;
-
+using BBWY.Client.Views.FallWare;
+using BBWY.Client.Models.FallWare;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -49,6 +50,11 @@ namespace BBWY.Client.ViewModels.PackTask
             }
         }
 
+        public string fallWareWaitConfigureCount;
+        public string FallWareWaitConfigureCount { get => fallWareWaitConfigureCount; set { Set(ref fallWareWaitConfigureCount, value); } }
+
+        public string fallWareConfiguredCount;
+        public string FallWareConfiguredCount { get => fallWareConfiguredCount; set { Set(ref fallWareConfiguredCount, value); } }
 
 
 
@@ -214,7 +220,11 @@ namespace BBWY.Client.ViewModels.PackTask
 
             }
         }
-
+        private SealBoxConfigureType sealBoxConfigureType;
+        /// <summary>
+        /// 封箱配置状态
+        /// </summary>
+        public SealBoxConfigureType SealBoxConfigureType { get => sealBoxConfigureType; set { Set(ref sealBoxConfigureType, value); } }
 
         #endregion
 
@@ -252,7 +262,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
             //加载数据
             SetTaskState(null);
-          
+
 
 
 
@@ -262,22 +272,85 @@ namespace BBWY.Client.ViewModels.PackTask
 
             SetSealBoxCommand = new RelayCommand<object>(SetSealBox);
             CompeteFallWareCommand = new RelayCommand<object>(CompeteFallWare);
+            SealBoxConfigureType = SealBoxConfigureType.已配置;
+            PositionState = PositionState.已配置待落仓;
+           SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s =>
+            {
+                PageIndex = 1;
+                SealBoxConfigureType = s;
+                PositionState = s == SealBoxConfigureType.已配置 ? PositionState.已配置待落仓 : PositionState.待落仓;
+                Task.Factory.StartNew(() => SearchTaskList());
+            });
+
      
+
+            LookBoxConfigureCommand = new RelayCommand<object>(LookBoxConfigure);
+        }
+
+        private void LookBoxConfigure(object obj)
+        {
+            var fallware = obj as WaitFallWareModel;
+            JDWareBoxModel model = new JDWareBoxModel
+            {
+                ShopName = globalContext.User.Shop.ShopName,
+                WareName = fallware.WareName,
+                SealBoxId = fallware.SealBoxId,
+                ProductCount = fallware.ProductCount,
+                BoxCount = fallware.SealBoxCount,
+                PrewOrder = fallware.BoxConfigureData.PrewOrder,
+                ProductTitle = fallware.BoxConfigureData.ProductTitle,
+                PurchaseOrder = fallware.BoxConfigureData.PurchaseOrder,
+                WaybillNo = fallware.BoxConfigureData.WaybillNo
+            };
+            if (fallware.WareType == WareType.京仓)
+            {
+                SetJDWareBoxWindow window = new SetJDWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask,false);
+                window.Show();
+            }
+            if (fallware.WareType == WareType.云仓)
+            {
+                SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask, false);
+                window.Show();
+            }
         }
 
+        public PositionState PositionState { get; set; }
+
         /// <summary>
         /// 完成落仓(todo:)
         /// </summary>
         /// <param name="obj"></param>
         private void CompeteFallWare(object obj)
         {
-            //throw new NotImplementedException();
+
+            if (System.Windows.MessageBox.Show("是否完成落仓?", "提示",
+                                MessageBoxButton.YesNo,
+                                MessageBoxImage.Warning) != MessageBoxResult.Yes)
+                return;
+
+            var model = obj as WaitFallWareModel;
+            var res = sealBoxService.WareCompeteFallWare(model.SealBoxId);
+            if (res != null&&res.Success)
+            {
+                ReflashTask();return;
+            }
+            if (res==null)
+            {
+                System.Windows.MessageBox.Show("网络异常");
+                return;
+            }
+            System.Windows.MessageBox.Show(res.Msg);
         }
 
         private void SetSealBox(object obj)
         {
 
             var model = (SealBoxModel)obj;
+            if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState.待质检 || s.TaskState == Models.TaskState.待打包))
+            {
+                System.Windows.MessageBox.Show("无法封箱,存在未封箱的任务");
+                return;
+            }
 
             SetSealBoxWindow setSealBoxWindow = new SetSealBoxWindow(model);
             setSealBoxWindow.SendBoxCount = boxCount =>
@@ -290,6 +363,11 @@ namespace BBWY.Client.ViewModels.PackTask
 
         #region 事件绑定 
 
+        public ICommand LookBoxConfigureCommand { get; set; }
+        /// <summary>
+        /// 待配置 /已配置
+        /// </summary>
+        public ICommand SetSealBoxConfigureTypeCommand { get; set; }
         public ICommand CompeteFallWareCommand { get; set; }
         public ICommand CompeteSealBoxCommand { get; set; }
 
@@ -346,16 +424,16 @@ namespace BBWY.Client.ViewModels.PackTask
                 System.Windows.MessageBox.Show("请先设置封箱数量");
                 return;
             }
-            var res = sealBoxService.WareCompeteSealBox(model.SealBoxId,model.SealBoxCount);
-            if(res==null)
+            var res = sealBoxService.WareCompeteSealBox(model.SealBoxId, model.SealBoxCount);
+            if (res == null)
             {
-               System.Windows. MessageBox.Show("网络异常","");
+                System.Windows.MessageBox.Show("网络异常", "");
                 return;
             }
 
 
 
-            if (!res.Success||!res.Data)
+            if (!res.Success || !res.Data)
             {
                 System.Windows.MessageBox.Show(res.Msg);
                 return;
@@ -366,11 +444,13 @@ namespace BBWY.Client.ViewModels.PackTask
 
         private void UpdateTaskState(object obj)
         {
-            var objList = (object[])obj;
-            long taskId = (long)objList[0];
-            var packTaskState = (TaskState)objList[1];
+            var model = (PackTaskModel)obj;
+            long taskId = model.TaskId;
+            var packTaskState = model.TaskState;
 
             ApiResponse<object> res = null;
+
+
             switch (packTaskState)
             {
                 case Models.TaskState.未到货:
@@ -397,11 +477,13 @@ namespace BBWY.Client.ViewModels.PackTask
                                  MessageBoxButton.YesNo,
                                  MessageBoxImage.Warning) != MessageBoxResult.Yes)
                         return;
-                    res = packTaskService.SetPackTaskState(taskId, PackTaskState.待封箱);
+                    res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待封箱);
                     break;
                 case Models.TaskState.待封箱:
                     break;
                 case Models.TaskState.待出库:
+
+
                     break;
                 case Models.TaskState.已完成:
                     break;
@@ -437,7 +519,7 @@ namespace BBWY.Client.ViewModels.PackTask
             SearchTaskList();
 
         }
-       
+
 
 
         /// <summary>
@@ -460,10 +542,10 @@ namespace BBWY.Client.ViewModels.PackTask
             if (TaskState == Models.TaskState.待落仓)
                 Task.Factory.StartNew(() =>
                 {
-
+                   
 
                     WaitFallWareList = new ObservableCollection<WaitFallWareModel>();
-                    var datas = sealBoxService.SearchWaitFallWareList(SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
+                    var datas = sealBoxService.SearchWareFallWareConfigureList(PositionState, SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
                     if (datas != null && datas.Data != null && datas.Success)
                     {
                         var dataModel = datas.Data;
@@ -483,6 +565,9 @@ namespace BBWY.Client.ViewModels.PackTask
                                     WareName = item.WareName,
                                     SealBoxCount = item.SealBoxCount,
                                     SealBoxId = item.SealBoxId,
+                                     BoxConfigureData = item.BoxConfigureData,
+                                      ProductCount = item.ProductCount,
+                                       WareType = item.WareType,
 
                                 });
                             }));
@@ -497,15 +582,16 @@ namespace BBWY.Client.ViewModels.PackTask
                         //}));
                     }
                     IsLoadCount();
-                    IsLoading = false;
+                    IsLoadFallWareCount();
+                     IsLoading = false;
 
                 });
             else if (TaskState == Models.TaskState.待封箱)
                 Task.Factory.StartNew(() =>
                 {
-                    
-                   
 
+
+                    var randNum = new Random().Next(81, 90);
                     WaitSealBoxModels = new ObservableCollection<SealBoxModel>();
 
                     var datas = sealBoxService.GetWareSealBoxList(SearchShopName, taskId, SearchSkuId, PageIndex, PageSize);
@@ -515,18 +601,24 @@ namespace BBWY.Client.ViewModels.PackTask
                         OrderCount = dataModel.TotalCount;
                         foreach (var item in dataModel.WaitSealBoxModels)
                         {
+
                             App.Current.Dispatcher.BeginInvoke(new Action(() =>
                             {
                                 WaitSealBoxModels.Add(new SealBoxModel
                                 {
                                     AcceptUserName = string.Join("|", item.AcceptUserNames),
                                     DepartmentName = item.DepartmentName,
-                                    SealBoxSkus = item.SealBoxSkus,
+                                    SealBoxSkus = item.SealBoxSkus.Select(s =>
+                                    {
+
+                                        s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}");
+                                        return s;
+                                    }).ToList(),
                                     ShopId = item.ShopId,
                                     ShopName = item.ShopName,
                                     WareId = item.WareId,
                                     WareName = item.WareName,
-                                     SealBoxId = item.SealBoxId,
+                                    SealBoxId = item.SealBoxId,
                                 });
                             }));
 
@@ -584,8 +676,8 @@ namespace BBWY.Client.ViewModels.PackTask
                                 OrderId = item.OrderId,
                                 SkuId = item.SkuId,
                                 SkuName = item.SkuName,
-                                FloorDragNumber=item.FloorDragNumber,
-                              
+                                FloorDragNumber = item.FloorDragNumber,
+
 
                             };
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
@@ -636,7 +728,15 @@ namespace BBWY.Client.ViewModels.PackTask
                     IsLoading = false;
                 });
         }
-
+        private void IsLoadFallWareCount()
+        {
+            var res = sealBoxService.GetFallWareConfigureCounts(null);
+            if (res != null && res.Success && res.Data != null)
+            {
+                FallWareWaitConfigureCount = res.Data.FallWareWaitConfigureCount.ToString();
+                FallWareConfiguredCount = res.Data.FallWareConfiguredCount.ToString();
+            }
+        }
         private void IsLoadCount()
         {
             var packTaskResult = packTaskService.GetTaskAllCount();
@@ -651,7 +751,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     WaitOutbound = packTaskResult.Data.WaitOutbound?.ToString();
                     WaitPackCount = packTaskResult.Data.WaitPackCount?.ToString();
                     WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString();
-                    WaitFallWareCount= packTaskResult.Data.WaitFallWareCount?.ToString();
+                    WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
                     WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
                 }));
             }
@@ -670,7 +770,7 @@ namespace BBWY.Client.ViewModels.PackTask
         private void OpenSkuDetail(object param)
         {
             var paramList = (object[])param;
-            var skuId = paramList[1].ToString();
+            var skuId = paramList.Last().ToString();
             var url = $"https://item.jd.com/{skuId}.html";
             try
             {

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -24,7 +24,7 @@ using WebSocketSharp;
 
 namespace BBWY.Client.ViewModels
 {
-    public class QualityViewModel : BaseVM, IDenpendency
+    public class QualityViewModel : BaseVM
     {
         #region 属性
 

BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml

@@ -0,0 +1,250 @@
+<UserControl x:Class="BBWY.Client.Views.FallWare.FallWareConfiguredControl"
+             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.FallWare"
+         xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+             mc:Ignorable="d" 
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters" Background="White"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding TaskList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+
+        <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
+                Background="#F2F2F2">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="400"/>
+                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="150"/>
+                    <ColumnDefinition Width="150"/>
+                    <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="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"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
+                <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>-->
+
+                <!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}"  Grid.ColumnSpan="6"/>-->
+            </Grid>
+        </Border>
+        <ListBox x:Name="listbox_order"
+                     Grid.Row="7"   
+                     ItemsSource="{Binding FallWareConfiguredList}"              
+                     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="68">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition  MinHeight="68"/>
+                        </Grid.RowDefinitions>
+                        <Grid Background="#F2F2F2" >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MinWidth="80"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Horizontal" Grid.Column="0" >
+                                <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
+                                <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding WareName}"
+                                                                   Margin=" 5,0,7,0"/>
+                            </StackPanel>
+                            <Grid Grid.Column="1">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
+                            </Grid>
+                            <!--<Grid Grid.Column="2">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
+                            </Grid>-->
+                        </Grid>
+                        <Grid Grid.Row="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MinWidth="80"/>
+                            </Grid.ColumnDefinitions>
+                            <ListBox Name="listbox_orerSku"
+                     ItemsSource="{Binding SealBoxConfigureTasks}"              
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="0,0,0,0"
+                     Foreground="{StaticResource Text.Color}"
+                                >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid MinHeight="68" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="62"/>
+                                                    <ColumnDefinition/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+                                                <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="48" DecodePixelWidth="48"
+                                                           VerticalAlignment="Top" Margin="14,10,0,10"
+                                                           Cursor="Hand">
+                                                    <b:Interaction.Triggers>
+                                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                            <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                                <b:InvokeCommandAction.CommandParameter>
+                                                                    <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                        <Binding Path="SkuId"/>
+                                                                    </MultiBinding>
+                                                                </b:InvokeCommandAction.CommandParameter>
+                                                            </b:InvokeCommandAction>
+                                                        </b:EventTrigger>
+                                                    </b:Interaction.Triggers>
+                                                </c:BAsyncImage>
+
+                                                <StackPanel   Grid.Column="1" Grid.ColumnSpan="2"  Orientation="Vertical" Margin="8,10,0,10">
+                                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
+                                                        <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
+                                                        <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                    <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
+                                                        <TextBlock.ToolTip>
+                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                <TextBlock Text="{Binding SkuName,Mode=TwoWay}"/>
+                                                            </ToolTip>
+                                                        </TextBlock.ToolTip>
+                                                         <Run Text="SKU名称:"/>
+                                                         <Run Text="{Binding SkuName}"/>
+                                         </TextBlock>
+                                                </StackPanel>
+
+
+
+                                                <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,10,0,10">
+                                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
+                                                        <TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
+                                                        <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                </StackPanel>
+
+                                            </Grid>
+
+                                            <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+                            <ListBox  Grid.Column="1" Name="listbox_skuCount"
+                     ItemsSource="{Binding SealBoxConfigureTasks}"              
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="0,0,0,0"
+                     Foreground="{StaticResource Text.Color}"
+                                >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid MinHeight="68"  Grid.Column="1" Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
+                                            <Grid Grid.Column="1">
+                                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareHourseCount}"/>
+                                            </Grid>
+                                            <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <Grid Grid.Column="2">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PurchaseOrder}"/>
+                            </Grid>
+                            <Grid Grid.Column="3">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PrewOrder}"/>
+                            </Grid>
+                            <Grid Grid.Column="4">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"/>
+                            </Grid>
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+
+                            <Grid Grid.Column="5" >
+
+                            </Grid>
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 2 0"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 1 0"/>
+                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
+                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>-->
+
+                        </Grid>
+                        <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                    </Grid>
+
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
+</UserControl>

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

BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml

@@ -0,0 +1,238 @@
+<UserControl x:Class="BBWY.Client.Views.FallWare.FallWareWaitConfigureControl"
+             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.FallWare"
+             xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+             mc:Ignorable="d" 
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters" Background="White"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding TaskList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+
+        <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
+                Background="#F2F2F2">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="400"/>
+                    <ColumnDefinition Width="100"/>
+                    <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}"/>
+                <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
+                <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>-->
+
+                <!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}"  Grid.ColumnSpan="6"/>-->
+            </Grid>
+        </Border>
+        <ListBox x:Name="listbox_order"
+                     Grid.Row="7"   
+                     ItemsSource="{Binding FallWareWaitConfigureList}"              
+                     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="68">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition  MinHeight="68"/>
+                        </Grid.RowDefinitions>
+                        <Grid Background="#F2F2F2" >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MinWidth="80"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Horizontal" Grid.Column="0" >
+                                <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
+                                <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding WareName}"
+                                                                   Margin=" 5,0,7,0"/>
+                            </StackPanel>
+                            <Grid Grid.Column="1">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
+                            </Grid>
+                            <!--<Grid Grid.Column="2">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
+                            </Grid>-->
+                        </Grid>
+                        <Grid Grid.Row="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition MinWidth="80"/>
+                            </Grid.ColumnDefinitions>
+                            <ListBox Name="listbox_orerSku"
+                     ItemsSource="{Binding SealBoxConfigureTasks}"              
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="0,0,0,0"
+                     Foreground="{StaticResource Text.Color}"
+                                >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid MinHeight="68" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="62"/>
+                                                    <ColumnDefinition/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+                                                <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="48" DecodePixelWidth="48"
+                                                           VerticalAlignment="Top" Margin="14,10,0,10"
+                                                           Cursor="Hand">
+                                                    <b:Interaction.Triggers>
+                                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                            <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                                <b:InvokeCommandAction.CommandParameter>
+                                                                    <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                        <Binding Path="SkuId"/>
+                                                                    </MultiBinding>
+                                                                </b:InvokeCommandAction.CommandParameter>
+                                                            </b:InvokeCommandAction>
+                                                        </b:EventTrigger>
+                                                    </b:Interaction.Triggers>
+                                                </c:BAsyncImage>
+
+                                                <StackPanel   Grid.Column="1" Grid.ColumnSpan="2"  Orientation="Vertical" Margin="8,10,0,10">
+                                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
+                                                        <TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
+                                                        <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                    <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
+                                                        <TextBlock.ToolTip>
+                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                <TextBlock Text="{Binding SkuName,Mode=TwoWay}"/>
+                                                            </ToolTip>
+                                                        </TextBlock.ToolTip>
+                                                         <Run Text="SKU名称:"/>
+                                                         <Run Text="{Binding SkuName}"/>
+                                         </TextBlock>
+                                                </StackPanel>
+
+
+
+                                                <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,10,0,10">
+                                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 13">
+                                                        <TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
+                                                        <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                </StackPanel>
+
+                                            </Grid>
+
+                                            <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+                            <ListBox  Grid.Column="1" Name="listbox_skuCount"
+                     ItemsSource="{Binding SealBoxConfigureTasks}"              
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="0,0,0,0"
+                     Foreground="{StaticResource Text.Color}"
+                                >
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid MinHeight="68"  Grid.Column="1" Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
+                                            <Grid Grid.Column="1">
+                                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareHourseCount}"/>
+                                            </Grid>
+                                            <Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <Grid Grid.Column="2">
+                                <c:BButton Style="{StaticResource LinkButton}" Content="设置" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"/>
+                            </Grid>
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
+
+                            <Grid Grid.Column="3" >
+
+                            </Grid>
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 2 0"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 1 0"/>
+                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
+                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>-->
+
+                        </Grid>
+                        <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                    </Grid>
+
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
+</UserControl>
+

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

BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml

@@ -0,0 +1,105 @@
+<c:BWindow x:Class="BBWY.Client.Views.FallWare.SetCloudWareBoxWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.FallWare"
+        mc:Ignorable="d"
+  xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+        xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"   
+        
+        WindowStartupLocation="CenterScreen"
+        CloseButtonVisibility="Visible"
+        CloseButtonColor="{StaticResource WindowButtonColor}"
+        MinButtonVisibility="Collapsed"
+        MaxButtonVisibility="Collapsed"
+        Width="450" Height="330"
+        RightButtonGroupMargin="0,5,5,0">
+    <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
+    <c:BWindow.Resources>
+        <ResourceDictionary>
+
+            <Style x:Key="middleTextBox" TargetType="TextBox">
+                <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="HorizontalContentAlignment"  Value="Center"/>
+                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="Margin" Value="1"/>
+
+            </Style>
+
+        </ResourceDictionary>
+    </c:BWindow.Resources>
+    <Grid>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="39"/>
+            <RowDefinition/>
+            <RowDefinition Height="36"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="云仓箱唛"  FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/>
+        </Border>
+        <Grid Grid.Row="1" Margin="1 0 1 1" Name="jd_box">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+               
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="0" VerticalAlignment="Top" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="0" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="1" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="2" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="3" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="4" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="5" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="6" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+
+            <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="0" HorizontalAlignment="Left" Grid.RowSpan="7"/>
+            <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="0" HorizontalAlignment="Right" Grid.RowSpan="7"/>
+            <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="3" HorizontalAlignment="Right" Grid.RowSpan="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="{Binding ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="CLPS采购单号" Grid.Row="1"/>
+            <TextBox Style="{StaticResource  middleTextBox}" Text="{Binding PurchaseOrder ,Mode=TwoWay}"  Grid.Row="1"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+         
+          
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="目的城市-仓库" Grid.Row="2"/>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareName}"  Grid.Row="2"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+           
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="箱数" Grid.Row="3"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"  Grid.Row="3"   Grid.Column="1" >
+                <TextBlock Style="{StaticResource middleTextBlock}"  Text="1/"/>
+                <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding BoxCount,Mode=TwoWay}" />
+
+
+            </StackPanel>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="商品数量" Grid.Row="3" Grid.Column="2"/>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ProductCount}"  Grid.Row="3"   Grid.Column="3" />
+
+        </Grid>
+        <c:BButton Grid.Row="2" Content="保存" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click" 
+                Name="btn_save"    />
+    </Grid>
+    </c:BWindow>
+

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

@@ -0,0 +1,72 @@
+using BBWY.Client.APIServices;
+using BBWY.Client.Models.FallWare;
+using BBWY.Client.Models;
+using BBWY.Controls;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using WebSocketSharp;
+
+namespace BBWY.Client.Views.FallWare
+{
+    /// <summary>
+    /// SetCloudWareBoxWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SetCloudWareBoxWindow : BWindow
+    {
+        public SetCloudWareBoxWindow(JDWareBoxModel model, SealBoxService sealBoxService, WareType wareType, Action reflashWindow, bool isEnabled = true)
+        {
+            if (SealBoxService == null) this.SealBoxService = sealBoxService;
+            WareType = wareType;
+            ReflashWindow = reflashWindow;
+
+            JDWareBoxModel = model;
+            InitializeComponent();
+            this.DataContext = JDWareBoxModel;
+            if (!isEnabled)
+            {
+                this.jd_box.IsEnabled = isEnabled;
+                this.btn_save.Visibility = Visibility.Collapsed;
+            }
+        }
+        public JDWareBoxModel JDWareBoxModel { get; set; }
+
+        private SealBoxService SealBoxService { get; set; }
+
+        private Action ReflashWindow { get; set; }
+
+        private WareType WareType { get; set; }
+        private void BButton_Click(object sender, RoutedEventArgs e)
+        {
+
+            if (JDWareBoxModel.PurchaseOrder.IsNullOrEmpty())
+            {
+                MessageBox.Show("采购单号不能为空");
+                return;
+            }
+            if (JDWareBoxModel.PrewOrder.IsNullOrEmpty() && WareType == WareType.京仓)
+            {
+                MessageBox.Show("预约单号不能为空");
+                return;
+            }
+            var res = SealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo);
+
+            if (res != null && res.Success)
+            {
+                if (ReflashWindow != null) ReflashWindow();
+                this.Close();
+
+                return;
+            }
+            if (res != null) MessageBox.Show(res.Msg);
+        }
+    }
+}

BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml

@@ -0,0 +1,113 @@
+<c:BWindow x:Class="BBWY.Client.Views.FallWare.SetJDWareBoxWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.FallWare"
+        mc:Ignorable="d"
+        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+        xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"   
+        
+        WindowStartupLocation="CenterScreen"
+        CloseButtonVisibility="Visible"
+        CloseButtonColor="{StaticResource WindowButtonColor}"
+        MinButtonVisibility="Collapsed"
+        MaxButtonVisibility="Collapsed"
+        Width="450" Height="500"
+        RightButtonGroupMargin="0,5,5,0">
+    <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
+    <c:BWindow.Resources>
+        <ResourceDictionary>
+
+            <Style x:Key="middleTextBox" TargetType="TextBox">
+                <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="HorizontalContentAlignment"  Value="Center"/>
+                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="Margin" Value="1"/>
+               
+            </Style>
+
+        </ResourceDictionary>
+    </c:BWindow.Resources>
+    <Grid>
+        
+        <Grid.RowDefinitions>
+            <RowDefinition Height="39"/>
+            <RowDefinition/>
+            <RowDefinition Height="36"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="京仓箱唛"  FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/>
+        </Border>
+        <Grid Grid.Row="1" Margin="1 0 1 1" Name="jd_box">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="0" VerticalAlignment="Top" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="0" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="1" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="2" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="3" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="4" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="5" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+            <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="6" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
+
+            <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="0" HorizontalAlignment="Left" Grid.RowSpan="7"/>
+            <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="0" HorizontalAlignment="Right" Grid.RowSpan="7"/>
+            <Border Width="1"  Background="{StaticResource Border.Brush}" Grid.Column="3" HorizontalAlignment="Right" Grid.RowSpan="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="{Binding ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="采购单号" Grid.Row="1"/>
+            <TextBox Style="{StaticResource  middleTextBox}" Text="{Binding PurchaseOrder ,Mode=TwoWay}"  Grid.Row="1"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="预约单号" Grid.Row="2"/>
+            <TextBox Style="{StaticResource  middleTextBox}"  Text="{Binding PrewOrder,Mode=TwoWay}"  Grid.Row="2"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="运单号" Grid.Row="3"/>
+            <TextBox Style="{StaticResource  middleTextBox}"  Text="{Binding WaybillNo,Mode=TwoWay}"  Grid.Row="3"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="目的城市-仓库" Grid.Row="4"/>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareName}"  Grid.Row="4"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="商品名称" Grid.Row="5"/>
+            <TextBox Style="{StaticResource  middleTextBox}"  Text="{Binding ProductTitle,Mode=TwoWay}"  Grid.Row="5"   Grid.Column="1" Grid.ColumnSpan="3"/>
+
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="箱数" Grid.Row="6"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"  Grid.Row="6"   Grid.Column="1" >
+                <TextBlock Style="{StaticResource middleTextBlock}"  Text="1/"/>
+                <TextBlock  Style="{StaticResource middleTextBlock}"  Text="{Binding BoxCount,Mode=TwoWay}" />
+   
+
+            </StackPanel>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="商品数量" Grid.Row="6" Grid.Column="2"/>
+            <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ProductCount}"  Grid.Row="6"   Grid.Column="3" />
+
+        </Grid>
+        <c:BButton Grid.Row="2" Content="保存" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click" 
+                Name="btn_save"    />
+    </Grid>
+    </c:BWindow>

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

@@ -0,0 +1,75 @@
+using BBWY.Client.APIServices;
+using BBWY.Client.Models;
+using BBWY.Client.Models.FallWare;
+using BBWY.Controls;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using WebSocketSharp;
+
+namespace BBWY.Client.Views.FallWare
+{
+    /// <summary>
+    /// SetJDWareBoxWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SetJDWareBoxWindow : BWindow
+    {
+        public SetJDWareBoxWindow(JDWareBoxModel model, SealBoxService sealBoxService,WareType wareType, Action reflashWindow,bool isEnabled = true)
+        {
+            if (SealBoxService == null) this.SealBoxService = sealBoxService;
+            WareType = wareType;
+            ReflashWindow = reflashWindow;
+
+            JDWareBoxModel = model;
+            InitializeComponent();
+            this.DataContext = JDWareBoxModel;
+            if (!isEnabled)
+            {
+                this.jd_box.IsEnabled = isEnabled;
+                this.btn_save.Visibility = Visibility.Collapsed;
+            }
+
+            
+     
+        }
+        public JDWareBoxModel JDWareBoxModel { get; set; }
+
+        private SealBoxService SealBoxService { get; set; }
+
+        private Action ReflashWindow { get; set; }
+
+        private WareType WareType { get; set; }
+        private void BButton_Click(object sender, RoutedEventArgs e)
+        {
+
+            if (JDWareBoxModel.PurchaseOrder.IsNullOrEmpty())
+            {
+                MessageBox.Show("采购单号不能为空");
+                return;
+            }
+            if (JDWareBoxModel.PrewOrder.IsNullOrEmpty()&& WareType== WareType.京仓)
+            {
+                MessageBox.Show("预约单号不能为空");
+                return;
+            }
+          var res =  SealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle,JDWareBoxModel.PurchaseOrder,JDWareBoxModel.PrewOrder,JDWareBoxModel.WaybillNo);
+
+            if (res!=null&&res.Success)
+            {
+                if (ReflashWindow != null) ReflashWindow();
+                this.Close();
+
+                return;
+            }
+            if (res != null) MessageBox.Show(res.Msg);
+        }
+    }
+}

BBWY.Client/Views/PackTask/WaitFallWareControl.xaml → BBWY.Client/Views/FallWare/WaitFallWareControl.xaml

@@ -109,7 +109,7 @@
                                                                    Margin=" 5,0,0,0"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
-                                <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserName}" Margin="5,0,0,0" />
+                                <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
                             </StackPanel>
 
                         </Grid>
@@ -236,17 +236,24 @@
 
 
                             <Grid Grid.Column="2" >
-                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                         
+                                            >
+                                    <TextBlock Style="{StaticResource middleTextBlock}" Text="箱唛:"  />
 
 
-                                    <!--<c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="设置" 
-                                             Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                    <StackPanel Orientation="Horizontal" 
+                                                Visibility="{Binding BoxConfigureData,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"   
+                                                >
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="查看" 
+                                             Command="{Binding DataContext.LookBoxConfigureCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
                                                CommandParameter="{Binding}"
-                                               >
-
-                                    </c:BButton>-->
-
+                                               />
 
+                                    </StackPanel>
+                                    <TextBlock Style="{StaticResource middleTextBlock}" Text="未上传"  
+                                               Visibility="{Binding BoxConfigureData,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"   
+                                               />
 
                                 </StackPanel>
                             </Grid>

BBWY.Client/Views/FallWare/WareFallWareListControl.xaml

@@ -0,0 +1,86 @@
+<UserControl x:Class="BBWY.Client.Views.FallWare.WareFallWareListControl"
+             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.FallWare"
+             xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+             xmlns:ctr="clr-namespace:BBWY.Client.Converters" Background="White"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:packtask ="clr-namespace:BBWY.Client.Views.PackTask"
+             xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
+             xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+             DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+              mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="1500">
+    <UserControl.Resources>
+        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:StorageType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
+        <ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
+        <ctr:WaybillNoConverter x:Key="waybillConverter"/>
+        <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
+        <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
+        <Style TargetType="RadioButton">
+
+            <Setter Property="IsChecked" Value="False" />
+            <Setter Property="Background" Value="#8080FF" />
+            <Setter Property="Foreground" Value="Black" />
+            <!--<Setter Property="Content" Value="{Binding ElementName=txt,Path=Text}"/>-->
+            <Setter  Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid  Background="#F2F2F2"  >
+                            <Rectangle x:Name="_Rect"   Fill="#F2F2F2" HorizontalAlignment="Center" Height="35"  VerticalAlignment="Center" Width="{TemplateBinding Width}" RenderTransformOrigin="0.5,0.5">
+                                <Rectangle.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform ScaleY="-1"/>
+                                        <SkewTransform/>
+                                        <RotateTransform/>
+                                        <TranslateTransform/>
+                                    </TransformGroup>
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="35">
+                                <TextBlock   VerticalAlignment="Center" Text="{TemplateBinding Content}"  />
+                                <TextBlock   VerticalAlignment="Center" Text="{TemplateBinding  Tag}"  Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
+                            </StackPanel>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="true">
+                                <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
+                                <Setter Property="Foreground" Value="white"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal">
+            <RadioButton Content="已配置"  Height="35" Width="130"  Tag="{Binding FallWareConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
+                         Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
+                         />
+            <RadioButton Content="待配置"   Height="35" Width="130" Tag="{Binding FallWareWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
+                          Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.待配置}"
+                         />
+        </StackPanel>
+        <Grid Grid.Row="1" 
+              Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"
+              >
+
+            <packtask:WaitFallWareControl/>
+
+
+        </Grid>
+    </Grid>
+</UserControl>

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

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

@@ -94,6 +94,7 @@ namespace BBWY.Client.Views.PackTask
                     ApplyAge = item.CertificateModel.ApplyAge,
                     GoodsNumber = item.CertificateModel.GoodsNumber,
                     ProduceDate = item.CertificateModel.ProduceDate,
+                    SaveType = SaveType.C端, 
 
                 });
                 if (resData == null)

BBWY.Client/Views/PackTask/TaskList.xaml

@@ -148,7 +148,7 @@
             
             
             <sealbox:ShopSealBoxListControl Grid.Row="2"  Margin="0,5,0,0"
-                                         Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"   
+                                         Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓:Visible:Collapsed}"   
                                             />
             <c:PageControl PageIndex="{Binding PageIndex}" 
                            PageSize="{Binding PageSize}"

BBWY.Client/Views/PackTask/TaskListControl.xaml

@@ -119,8 +119,9 @@
                                 <TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
                             </StackPanel>
                             <StackPanel Grid.Column="11" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}"
-                                        ><!---->
+                                  
+                                        >
+                                <!-- 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="取消"/>

BBWY.Client/Views/PackTask/WareHouseList.xaml

@@ -4,6 +4,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
+      xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
       xmlns:ctr="clr-namespace:BBWY.Client.Converters"
       xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@@ -169,9 +170,11 @@
 
             </StackPanel>
             <Border Grid.Row="2" Margin="0,5,0,0" BorderBrush="{StaticResource Border.Brush}"  BorderThickness="0,1,0,0"/>
-
+            <Border Grid.Row="3" Margin="0,0,0,0" BorderBrush="{StaticResource Border.Brush}"  BorderThickness="0,1,0,0" 
+                    
+                    />
             <Grid Grid.Row="2" Margin="0,5,0,0">
-                <local:WaitFallWareControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
+                <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
                 <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓:Collapsed:Visible}" />
                 <local:WaitSealBoxControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
                 

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -423,10 +423,11 @@
                                                     />
 
                                     <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}}}"
                                                Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" 
                                                >
-                                        <b:Interaction.Triggers>
+                                        <!--<b:Interaction.Triggers>
                                             <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
                                                 <b:InvokeCommandAction Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
                                                     <b:InvokeCommandAction.CommandParameter>
@@ -437,7 +438,7 @@
                                                     </b:InvokeCommandAction.CommandParameter>
                                                 </b:InvokeCommandAction>
                                             </b:EventTrigger>
-                                        </b:Interaction.Triggers>
+                                        </b:Interaction.Triggers>-->
                                     </c:BButton>
 
                                     <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="完成" 

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

@@ -1,5 +1,7 @@
-using BBWY.Controls;
-
+using BBWY.Client.Models;
+using BBWY.Client.ViewModels;
+using BBWY.Controls;
+using System;
 
 namespace BBWY.Client.Views.QualityTask
 {
@@ -8,9 +10,13 @@ namespace BBWY.Client.Views.QualityTask
     /// </summary>
     public partial class QualityWindow : BWindow
     {
-        public QualityWindow()
+        public QualityWindow(PackTaskModel model,Action ReflashTask)
         {
             InitializeComponent();
+        var qualityViewModel =(QualityViewModel)this.DataContext;
+            if (qualityViewModel.ReflashWindow == null)
+                qualityViewModel.ReflashWindow = ReflashTask;
+            qualityViewModel.SearchSku(model);
         }
     }
 }

BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml

@@ -37,10 +37,10 @@
                     <TextBox x:Name="tbSealBoxCount" Width="200" VerticalContentAlignment="Center"
                              Height="25"/>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                <StackPanel Orientation="Horizontal" Margin="0 5 0 0" Visibility="Collapsed">
                     <TextBlock Style="{StaticResource middleTextBlock}" Text="打印机:" />
                     <ComboBox x:Name="cbPrint" Width="200" Height="25" VerticalContentAlignment="Center"/>
-                </StackPanel>
+                </StackPanel >
 
             </StackPanel>
 

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

@@ -75,11 +75,6 @@ namespace BBWY.Client.Views.SealBox
         public Action<int> SendBoxCount { get; set; }
         private void BButton_Click(object sender, RoutedEventArgs e)
         {
-
-
-
-
-
             int boxCount = 0;
             try
             {
@@ -90,19 +85,19 @@ namespace BBWY.Client.Views.SealBox
                 MessageBox.Show("请输入数字!");
                 return;
             }
-            string printName = cbPrint.Text;
-            var localPrintServer = new LocalPrintServer();
-            var printQueue = localPrintServer.GetPrintQueue(printName);
-            if (printQueue.IsInError)
-            {
-                MessageBox.Show("打印机处于错误状态");
-                return;
-            }
+            //string printName = cbPrint.Text;
+            //var localPrintServer = new LocalPrintServer();
+            //var printQueue = localPrintServer.GetPrintQueue(printName);
+            //if (printQueue.IsInError)
+            //{
+            //    MessageBox.Show("打印机处于错误状态");
+            //    return;
+            //}
 
-            //PrintSealboxModel(printName, boxCount);
+            ////PrintSealboxModel(printName, boxCount);
 
-            MyPrintHelper.PrintSealBoxData(SealBoxModel, printName, boxCount, 1);
-            //todo: 打印单子
+            //MyPrintHelper.PrintSealBoxData(SealBoxModel, printName, boxCount, 1);
+            ////todo: 打印单子
             if (SendBoxCount != null) SendBoxCount(boxCount);
 
             this.Close();

BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml

@@ -7,6 +7,7 @@
              xmlns:ctr="clr-namespace:BBWY.Client.Converters" Background="White"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:BBWY.Client.Views.SealBox"
+             xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
              xmlns:cmodel="clr-namespace:BBWY.Client.Models"
              DataContext="{Binding TaskList,Source={StaticResource Locator}}"
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
@@ -71,11 +72,13 @@
             <RadioButton Content="待配置"   Height="35" Width="130" Tag="{Binding SealBoxWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
                           Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.待配置}"
                          />
-            <c:BButton  Content="配置封箱策略" Width="130" Height="35" Margin="40 0 0 0"
+            <c:BButton  Content="配置封箱策略" Width="130" Height="35" Margin="40 0 0 0" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"
                          Command="{Binding ConfiguredSealBoxCommand}"
                         />
         </StackPanel>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" 
+              Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"
+              >
            
             <local:SealBoxConfiguredControl 
                 Visibility="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:Visible:Collapsed}"
@@ -85,5 +88,17 @@
                 />
       
         </Grid>
+        <Grid Grid.Row="1" 
+              Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"
+              >
+
+            <fallware:FallWareConfiguredControl
+                Visibility="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:Visible:Collapsed}"
+                />
+            <fallware:FallWareWaitConfigureControl
+                Visibility="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:Visible:Collapsed}"
+                />
+
+        </Grid>
     </Grid>
 </UserControl>

BBWY.Client/Views/SealBox/UpdateSealBoxConfiguredWindow.xaml

@@ -7,7 +7,6 @@
         mc:Ignorable="d"
           xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-      
         Title="修改分箱配置表" Height="500" Width="1024"
             MinButtonVisibility="Collapsed"
            MaxButtonVisibility="Collapsed"

BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

@@ -201,6 +201,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,0,0"/>
                                                     </StackPanel>
+                                                    <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
+                                                            <Run Text="任务状态:"/>
+                                                            <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Red:black}" Text="{Binding TaskState}"/>
+                                                    </TextBlock>
 
                                                 </StackPanel>