From fac71280bbbda8d7a3b068d1cfaa49ac540eb7ae Mon Sep 17 00:00:00 2001 From: wanshenmean <cathay_xy@163.com> Date: 星期六, 22 三月 2025 11:31:36 +0800 Subject: [PATCH] 移除 Redis缓存 添加 MyBackgroundService 以定期处理库存任务 --- CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs index a707ae0..346fcec 100644 --- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs +++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs @@ -48,13 +48,12 @@ if (area == null) { return; } - 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 = _stockInfoRepository.Db.Queryable<DtStockInfo>() + .IncludesAllFirstLayer() + .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(); // 鑾峰彇绗竴涓厓绱� if (stockInfo.Count <= 0) return; foreach (var item in stockInfo) @@ -67,10 +66,18 @@ } string position = string.Empty; - if (item.LocationInfo.RoadwayNo == "GWSC1") - position = "1059"; - else - position = "1065"; + switch (item.LocationInfo.RoadwayNo) + { + case "GWSC1": + position = "3101"; + break; + case "GWSC2": + position = "3104"; + break; + default: + position = "3107"; + break; + } var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound); task.NextAddress = "002-000-002"; @@ -93,7 +100,6 @@ _taskRepository.AddData(task); // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢� item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable; - _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode }); _locationRepository.UpdateData(item.LocationInfo); } } -- Gitblit v1.9.3