ctu
This commit is contained in:
@@ -266,6 +266,11 @@ 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)
|
List<WmsElevatorH> elevatorList = await db.Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
|
||||||
.Where((a, b) => a.enabled == 1)
|
.Where((a, b) => a.enabled == 1)
|
||||||
@@ -301,7 +306,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
.Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) &&
|
.Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) &&
|
||||||
!it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase))
|
!it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
||||||
//it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)
|
//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();
|
||||||
@@ -526,6 +531,30 @@ namespace Tnb.WarehouseMgr
|
|||||||
agvCts.Dispose();
|
agvCts.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 生成CTU任务执行
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
private async Task CTUTaskExecute(SqlSugarClient db)
|
||||||
|
{
|
||||||
|
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<BasLocation>((a, b, c, d) => a.endlocation_id == d.id && d.is_use == "0")
|
||||||
|
.Where(a => a.status != WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID && !string.IsNullOrWhiteSpace(a.startlocation_id))
|
||||||
|
.OrderBy(a => new { priority = SqlFunc.Desc(a.priority), a.bill_code })
|
||||||
|
.Select((a, b, c, d) => new WmsPretaskH
|
||||||
|
{
|
||||||
|
move_num = c.move_num,
|
||||||
|
third_eqp_type = c.third_eqp_type,
|
||||||
|
}, true)
|
||||||
|
.ToListAsync();
|
||||||
|
List<WmsPretaskH> CTUTasks = preTasks
|
||||||
|
.Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) &&
|
||||||
|
!it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase))
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 呼梯操作
|
/// 呼梯操作
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user