diff --git a/WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs b/WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs
index 27f51ac..eb9908f 100644
--- a/WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs
+++ b/WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs
@@ -81,11 +81,12 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta
///
- /// 执行入库任务
+ /// 执行入库任务 --- AGV搬运
///
///
private void ExecuteInTask(AppWmsTask wmsTask)
{
+ if (string.IsNullOrEmpty(wmsTask.Origin)) return;
string? midPoint = GetEmptyInLift(wmsTask.Destination);
if (string.IsNullOrEmpty(midPoint)) return; // 没有可用的站台
/* 发送AGV 搬运任务 */
@@ -108,7 +109,11 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta
///
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; // 没有可用站台
/* 发送四向车搬运任务 */
string? errText = containerAction.ExecuteOutTask(wmsTask.WcsId, wmsTask.Origin, midPoint, wmsTask.VehicleNo);
@@ -164,6 +169,7 @@ public class ExecuteWmsTask(AppWmsTaskDao wmsTaskDao, StackerConveyOperation sta
List? tasks = wmsTaskDao.Select(new() { VehicleNo = code, TaskStatus = (int)WmsTaskStatusEnum.arriveMid })?.OrderByDescending(o => o.CreateTime).ToList();
if (tasks == null || tasks.Count == 0) continue;
var task = tasks.First();
+ if (string.IsNullOrEmpty(task.Destination)) continue;
/* 下发任务 */
string agvErrText = agvAction.Send_AGV_TASK(task.TaskId, task.MidPoint, task.Destination);
if (!string.IsNullOrEmpty(agvErrText))