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

1

Browse Source
This commit is contained in:
yang.lee
2023-12-15 10:00:19 +08:00
parent 2f92764cbe
commit 6ce793ea5c
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/ElevagorInfoQuery.cs
View File

@@ -10,5 +10,9 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Queries
{ {
public string taskCode { get; set; } public string taskCode { get; set; }
public string endlocation_id { get; set; } public string endlocation_id { get; set; }
public string startlocation_id { get; set; }
public string sourceName { get; set; }
} }
} }

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

@@ -290,27 +290,6 @@ namespace Tnb.WarehouseMgr
SqlSugarClient db = _db.CopyNew(); SqlSugarClient db = _db.CopyNew();
try try
{ {
//一楼中储仓CTU
//CTUTaskExecute(db);
//获取电梯数据
/*List<WmsElevatorH> elevatorList = await db.Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.Where((a, b) => a.enabled == 1)
.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();*/
//获取所有未下发的预任务申请 //获取所有未下发的预任务申请
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)
.InnerJoin<WmsAreaH>((a, b, c) => a.area_id == c.id) .InnerJoin<WmsAreaH>((a, b, c) => a.area_id == c.id)
@@ -332,7 +311,6 @@ namespace Tnb.WarehouseMgr
.ToList(); .ToList();
//it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)
var elePreTasks = preTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); var elePreTasks = preTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList();
var normalPreTasks = preTasks.Where(it =>it.area_code!="B"&& !agvElevatorTasks.Concat(elePreTasks).Select(x => x.endlocation_code).Contains(it.endlocation_code)).ToList(); var normalPreTasks = preTasks.Where(it =>it.area_code!="B"&& !agvElevatorTasks.Concat(elePreTasks).Select(x => x.endlocation_code).Contains(it.endlocation_code)).ToList();