From ce5a60c160b1bd5a534ddf15de121b4902eb4114 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Wed, 7 Jun 2023 10:49:58 +0800
Subject: [PATCH] 1

---
 .../BookingOrder/BookingOrderService.cs       | 122 +++++++++---------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 346b5895..99706e2f 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -392,18 +392,18 @@ namespace Myshipping.Application
                       Sort = config.Sort
                   }).ToList();
 
-            var itconfigs = _goodsStatusConfig.AsQueryable().Select(config => new
-            {
-                bookingid = "",
-                ConfigId = config.Id,
-                SystemCode = config.SystemCode,
-                StatusName = config.StatusName,
-                FinishTime = "",
-                ExtData = "",
-                Remark = "",
-                CreatedUserId = config.CreatedUserId,
-                Sort = config.Sort
-            }).ToList();
+            //var itconfigs = _goodsStatusConfig.AsQueryable().Select(config => new
+            //{
+            //    bookingid = "",
+            //    ConfigId = config.Id,
+            //    SystemCode = config.SystemCode,
+            //    StatusName = config.StatusName,
+            //    FinishTime = "",
+            //    ExtData = "",
+            //    Remark = "",
+            //    CreatedUserId = config.CreatedUserId,
+            //    Sort = config.Sort
+            //}).ToList();
             var statusloglist = _repStatuslog.AsQueryable().Where(x => (x.Status == "提箱" || x.Status == "返场")).ToList();
             var statuslogdetaillist =  _statuslogdetail.AsQueryable().ToList();
             foreach (var item in list.Items)
@@ -475,24 +475,24 @@ namespace Myshipping.Application
                         Sort = x.Sort
                     }).ToList();
 
-                var itconfig = itconfigs.Where(x => x.CreatedUserId == item.CreatedUserId).OrderBy(x => x.Sort).
-                    Select(x => new GoodsStatusList
-                    {
-                        ConfigId = x.ConfigId,
-                        StatusName = x.StatusName,
-                        SystemCode = x.SystemCode,
-                        FinishTime = null,
-                        ExtData = x.ExtData,
-                        Remark = x.Remark,
-                        Sort = x.Sort
-                    }).ToList();
-
-                foreach (var ii in itgoods)
-                {
-                    itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId);
-                }
+                //var itconfig = itconfigs.Where(x => x.CreatedUserId == item.CreatedUserId).OrderBy(x => x.Sort).
+                //    Select(x => new GoodsStatusList
+                //    {
+                //        ConfigId = x.ConfigId,
+                //        StatusName = x.StatusName,
+                //        SystemCode = x.SystemCode,
+                //        FinishTime = null,
+                //        ExtData = x.ExtData,
+                //        Remark = x.Remark,
+                //        Sort = x.Sort
+                //    }).ToList();
+
+                //foreach (var ii in itgoods)
+                //{
+                //    itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId);
+                //}
 
-                item.GoodsStatusList = itgoods.Union<GoodsStatusList>(itconfig).OrderBy(x => x.Sort).ToList();
+                item.GoodsStatusList = itgoods;
                 //获取提箱返场状态
                 var statuslog = statusloglist.Where(x => x.BookingId == item.Id).OrderByDescending(x => x.CreatedTime).ToList();
                 var dto = statuslog.Adapt<List<BookingStatusLogDto>>();
@@ -723,18 +723,18 @@ namespace Myshipping.Application
                       Sort = config.Sort
                   }).ToList();
 
-            var itconfigs = _goodsStatusConfig.AsQueryable().Select(config => new
-            {
-                bookingid = "",
-                ConfigId = config.Id,
-                SystemCode = config.SystemCode,
-                StatusName = config.StatusName,
-                FinishTime = "",
-                ExtData = "",
-                Remark = "",
-                CreatedUserId = config.CreatedUserId,
-                Sort = config.Sort
-            }).ToList();
+            //var itconfigs = _goodsStatusConfig.AsQueryable().Select(config => new
+            //{
+            //    bookingid = "",
+            //    ConfigId = config.Id,
+            //    SystemCode = config.SystemCode,
+            //    StatusName = config.StatusName,
+            //    FinishTime = "",
+            //    ExtData = "",
+            //    Remark = "",
+            //    CreatedUserId = config.CreatedUserId,
+            //    Sort = config.Sort
+            //}).ToList();
             var statusloglist = _repStatuslog.AsQueryable().Where(x=> (x.Status == "提箱" || x.Status == "返场")).ToList();
             var statuslogdetaillist =  _statuslogdetail.AsQueryable().ToList();
             foreach (var item in list.Items)
@@ -806,24 +806,24 @@ namespace Myshipping.Application
                         Sort = x.Sort
                     }).ToList();
 
-                var itconfig = itconfigs.Where(x => x.CreatedUserId == item.CreatedUserId).OrderBy(x => x.Sort).
-                    Select(x => new GoodsStatusList
-                    {
-                        ConfigId = x.ConfigId,
-                        StatusName = x.StatusName,
-                        SystemCode = x.SystemCode,
-                        FinishTime = null,
-                        ExtData = x.ExtData,
-                        Remark = x.Remark,
-                        Sort = x.Sort
-                    }).ToList();
-
-                foreach (var ii in itgoods)
-                {
-                    itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId);
-                }
+                //var itconfig = itconfigs.Where(x => x.CreatedUserId == item.CreatedUserId).OrderBy(x => x.Sort).
+                //    Select(x => new GoodsStatusList
+                //    {
+                //        ConfigId = x.ConfigId,
+                //        StatusName = x.StatusName,
+                //        SystemCode = x.SystemCode,
+                //        FinishTime = null,
+                //        ExtData = x.ExtData,
+                //        Remark = x.Remark,
+                //        Sort = x.Sort
+                //    }).ToList();
+
+                //foreach (var ii in itgoods)
+                //{
+                //    itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId);
+                //}
 
-                item.GoodsStatusList = itgoods.Union<GoodsStatusList>(itconfig).OrderBy(x => x.Sort).ToList();
+                item.GoodsStatusList = itgoods;
                 //获取提箱返场状态
                 var statuslog = statusloglist.Where(x => x.BookingId == item.Id).OrderByDescending(x => x.CreatedTime).ToList();
                 var dto = statuslog.Adapt<List<BookingStatusLogDto>>();
@@ -2206,7 +2206,11 @@ namespace Myshipping.Application
                 throw Oops.Bah(html.Message);
             }
         }
-
+        /// <summary>
+        /// 即时刷新运踪
+        /// </summary>
+        /// <param name="Ids"></param>
+        /// <returns></returns>
         [HttpPost("/BookingOrder/RefreshBillTrace")]
         public async Task RefreshBillTrace(string Ids) {