From 5263874f6bfe171e1f2cb56baee5411f04a15369 Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Tue, 12 Dec 2023 15:23:29 +0800 Subject: [PATCH] ctu --- .../Tnb.WarehouseMgr/WareHouseService.cs | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index dbbe073b..e8099a6e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -266,6 +266,11 @@ namespace Tnb.WarehouseMgr SqlSugarClient db = _db.CopyNew(); try { + //一楼中储仓CTU + CTUTaskExecute(db); + + + //获取电梯数据 List elevatorList = await db.Queryable().InnerJoin((a, b) => a.id == b.bill_id) .Where((a, b) => a.enabled == 1) @@ -301,7 +306,7 @@ namespace Tnb.WarehouseMgr .Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) && !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)) .ToList(); - + //it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase) var elePreTasks = preTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); @@ -526,6 +531,30 @@ namespace Tnb.WarehouseMgr agvCts.Dispose(); } } + /// + /// 生成CTU任务执行 + /// + /// + private async Task CTUTaskExecute(SqlSugarClient db) + { + List preTasks = await db.Queryable() + .InnerJoin((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id) + .InnerJoin((a, b, c) => a.area_id == c.id) + .InnerJoin((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 CTUTasks = preTasks + .Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) && + !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)) + .ToList(); + } + /// /// 呼梯操作 ///