From e4d2d54fcc3f714a5af5424232d4ba9c8d06f99f Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Fri, 14 Jun 2024 08:47:06 +0800
Subject: [PATCH] =?UTF-8?q?<fix>[important]=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=BC=82=E5=B8=B8=E5=8F=A3=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E8=8B=A5=E6=9C=89=E4=BB=BB=E5=8A=A1=E5=88=99=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=BB=99PLC=E8=B7=AF=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HisGetData/StackerInErr.cs                | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs
index c73d679..ed62da4 100644
--- a/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs
+++ b/WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerInErr.cs
@@ -102,16 +102,35 @@ public class StackerInErr(ConveyOperation conveyOperation, DataBaseData dataBase
             ConsoleLog.Warning($"【警告】入库异常口：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
             return;
         }
-        // 存在入库任务
-        ConsoleLog.Success($"入库异常口：{area} 箱码：{msg} 存在入库任务");
-        ConveyPLCTask plcTaskOk = new(plcId, (short)ConveyRouterEnum.Move);
-        string errTextOk = _conveyOperation.WriteTask(area, plcTaskOk);
-        if (string.IsNullOrEmpty(errTextOk))
+        else // 存在入库任务，写入PLC路向
         {
-            ConsoleLog.Success($"入库异常口：{area} 箱码：{msg}，写入PLC成功，{plcTaskOk}");
+            AppWcsTask wcsTask = wcsTasks[0]; // 取得任务
+            var locationDetail = CommonData.AppLocations.DetailWithWcsLocation(wcsTask.Destination);
+            if (locationDetail == default)
+            {
+                // 点位不存在
+                ConsoleLog.Exception($"【异常】入库分流：{area} 箱码：{msg} 终点：{wcsTask.Destination} 不存在，请重试");
+                ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.WcsErr);
+                string errText = _conveyOperation.WriteTask(area, plcTask);
+                if (string.IsNullOrEmpty(errText))
+                {
+                    ConsoleLog.Success($"入库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
+                    return;
+                }
+                ConsoleLog.Warning($"【警告】入库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
+                return;
+            }
+            ConveyRouterEnum router = (ConveyRouterEnum)(locationDetail.TunnelNo ?? 0);
+            ConsoleLog.Success($"入库分流：{area} 箱码：{msg} 终点：{wcsTask.Destination} 巷道：{locationDetail.TunnelNo}");
+            ConveyPLCTask plcTaskOk = new(plcId, (short)router);
+            string errTextOk = _conveyOperation.WriteTask(area, plcTaskOk);
+            if (string.IsNullOrEmpty(errTextOk))
+            {
+                ConsoleLog.Success($"入库分流：{area} 箱码：{msg}，写入PLC成功，{plcTaskOk}");
+                return;
+            }
+            ConsoleLog.Warning($"【警告】入库分流：{area} 箱码：{msg}，写入PLC失败，{plcTaskOk}，信息：{errTextOk}");
             return;
         }
-        ConsoleLog.Warning($"【警告】入库异常口：{area} 箱码：{msg}，写入PLC失败，{plcTaskOk}，信息：{errTextOk}");
-        return;
     }
 }