1、下发任务时起点或终点为空时不执行任务
2、增加四向车指定出库位置的功能
This commit is contained in:
parent
3abbe9a470
commit
9a391e47a3
|
|
@ -81,11 +81,12 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 执行入库任务
|
/// 执行入库任务 --- AGV搬运
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="wmsTask"></param>
|
/// <param name="wmsTask"></param>
|
||||||
private void ExecuteInTask(AppWmsTask wmsTask)
|
private void ExecuteInTask(AppWmsTask wmsTask)
|
||||||
{
|
{
|
||||||
|
if (string.IsNullOrEmpty(wmsTask.Origin)) return;
|
||||||
string? midPoint = GetEmptyInLift(wmsTask.Destination);
|
string? midPoint = GetEmptyInLift(wmsTask.Destination);
|
||||||
if (string.IsNullOrEmpty(midPoint)) return; // 没有可用的站台
|
if (string.IsNullOrEmpty(midPoint)) return; // 没有可用的站台
|
||||||
/* 发送AGV 搬运任务 */
|
/* 发送AGV 搬运任务 */
|
||||||
|
|
@ -108,7 +109,11 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta
|
||||||
/// <param name="wmsTask"></param>
|
/// <param name="wmsTask"></param>
|
||||||
private void ExecuteOutTask(AppWmsTask wmsTask)
|
private void ExecuteOutTask(AppWmsTask wmsTask)
|
||||||
{
|
{
|
||||||
string? midPoint = GetEmptyOutLift(wmsTask.Origin);
|
string? midPoint = wmsTask.MidPoint;
|
||||||
|
if(string.IsNullOrEmpty(midPoint))
|
||||||
|
{
|
||||||
|
midPoint = GetEmptyOutLift(wmsTask.Origin);
|
||||||
|
}
|
||||||
if (string.IsNullOrEmpty(midPoint)) return; // 没有可用站台
|
if (string.IsNullOrEmpty(midPoint)) return; // 没有可用站台
|
||||||
/* 发送四向车搬运任务 */
|
/* 发送四向车搬运任务 */
|
||||||
string? errText = containerAction.ExecuteOutTask(wmsTask.WcsId, wmsTask.Origin, midPoint, wmsTask.VehicleNo);
|
string? errText = containerAction.ExecuteOutTask(wmsTask.WcsId, wmsTask.Origin, midPoint, wmsTask.VehicleNo);
|
||||||
|
|
@ -164,6 +169,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta
|
||||||
List<AppWmsTask>? tasks = wmsTaskDao.Select(new() { VehicleNo = code, TaskStatus = (int)WmsTaskStatusEnum.arriveMid })?.OrderByDescending(o => o.CreateTime).ToList();
|
List<AppWmsTask>? tasks = wmsTaskDao.Select(new() { VehicleNo = code, TaskStatus = (int)WmsTaskStatusEnum.arriveMid })?.OrderByDescending(o => o.CreateTime).ToList();
|
||||||
if (tasks == null || tasks.Count == 0) continue;
|
if (tasks == null || tasks.Count == 0) continue;
|
||||||
var task = tasks.First();
|
var task = tasks.First();
|
||||||
|
if (string.IsNullOrEmpty(task.Destination)) continue;
|
||||||
/* 下发任务 */
|
/* 下发任务 */
|
||||||
string agvErrText = agvAction.Send_AGV_TASK(task.TaskId, task.MidPoint, task.Destination);
|
string agvErrText = agvAction.Send_AGV_TASK(task.TaskId, task.MidPoint, task.Destination);
|
||||||
if (!string.IsNullOrEmpty(agvErrText))
|
if (!string.IsNullOrEmpty(agvErrText))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user