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 | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs index 2146ea2..3e818e6 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/AspNetCoreSchedule.cs @@ -1,6 +1,7 @@ 锘縰sing Masuit.Tools; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using WIDESEA_Cache; using WIDESEA_Core.Const; using WIDESEA_DTO.WMS; using WIDESEA_IServices; @@ -17,10 +18,11 @@ private readonly IDt_StationManagerRepository _stationManagerRepository; private readonly ISys_ConfigService _configService; private readonly ILocationInfoRepository _locationRepository; + private readonly ISimpleCacheService _simpleCacheService; private Timer _timer; - public MyBackgroundService(ILogger<MyBackgroundService> logger, ILocationInfoRepository locationRepository, IStockInfoRepository stockInfoRepository, IDt_AreaInfoRepository areaInfoRepository, IDt_TaskRepository taskRepository, IDt_StationManagerRepository stationManagerRepository, ISys_ConfigService configService) + public MyBackgroundService(ILogger<MyBackgroundService> logger, ILocationInfoRepository locationRepository, IStockInfoRepository stockInfoRepository, IDt_AreaInfoRepository areaInfoRepository, IDt_TaskRepository taskRepository, IDt_StationManagerRepository stationManagerRepository, ISys_ConfigService configService, ISimpleCacheService simpleCacheService) { _logger = logger; _locationRepository = locationRepository; @@ -29,11 +31,12 @@ _taskRepository = taskRepository; _stationManagerRepository = stationManagerRepository; _configService = configService; + _simpleCacheService = simpleCacheService; } public Task StartAsync(CancellationToken cancellationToken) { - _timer = new Timer(DoWork, null, 0, 10000); + _timer = new Timer(DoWork, null, TimeSpan.Zero, TimeSpan.FromMinutes(5)); return Task.CompletedTask; } @@ -44,13 +47,22 @@ var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "GWSC1"); 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>() - .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo - .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails - .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢 - .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢 - .OrderBy(x => x.OutboundTime) // 鎺掑簭 - .ToList(); // 鑾峰彇绗竴涓厓绱� + .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) @@ -89,6 +101,7 @@ _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); } } @@ -135,7 +148,7 @@ Creater = "System", // 淇鎷煎啓閿欒 CreateDate = DateTime.Now, TaskId = 0, - ProductionLine= stockInfo.ProductionLine, + ProductionLine = stockInfo.ProductionLine, ProcessCode = stockInfo.ProcessCode, }; } -- Gitblit v1.9.3