From 5e92c00df038d17cad8fb1ad3355750739b75edf Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Thu, 23 Nov 2023 15:51:52 +0800 Subject: [PATCH] =?UTF-8?q?Agv=E7=94=B5=E6=A2=AF=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 6 ++++++ apihost/Tnb.API.Entry/Startup.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 90e37cb1..88a86f13 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -238,14 +238,17 @@ namespace Tnb.WarehouseMgr List elevatorList = await db.Queryable().InnerJoin((a, b) => a.id == b.bill_id) .Select((a, b) => new WmsElevatorH { + bill_id = b.bill_id, location_id = b.location_id, location_code = b.location_code, point_id = b.point_id, point_code = b.point_code, floor = b.floor + }, true).ToListAsync(); + Logger.Information($"elevatorList:{JsonConvert.SerializeObject(elevatorList)}"); //获取所有未下发的预任务申请 List preTasks = await db.Queryable().InnerJoin((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id) @@ -370,6 +373,9 @@ namespace Tnb.WarehouseMgr if (endPointIds?.Count > 0) { elevatorList = elevatorList.FindAll(x => endPointIds.Contains(x.point_id)); + + Logger.Information($"过滤后的elevatorList:{JsonConvert.SerializeObject(elevatorList)}"); + if (elevatorList?.Count > 0) { foreach (WmsElevatorH? e in elevatorList) diff --git a/apihost/Tnb.API.Entry/Startup.cs b/apihost/Tnb.API.Entry/Startup.cs index 3dbfefd2..1efe0fb4 100644 --- a/apihost/Tnb.API.Entry/Startup.cs +++ b/apihost/Tnb.API.Entry/Startup.cs @@ -57,7 +57,7 @@ public class Startup : AppStartup //定时任务 services.AddHostedService(); - services.AddHostedService(); + //services.AddHostedService(); }