10172

BBWY.Client/App.xaml.cs

@@ -50,10 +50,13 @@ namespace BBWY.Client
 
 #if DEBUG
             //仓库组测试
-            // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
+             userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
+
+            //齐越梧桐
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE";
 
             //齐越山鸡
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";

BBWY.Client/BBWYAppSettings.json

@@ -5,5 +5,5 @@
   "JOSApiHost": "",
   "1688ApiHost": "",
   "QKApiHost": "http://localhost:8080"
-  // "QKApiHost": "http://qiku.qiyue666.com"
+  //"QKApiHost": "http://qiku.qiyue666.com"
 }

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10171";
+            ClientVersion = "10172";
         }
 
         private User user;

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -428,11 +428,14 @@ namespace BBWY.Client.Models
         /// </summary>
         public string ScheduleOverTimeMarkMsg { get; set; }
 
-
         /// <summary>
         /// 物流信息
         /// </summary>
-        public List<ExpressOrderResponse> ExpressOrderList { get; set; }
+        private List<ExpressOrderResponse> expressOrderList;
+        /// <summary>
+        /// 物流信息
+        /// </summary>
+        public List<ExpressOrderResponse> ExpressOrderList { get => expressOrderList; set { Set(ref expressOrderList, value); } }
 
         /// <summary>
         /// 需求方店铺id

BBWY.Client/ViewModels/MainViewModel.cs

@@ -123,7 +123,7 @@ namespace BBWY.Client.ViewModels
         /// </summary>
         private void CreateMenu()
         {
-            if (this.packDepartment.Contains(GlobalContext.User.TeamName))
+            if (this.packDepartment.Contains(GlobalContext.User.TeamName) || packDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
             {
 
                 App.Current.Dispatcher.Invoke(() =>
@@ -277,10 +277,8 @@ namespace BBWY.Client.ViewModels
 
                 CreateMenu();
 
-
-
                 IList<Department> departmentList = null;
-                if (GlobalContext.User.TeamName == "刷单组" || this.packDepartment.Contains(GlobalContext.User.TeamName) ||
+                if (GlobalContext.User.TeamName == "刷单组" || this.packDepartment.Contains(GlobalContext.User.TeamName) || packDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)) ||
                     managerDepartment.Contains(GlobalContext.User.TeamName) ||
                     managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
                 {

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -23,6 +23,8 @@ using BBWY.Client.Views.TaskOverTime;
 using BBWY.Client.Views.StorePickSelf;
 using System.Diagnostics.Eventing.Reader;
 using BBWY.Client.Models.SealBox;
+using Newtonsoft.Json;
+using System.Diagnostics;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -675,11 +677,11 @@ namespace BBWY.Client.ViewModels.PackTask
             }
         }
 
-        private void LoadSealBoxSkuData( SealBoxModel model)
+        private void LoadSealBoxSkuData(SealBoxModel model)
         {
             if (model.SealBoxSkus == null || model.SealBoxSkus.Count <= 0)
             {
-                var skuDatas =SealBoxModelList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId);
+                var skuDatas = SealBoxModelList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId);
                 WaitSealBoxModels.SingleOrDefault(w => w.SealBoxId == model.SealBoxId).SealBoxSkus = skuDatas.SealBoxSkus;
             }
             else
@@ -692,9 +694,9 @@ namespace BBWY.Client.ViewModels.PackTask
         private void LoadSkuData(WareNoSealBoxModel model)
         {
 
-            if (model.SealBoxSkus==null|| model.SealBoxSkus.Count<=0)
+            if (model.SealBoxSkus == null || model.SealBoxSkus.Count <= 0)
             {
-              var skuDatas =WaitSealBoxModelList.SingleOrDefault(w => w.ShopId == model.ShopId);
+                var skuDatas = WaitSealBoxModelList.SingleOrDefault(w => w.ShopId == model.ShopId);
                 WareNoSealBoxModels.SingleOrDefault(w => w.ShopId == model.ShopId).SealBoxSkus = skuDatas.SealBoxSkus;
             }
             else
@@ -947,9 +949,10 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
             }
 
-            StorePickProductWindow sorePickProductWindow = new StorePickProductWindow(data.Data, (count, UserName) => {
+            StorePickProductWindow sorePickProductWindow = new StorePickProductWindow(data.Data, (count, UserName) =>
+            {
 
-                var res = packTaskService.StoreGetBySelfV2(taskId,count,UserName);
+                var res = packTaskService.StoreGetBySelfV2(taskId, count, UserName);
                 if (res == null)
                 {
                     return false;
@@ -992,7 +995,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
             JDWareBoxModel model = new JDWareBoxModel
             {
-                ShopName = globalContext.User.Shop.ShopName,
+                ShopName = fallware.ShopName,
                 WareName = fallware.WareName,
                 SealBoxId = fallware.SealBoxId,
                 ProductCount = fallware.ProductCount,
@@ -1013,7 +1016,14 @@ namespace BBWY.Client.ViewModels.PackTask
 
         private void LookBoxConfigure(object obj)
         {
-            var fallware = obj as WaitFallWareModel;
+            var fallware = obj as WaitFallWareModel;//WaitFallWareModel
+            if (fallware == null)
+            {
+                MessageBox.Show($"数据异常, {JsonConvert.SerializeObject(obj)}");
+                return;
+            }
+
+
             JDWareBoxModel model = new JDWareBoxModel
             {
                 ShopName = globalContext.User.Shop.ShopName,
@@ -1374,6 +1384,10 @@ namespace BBWY.Client.ViewModels.PackTask
             }
             Task.Factory.StartNew(() =>
             {
+
+
+                Stopwatch stopwatch = new Stopwatch();
+                stopwatch.Start();
                 if (TaskState == Models.TaskState.待出库)
                 {
                     WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
@@ -1510,7 +1524,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                 {
                                     AcceptUserNames = string.Join("|", item.AcceptUserNames),
                                     DepartmentName = item.DepartmentName,
-                                    SealBoxSkus =null,
+                                    SealBoxSkus = null,
                                     ShopId = item.ShopId,
                                     ShopName = item.ShopName,
                                     WareId = item.WareId,
@@ -1631,7 +1645,8 @@ namespace BBWY.Client.ViewModels.PackTask
 
                             foreach (var item in WaitSealBoxModelList)
                             {
-                                App.Current.Dispatcher.Invoke(new Action(() => { 
+                                App.Current.Dispatcher.Invoke(new Action(() =>
+                                {
                                     WareNoSealBoxModels.Add(new WareNoSealBoxModel
                                     {
                                         AcceptUserName = string.Join("|", item.AcceptUserNames),
@@ -1685,8 +1700,17 @@ namespace BBWY.Client.ViewModels.PackTask
                 {
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
+
                     var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, SearchSpuId, SearchOrderSn, this.TaskState, SearchShopName,
                         PageIndex, PageSize, SearchSkuTitle, SearchSpuTitle);
+
+
+                    stopwatch.Stop();
+                    App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        Debug.WriteLine($"查询接口耗时:{stopwatch.ElapsedMilliseconds}毫秒");
+                    }));
+                    stopwatch.Restart();
                     if (datas != null && datas.Data != null && datas.Success)
                     {
                         var dataModel = datas.Data;
@@ -1733,26 +1757,6 @@ namespace BBWY.Client.ViewModels.PackTask
                                 SendToSetSkuConfigureTime = item.SendToSetSkuConfigureTime,
 
                             };
-
-                            if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())
-                            {
-                                var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
-                                if (expressData != null && expressData.Success && expressData.Data != null)
-                                {
-                                    expressData.Data.ForEach(e =>
-                                    {
-                                        e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
-
-
-                                    });
-
-                                    data.ExpressOrderList = expressData.Data;
-
-
-
-                                }
-                            }
-
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                             {
 
@@ -1795,12 +1799,10 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
                         }
-
                         if (TaskState == Models.TaskState.待验收)
                         {
                             qualityOverTimeThread = new Thread(() =>
                             {
-
                                 var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待验收 && p.QualityCompletionOverTime != null).ToList();
                                 if (packtasks.Count() > 0)
                                 {
@@ -1885,8 +1887,6 @@ namespace BBWY.Client.ViewModels.PackTask
 
                             }
                         }
-
-
                         if (TaskState == Models.TaskState.待排单)
                         {
                             var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待排单 && p.ScheduleOverTime != null).ToList();
@@ -1926,10 +1926,41 @@ namespace BBWY.Client.ViewModels.PackTask
 
                             }
                         }
+                        //任务状态为待打包
 
 
-                        //任务状态为待打包
 
+                        Task.Factory.StartNew(() => {
+                            foreach (var item in PackTaskList)
+                            {
+                                if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())
+                                {
+                                    var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
+                                    if (expressData != null && expressData.Success && expressData.Data != null)
+                                    {
+                                      
+                                        App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                                        {
+                                            expressData.Data.ForEach(e =>
+                                            {
+                                                e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
+
+
+                                            });
+                                            item.ExpressOrderList = expressData.Data;
+                                        }));
+                                       
+
+
+
+                                    }
+                                }
+                            }
+                           
+
+
+
+                        });
                     }
                     else
                     {
@@ -1944,9 +1975,14 @@ namespace BBWY.Client.ViewModels.PackTask
                 });
 
                 IsLoading = false;
+                stopwatch.Stop();
+                App.Current.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    Debug.WriteLine($"查询耗时:{stopwatch.ElapsedMilliseconds}毫秒");
+                }));
 
-            });
                
+            });
         }