From a5fec958ef86371826ed4eb947ea0ebd476cd0ed Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期五, 04 七月 2025 15:10:37 +0800 Subject: [PATCH] 修复方法声明并重构命令发送逻辑在 ITaskService.cs中QueryExecutingConveyorLineTask方法的声明末尾添加了分号。注释掉了多处 conveyorLine.SendCommand的调用,并替换为 SendCommand方法,确保在发送命令时设置了必要的值。 在 RequestInbound.cs中,进行了类似的重构,更新了任务状态。 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs index a60279f..2d7637b 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs @@ -1,4 +1,5 @@ -锘縰sing SqlSugar; +锘縰sing Masuit.Tools; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -98,7 +99,11 @@ } visitedRoutes.Add(routeKey); - List<Dt_Router> dt_Routers = BaseDal.QueryData(x => x.NextPosi == endPosi || x.ChildPosi == endPosi, new Dictionary<string, OrderByType> { { nameof(Dt_Router.IsEnd), OrderByType.Desc } }); + List<Dt_Router> dt_Routers = BaseDal.QueryData(x => (x.NextPosi == endPosi || x.ChildPosi == endPosi) && x.StartPosi == startPosi, new Dictionary<string, OrderByType> { { nameof(Dt_Router.IsEnd), OrderByType.Desc } }); + if (dt_Routers.IsNullOrEmpty()) + { + dt_Routers = BaseDal.QueryData(x => x.NextPosi == endPosi || x.ChildPosi == endPosi, new Dictionary<string, OrderByType> { { nameof(Dt_Router.IsEnd), OrderByType.Desc } }); + } if (dt_Routers.Count > 0) { foreach (var item in dt_Routers) @@ -264,7 +269,7 @@ { if (routerType == (int)RouterInOutType.Out) router.ChildPosi = routersAddDTOs[i + 1].ChildPositionCode; - router.IsEnd = true; + router.IsEnd = true; } routers.Add(router); } -- Gitblit v1.9.3