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

电梯调整等

Browse Source
This commit is contained in:
马健
2024-09-06 11:06:01 +08:00
parent 27536bfd7c
commit be75d77d3e
10 changed files with 175 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1484,17 +1484,17 @@ namespace Tnb.WarehouseMgr
#region 电梯第三次改动
// 到暂存区的未完成任务
List<WmsDistaskH> wmsdistasks_agvElevator = await _db.Queryable<WmsDistaskH>()
List<WmsDistaskH> wmsdistasks_agvElevator = await db.Queryable<WmsDistaskH>()
.InnerJoin<BasLocation>((a, b) => a.endlocation_id == b.id)
.Where((a, b) => a.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID && a.status != WmsWareHouseConst.TASK_BILL_STATUS_CANCEL_ID
&& b.region_id == WmsWareHouseConst.REGION_CPOutstockCache_ID)
.ToListAsync();
// 到暂存区的未完成预任务
List<WmsPretaskH> wmspretasks_agvElevator = await _db.Queryable<WmsPretaskH>()
List<WmsPretaskH> wmspretasks_agvElevator = await db.Queryable<WmsPretaskH>()
.InnerJoin<BasLocation>((a, b) => a.endlocation_id == b.id)
.InnerJoin<WmsAreaH>((a, b, c) => a.area_id == c.id)
.Where((a, b) => a.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID && a.status != WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID
&& b.region_id == WmsWareHouseConst.REGION_CPOutstockCache_ID)
&& b.region_id == WmsWareHouseConst.REGION_CPOutstockCache_ID && b.is_use == "0")
.Select((a, b, c) => new WmsPretaskH
{
move_num = c.move_num,
@@ -1512,7 +1512,6 @@ namespace Tnb.WarehouseMgr
normalPreTasks = normalPreTasks.Concat(cacheLocTasks).ToList();
#endregion
if (s_elevatortaskWCSRequestDic.Count > 0)
{
for (int index_agvElevatorTasks = 0; index_agvElevatorTasks < agvElevatorTasks.Count; index_agvElevatorTasks++)
@@ -1551,6 +1550,9 @@ namespace Tnb.WarehouseMgr
preTasks = normalPreTasks.Concat(agvElevatorTasks).Concat(elePreTasks).ToList();
if (preTasks.Count() == 0)
return;
//一楼中储仓CTU
@@ -2374,6 +2376,12 @@ namespace Tnb.WarehouseMgr
Logger.Information($"通知WCS电梯{devName}下行接口调用成功");
}
List<WmsCarryH> carryHs = await db.Queryable<WmsCarryH>().Where(r => disTasks.Select(r => r.carry_id).Contains(r.id)).ToListAsync();
carryHs.ForEach(r => {
r.location_id = disTask.endlocation_id;
r.location_code = disTask.endlocation_code;
});
await db.Updateable(carryHs).ExecuteCommandAsync();
#region 电梯第三次改动
// 一托下的时候切换首选电梯
@@ -3229,7 +3237,7 @@ namespace Tnb.WarehouseMgr
BasLocation endlocation = await _db.Queryable<BasLocation>().InnerJoin<WmsPointH>((a, b) => a.id == b.location_id).Where((a, b) => b.id == pEndId).FirstAsync();
// 后续可整理成配置表
#region 第二次改动弃用
#region 电梯第三次次改动弃用
//if (startlocation.wh_id == WmsWareHouseConst.WAREHOUSE_CP_ID && endlocation.wh_id == WmsWareHouseConst.WAREHOUSE_CPCRK_ID)
//{
// WmsElevatorH wmsElevatorH = await _db.Queryable<WmsElevatorH>().Where(it => it.elevator_group == "2" && it.enabled == 1).OrderBy(r => r.task_nums).FirstAsync();