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

1.增加电梯的路径判断与平均分配

Browse Source 
2.载具查询异常抛出
3.在线开发的子表使用弹窗时，编辑显示时bug,例如"_point_code_"在dictionary中 不存在
This commit is contained in:
FanLian
2023-07-27 14:30:31 +08:00
parent 1a01ea378e
commit 5cbe089b10
8 changed files with 240 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,6 +554,46 @@ namespace Tnb.WarehouseMgr
{
var roads = await _db.Queryable<WmsRoad>().ToListAsync();
var points = await LocPathCalcAlgorithms(pStartId, pEndId, roads);
if (points.FindAll(x => x.location_code != null && x.location_code.Contains("ELE")).Count > 0)
{//查询当前电梯点
var curElePts = await _db.Queryable<WmsElevatorD>().Where(it => points.Select(x => x.id).Contains(it.point_id)).ToListAsync();
//如果有电梯点，则会进行电梯的均匀分配
if (curElePts.Count > 0)
{
//当前电梯
var curEle = await _db.Queryable<WmsElevatorH>().SingleAsync(it => it.id == curElePts.First().bill_id);
//同电梯组电梯
var sGpEle = await _db.Queryable<WmsElevatorH>().Where(it => it.elevator_group == curEle.elevator_group && it.id != curEle.id).ToListAsync();
//判断电梯组中各电梯任务数
if (sGpEle.FindAll(x => x.task_nums < curEle.task_nums + 1)?.Count > 0)
{
var sGpPts = await _db.Queryable<WmsElevatorD>().Where(it => it.bill_id == sGpEle.First().id).ToListAsync();
if (sGpPts.Count > 0)
{
var sGpPoints = await _db.Queryable<WmsPointH>().Where(it => sGpPts.Select(x => x.point_id).Contains(it.id)).ToListAsync();
var sFEndId = sGpPts.Single(x => x.floor == curElePts.First().floor).point_id;
var eFStartId = sGpPts.Single(x => x.floor == curElePts.Last().floor).point_id;
var sFPoints = await LocPathCalcAlgorithms(pStartId, sFEndId, roads);
List<WmsPointH> elePoints = new();
foreach (var pt in curElePts)
{
var elePoint = sGpPoints.Find(x => x.floor == pt.floor);
if (elePoint != null)
elePoints.Add(elePoint);
}
var eFPoints = await LocPathCalcAlgorithms(eFStartId, pEndId, roads);
elePoints.Remove(elePoints.First());
elePoints.Remove(elePoints.Last());
points.Clear();
points.AddRange(sFPoints);
points.AddRange(elePoints);
points.AddRange(eFPoints);
}
}
}
}
return points;
}