wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Agv电梯流程新增测试日志

Browse Source
This commit is contained in:
yang.lee
2023-11-23 15:51:52 +08:00
parent d92b1fa366
commit 5e92c00df0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -238,14 +238,17 @@ namespace Tnb.WarehouseMgr
List<WmsElevatorH> elevatorList = await db.Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id) List<WmsElevatorH> elevatorList = await db.Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.Select((a, b) => new WmsElevatorH .Select((a, b) => new WmsElevatorH
{ {
bill_id = b.bill_id, bill_id = b.bill_id,
location_id = b.location_id, location_id = b.location_id,
location_code = b.location_code, location_code = b.location_code,
point_id = b.point_id, point_id = b.point_id,
point_code = b.point_code, point_code = b.point_code,
floor = b.floor floor = b.floor
}, true).ToListAsync(); }, true).ToListAsync();
Logger.Information($"elevatorList:{JsonConvert.SerializeObject(elevatorList)}");
//获取所有未下发的预任务申请 //获取所有未下发的预任务申请
List<WmsPretaskH> preTasks = await db.Queryable<WmsPretaskH>().InnerJoin<WmsCarryH>((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id) List<WmsPretaskH> preTasks = await db.Queryable<WmsPretaskH>().InnerJoin<WmsCarryH>((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id)
@@ -370,6 +373,9 @@ namespace Tnb.WarehouseMgr
if (endPointIds?.Count > 0) if (endPointIds?.Count > 0)
{ {
elevatorList = elevatorList.FindAll(x => endPointIds.Contains(x.point_id)); elevatorList = elevatorList.FindAll(x => endPointIds.Contains(x.point_id));
Logger.Information($"过滤后的elevatorList：{JsonConvert.SerializeObject(elevatorList)}");
if (elevatorList?.Count > 0) if (elevatorList?.Count > 0)
{ {
foreach (WmsElevatorH? e in elevatorList) foreach (WmsElevatorH? e in elevatorList)

2
apihost/Tnb.API.Entry/Startup.cs
View File

@@ -57,7 +57,7 @@ public class Startup : AppStartup
//定时任务 //定时任务
services.AddHostedService<TimedTaskBackgroundService>(); services.AddHostedService<TimedTaskBackgroundService>();
services.AddHostedService<RedisBackGround>(); //services.AddHostedService<RedisBackGround>();
} }