wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EnumTaskChainType新增，电梯，输送线

Browse Source
This commit is contained in:
yang.lee
2023-11-09 11:48:45 +08:00
parent 1b3b30662c
commit d757785f0b
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs
View File

@@ -73,5 +73,9 @@ public partial class WmsAreaH : BaseEntity<string>
/// 时间戳(用于并发控制) /// 时间戳(用于并发控制)
/// </summary> /// </summary>
public DateTime? timestamp { get; set; } public DateTime? timestamp { get; set; }
/// <summary>
/// 第三方设备类型
/// </summary>
public string third_eqp_type { get; set; }
} }

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.part.cs
View File

@@ -13,4 +13,9 @@ public partial class WmsPretaskH : ITaskManagerDel
/// </summary> /// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public int move_num { get; set; } public int move_num { get; set; }
/// <summary>
/// 第三方设备类型
/// </summary>
[SugarColumn(IsIgnore = true)]
public string third_eqp_type { get; set; }
} }

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs
View File

@@ -8,5 +8,7 @@
CTU = 1, CTU = 1,
KIVA = 2, KIVA = 2,
AGV = 3, AGV = 3,
电梯 = 4,
输送线 = 5,
} }
} }

5
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -256,7 +256,8 @@ namespace Tnb.WarehouseMgr
.OrderBy(a => new { priority = SqlFunc.Desc(a.priority), a.bill_code }) .OrderBy(a => new { priority = SqlFunc.Desc(a.priority), a.bill_code })
.Select((a, b, c) => new WmsPretaskH .Select((a, b, c) => new WmsPretaskH
{ {
move_num = c.move_num move_num = c.move_num,
third_eqp_type = c.third_eqp_type,
}, true) }, true)
.ToListAsync(); .ToListAsync();
List<WmsPretaskH> agvElevatorTasks = preTasks List<WmsPretaskH> agvElevatorTasks = preTasks
@@ -297,7 +298,7 @@ namespace Tnb.WarehouseMgr
{ {
List<WmsPretaskH> areaPreTasks = itGroup.ToList(); 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 => items.ForEach(x =>
{ {