From ab9608aec2b6ddf50ce91b730bc41d3ac4cf921a Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 10 Oct 2023 13:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AE=9A=E6=97=B6=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8F=91=E5=B8=83=E8=AE=A2=E9=98=85=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=98=E6=97=B6=E9=97=B4=E8=BD=AE=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElevatorControlService.cs | 8 +-- .../TimedTaskBackgroundService.cs | 54 ++++++++++--------- .../Tnb.WarehouseMgr/WareHouseService.cs | 21 ++++---- .../Tnb.WarehouseMgr/WmsDeliveryService.cs | 5 ++ apihost/Tnb.API.Entry/Startup.cs | 2 +- system/Tnb.OAuth/OAuthService.cs | 8 +-- 6 files changed, 54 insertions(+), 44 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs index 596a0a7a..81cde8fb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs @@ -275,19 +275,19 @@ namespace Tnb.WarehouseMgr var pars = new Dictionary(); pars["DevName"] = devName; pars["Pos"] = "1"; - pars["Count"] = "4"; + pars["Count"] = "11"; pars["token"] = _elevatorCtlCfg.token; var url = _elevatorCtlCfg.GetTagListUrl; var systemInfo = await HttpClientHelper.GetAsync(url, pars: pars); var jo = JObject.Parse(systemInfo); var objs = jo["Items"].Values().ToList(); - if (objs?.Count == 4) + //if (objs?.Count == 4) { if (objs[0].Value("Name").Equals("SysStatus") && objs[1].Value("Name").Equals("RunStatus") && objs[3].Value("Name").Equals("FloorNo")) { - multi = (objs[0].Value("V"), objs[1].Value("V"), objs[3].Value("V"), objs[2].Value("V"), objs[10].Value("V")); + multi = (objs[0].Value("V"), objs[1].Value("V"), objs[3].Value("V"), objs[2].Value("V"), objs[9].Value("V")); } } return multi; @@ -334,7 +334,7 @@ namespace Tnb.WarehouseMgr await SendOpenCloseCmd(devName, (int)EnumAgvControl.前门关门); } var result = await WriteTagAsync(devName, ElevatorConsts.FloorExecute, floor); //呼叫电梯到4楼 - if (!result.IsNullOrEmpty()) + if (!string.IsNullOrEmpty(result)) { JObject jo = JObject.Parse(result); isSuccefuly = jo?.Value("Result").Equals("Ok", StringComparison.OrdinalIgnoreCase) ?? false; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs b/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs index 49555047..195cae49 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs @@ -46,13 +46,13 @@ namespace Tnb.WarehouseMgr private static Dictionary> _timedFuncMap = new(StringComparer.OrdinalIgnoreCase); static TimedTaskBackgroundService() { - Task.Run(() => - { - _timedFuncMap = App.EffectiveTypes.AsParallel().Where(t => !t.Namespace.IsNullOrWhiteSpace() && t.Namespace.Equals("Tnb.WarehouseMgr", StringComparison.OrdinalIgnoreCase)).SelectMany(t => t.GetMethods()) - .Where(m => m.GetCustomAttribute() != null) - .ToDictionary(x => x.Name, x => - (Func)Delegate.CreateDelegate(typeof(Func), App.GetService(x.DeclaringType), x)); - }); + //Task.Run(() => + //{ + // _timedFuncMap = App.EffectiveTypes.AsParallel().Where(t => !t.Namespace.IsNullOrWhiteSpace() && t.Namespace.Equals("Tnb.WarehouseMgr", StringComparison.OrdinalIgnoreCase)).SelectMany(t => t.GetMethods()) + // .Where(m => m.GetCustomAttribute() != null) + // .ToDictionary(x => x.Name, x => + // (Func)Delegate.CreateDelegate(typeof(Func), App.GetService(x.DeclaringType), x)); + //}); } public TimedTaskBackgroundService(IServiceProvider serviceProvider) { @@ -62,42 +62,44 @@ namespace Tnb.WarehouseMgr protected override Task ExecuteAsync(CancellationToken stoppingToken) { IsStarted = true; - var queueTask = Task.Run(async () => - { + //var queueTask = Task.Run(async () => + // { - var channelReader = _serviceProvider.GetRequiredService().Reader; + // var channelReader = _serviceProvider.GetRequiredService().Reader; - CancellationTokenSource? cts = new(); + // CancellationTokenSource? cts = new(); - while (channelReader != null && await channelReader.WaitToReadAsync()) - { - while (channelReader.TryRead(out var message)) - { - if (_timedFuncMap.ContainsKey(message.TaskName)) - { - await _timedFuncMap[message.TaskName].Invoke(stoppingToken); - } - } - } - }, stoppingToken); + // while (channelReader != null && await channelReader.WaitToReadAsync()) + // { + // while (channelReader.TryRead(out var message)) + // { + // if (_timedFuncMap.ContainsKey(message.TaskName)) + // { + // await _timedFuncMap[message.TaskName].Invoke(stoppingToken); + // } + // } + // } + // }, stoppingToken); var timedTask = Task.Run(() => { _eventPublisher = App.GetRequiredService(); + var whSvc = App.GetRequiredService(); + TimedTask(token => whSvc.GenTaskExecute(token), stoppingToken, 3); //齐套出库 var kittingOutService = App.GetRequiredService(); - TimedTask(token => kittingOutService.KittingOutByAdd(token), stoppingToken, 1); - TimedTask(token => kittingOutService.KittingOutByIsToBeShipped(token), stoppingToken, 1); + TimedTask(token => kittingOutService.KittingOutByAdd(token), stoppingToken, 3); + TimedTask(token => kittingOutService.KittingOutByIsToBeShipped(token), stoppingToken, 3); //齐套分拣 var setSortingService = App.GetRequiredService(); - TimedTask(token => setSortingService.PackSortingByAdd(token), stoppingToken, 1); + TimedTask(token => setSortingService.PackSortingByAdd(token), stoppingToken, 3); //最低库存检查 var transferSignService = App.GetRequiredService(); TimedTask(token => transferSignService.IsMinStorage(token), stoppingToken, 30, TimeSpanUnit.Minutes); }, stoppingToken); - return Task.WhenAll(queueTask, timedTask); + return timedTask; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 9b62c128..6ff7bf66 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -17,6 +17,7 @@ using JNPF.Systems.Interfaces.System; using Mapster; using Microsoft.AspNetCore.Mvc; using Microsoft.CodeAnalysis; +using Microsoft.Extensions.Configuration; using Newtonsoft.Json; //using NPOI.SS.Formula.Functions; using SqlSugar; @@ -47,6 +48,7 @@ namespace Tnb.WarehouseMgr private readonly ICacheManager _cacheManager; private readonly IElevatorControlService _elevatorControlService; private static Dictionary _elevatorMap = new Dictionary(); + private readonly ElevatorControlConfiguration _eleCtlCfg = App.Configuration.Build(); public Func AddUnExecuteTask { get; set; } public WareHouseService(ISqlSugarRepository repository, IDictionaryDataService dictionaryDataService, @@ -224,10 +226,10 @@ namespace Tnb.WarehouseMgr var db = _db.CopyNew(); try { - if (_elevatorMap.Count < 1) - { - _elevatorMap = await _db.Queryable().ToDictionaryAsync(x => x.elevator_id, x => x.elevator_code); - } + //if (_elevatorMap.Count < 1) + //{ + // _elevatorMap = await _db.Queryable().ToDictionaryAsync(x => x.elevator_id, x => x.elevator_code); + //} //获取所有未下发的预任务申请 var preTasks = await db.Queryable().InnerJoin((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id) .InnerJoin((a, b, c) => a.area_id == c.id) @@ -385,9 +387,9 @@ namespace Tnb.WarehouseMgr try { var item = endLocCodes.FirstOrDefault(); - if (_elevatorMap.ContainsKey(item.device_id)) + //if (_elevatorMap.ContainsKey(item.device_id)) + var devName = _eleCtlCfg.DevName; { - var devName = _elevatorMap[item.device_id].ToString(); var agvStatus = await _elevatorControlService.GetTagAsync(devName, ElevatorConsts.AGVControl); //判断当前设备是否为运行状态，不是则进入Agv电梯控制状态 if (agvStatus.ToEnum() != EnumAgvStatus.AGV运行状态) @@ -403,16 +405,15 @@ namespace Tnb.WarehouseMgr { distask_id = disTaskId, elevator_id = devId, - elevator_code = _elevatorMap[devId].ToString(), + elevator_code = devName, floor = floorN, //5代表4楼 task_status = "待执行", create_id = _userManager.UserId, create_time = DateTime.Now }; var elevatorQueue = await _db.Queryable().Where(it => it.elevator_id == devId && it.task_status == "执行中").ToListAsync(); - if (_elevatorMap.ContainsKey(devId) && (elevatorQueue.IsNull() || elevatorQueue.Count < 1)) + if ((elevatorQueue.IsNull() || elevatorQueue.Count < 1)) { - var devName = _elevatorMap[devId].ToString(); elevatorQueueItem.task_status = "执行中"; await _elevatorControlService.CallLift(devName, 5, CancellationToken.None); @@ -485,6 +486,8 @@ namespace Tnb.WarehouseMgr tuple = await _elevatorControlService.GetElevatorStatus(elevatorQueueItem.elevator_code, CancellationToken.None); } while (tuple.sysStatus != 3 && tuple.runStatus != 0 && tuple.floorNo != disTask.end_floor.ParseToInt()); + Log.Information($"sysStatus:{tuple.sysStatus},runStatus:{tuple.runStatus},floorNo:{tuple.floorNo}"); + if (tuple.sysStatus.ToEnum() == EnumSysStatus.正常状态 && tuple.runStatus.ToEnum() == EnumRunStatus.停梯 && tuple.floorNo == disTask.end_floor.ParseToInt()) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs index 919a7bdb..1fd4f283 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs @@ -12,6 +12,7 @@ using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; +using JNPF.Logging; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; @@ -135,10 +136,14 @@ namespace Tnb.WarehouseMgr var sPoint = it.FirstOrDefault(); var ePoint = it.LastOrDefault(); + Log.Information("ePoint?.point_code="+ ePoint?.point_code); + WmsPretaskH preTask = new(); preTask.org_id = _userManager.User.OrganizeId; preTask.startlocation_id = sPoint?.location_id!; preTask.startlocation_code = sPoint?.location_code!; + preTask.startpoint_code = sPoint?.point_code; + preTask.endpoint_code = ePoint?.point_code; preTask.endlocation_id = ePoint?.location_id!; preTask.endlocation_code = ePoint?.location_code!; preTask.start_floor = sPoint?.floor.ToString(); diff --git a/apihost/Tnb.API.Entry/Startup.cs b/apihost/Tnb.API.Entry/Startup.cs index d595c879..c8f1231f 100644 --- a/apihost/Tnb.API.Entry/Startup.cs +++ b/apihost/Tnb.API.Entry/Startup.cs @@ -68,7 +68,7 @@ public class Startup : AppStartup //定时任务 services.AddHostedService(); //Agv心跳监听服务 - services.AddAgvHeartbeatMonitor(); + services.AddHostedService(); //services.AddHostedService(); } diff --git a/system/Tnb.OAuth/OAuthService.cs b/system/Tnb.OAuth/OAuthService.cs index 6438b0e2..23a2ca7f 100644 --- a/system/Tnb.OAuth/OAuthService.cs +++ b/system/Tnb.OAuth/OAuthService.cs @@ -294,7 +294,7 @@ public class OAuthService : IDynamicApiController, ITransient var userId = _userManager.UserId; //modify by ly on 20230918 登录成功后启动定时服务 - if (!userId.IsNullOrWhiteSpace()) + /*if (!userId.IsNullOrWhiteSpace()) { if (!_fetchPropValue.TryGetValue("IsStarted", out var action)) @@ -317,7 +317,7 @@ public class OAuthService : IDynamicApiController, ITransient { } } - } + }*/ var loginOutput = new CurrentUserOutput(); loginOutput.userInfo = await _userManager.GetUserInfo(); @@ -419,10 +419,10 @@ public class OAuthService : IDynamicApiController, ITransient public async Task Logout([FromQuery] string ticket) { //modify by ly on 20230918 - stopTimedTaskSvcCTS ??= new(); +/* stopTimedTaskSvcCTS ??= new(); await _backgroundService.StopAsync(stopTimedTaskSvcCTS.Token); stopTimedTaskSvcCTS.Cancel(); - //stopTimedTaskSvcCTS.Dispose(); +*/ //stopTimedTaskSvcCTS.Dispose(); UserManager.AsscessToken = string.Empty;