From 9a391e47a35f8af593b4dd8523276376ff310d38 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Mon, 18 Nov 2024 20:48:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E8=B5=B7=E7=82=B9=E6=88=96=E7=BB=88=E7=82=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E4=B8=8D=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0=E5=9B=9B=E5=90=91=E8=BD=A6?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=87=BA=E5=BA=93=E4=BD=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WcsMain/CirculationJob/Stacker/ExecuteWmsTask.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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
 
 
     /// <summary>
-    /// 执行入库任务
+    /// 执行入库任务 --- AGV搬运
     /// </summary>
     /// <param name="wmsTask"></param>
     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
     /// <param name="wmsTask"></param>
     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<AppWmsTask>? 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))