From d757785f0b670d90088a98dbfdedfdb8540ddb82 Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Thu, 9 Nov 2023 11:48:45 +0800
Subject: [PATCH] =?UTF-8?q?EnumTaskChainType=E6=96=B0=E5=A2=9E=EF=BC=8C?=
 =?UTF-8?q?=E7=94=B5=E6=A2=AF=EF=BC=8C=E8=BE=93=E9=80=81=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs    | 4 ++++
 .../Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.part.cs     | 5 +++++
 .../Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs     | 2 ++
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs            | 5 +++--
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs
index 844c7daa..85515fa0 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs
@@ -73,5 +73,9 @@ public partial class WmsAreaH : BaseEntity<string>
     /// 时间戳(用于并发控制)
     /// </summary>
     public DateTime? timestamp { get; set; }
+    /// <summary>
+    /// 第三方设备类型
+    /// </summary>
+    public string third_eqp_type { get; set; }
 
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.part.cs
index 4ab03baa..e35603c6 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.part.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.part.cs
@@ -13,4 +13,9 @@ public partial class WmsPretaskH : ITaskManagerDel
     /// </summary>
     [SugarColumn(IsIgnore = true)]
     public int move_num { get; set; }
+    /// <summary>
+    /// 第三方设备类型
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string third_eqp_type { get; set; }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs
index 5938fe77..5a4b020b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs
@@ -8,5 +8,7 @@
         CTU = 1,
         KIVA = 2,
         AGV = 3,
+        电梯 = 4,
+        输送线 = 5,
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 74b167c9..6a201aa8 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -256,7 +256,8 @@ namespace Tnb.WarehouseMgr
                                     .OrderBy(a => new { priority = SqlFunc.Desc(a.priority), a.bill_code })
                                     .Select((a, b, c) => new WmsPretaskH
                                     {
-                                        move_num = c.move_num
+                                        move_num = c.move_num,
+                                        third_eqp_type = c.third_eqp_type,
                                     }, true)
                                     .ToListAsync();
                 List<WmsPretaskH> agvElevatorTasks = preTasks
@@ -297,7 +298,7 @@ namespace Tnb.WarehouseMgr
                             {
                                 List<WmsPretaskH> areaPreTasks = itGroup.ToList();
 
-                                if (moveNum == 1 || (moveNum > areaPreTasks.Count && areaPreTasks.Count == 1))
+                                if (moveNum == 1 || (moveNum > areaPreTasks.Count && areaPreTasks.Count == 1) || areaPreTasks.Any(x => x.third_eqp_type.ToEnum<EnumTaskChainType>() != EnumTaskChainType.CTU))
                                 {
                                     items.ForEach(x =>
                                     {