From 08d4252c79d088d7bf97a08d314ec8577d96e2d2 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 14 六月 2025 19:57:47 +0800
Subject: [PATCH] 火警

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs
index a707ae0..3e818e6 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs
@@ -48,13 +48,21 @@
 
                 if (area == null) { return; }
 
-                IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
-                List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+                //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+                //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
 
-                var stockInfo = stockInfoList.Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
-                     .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
-                     .OrderBy(x => x.OutboundTime) // 鎺掑簭
-                     .ToList(); // 鑾峰彇绗竴涓厓绱�
+                //var stockInfo = stockInfoList.Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+                //     .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+                //     .OrderBy(x => x.OutboundTime) // 鎺掑簭
+                //     .ToList(); // 鑾峰彇绗竴涓厓绱�
+                var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
+                    .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true)
+                    .Includes(x => x.LocationInfo)
+                    .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+                    .Includes(x => x.StockInfoDetails)
+                    .OrderBy(x => x.OutboundTime) // 鎺掑簭
+                    .ToList(); // 鑾峰彇绗竴涓厓绱�
+
 
                 if (stockInfo.Count <= 0) return;
                 foreach (var item in stockInfo)
@@ -93,7 +101,7 @@
                         _taskRepository.AddData(task);
                         // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
                         item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
-                        _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode });
+                        //_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode });
                         _locationRepository.UpdateData(item.LocationInfo);
                     }
                 }

--
Gitblit v1.9.3