任务优先级

src/Khd.Core.Wcs/Program.cs

@@ -1,4 +1,5 @@
-using Khd.Core.EntityFramework;
+using Khd.Core.Domain.Models;
+using Khd.Core.EntityFramework;
 using Khd.Core.Library;
 using Khd.Core.Wcs;
 using Khd.Core.Wcs.Global;

src/Khd.Core.Wcs/Wcs/FirstFloor.cs

@@ -319,6 +319,7 @@ namespace Khd.Core.Wcs.Wcs
                                         fromFloorNo = 1,
                                         floorNo = 4,
                                         useFlag = 1,
+                                        ud1=20,
                                         createBy = "一楼接驳位",
                                         createTime = DateTime.Now,
                                         remark = "一楼创建入库任务"
@@ -403,6 +404,7 @@ namespace Khd.Core.Wcs.Wcs
                                                             currPointNo = "TSJ_01",
                                                             nextPointId = T01,
                                                             nextPointNo = "TSJ_01",
+                                                            ud1 = 20,
                                                             endPointId = warehouseId,
                                                             fromFloorNo = 1,
                                                             floorNo = TargetFloor.warehouseFloor,
@@ -522,7 +524,8 @@ namespace Khd.Core.Wcs.Wcs
                             if (Convert.ToInt32(equipstate06Value) == 0)
                             {
                                 dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
-                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus < 5).OrderBy(t => t.createTime).ToList();
+                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus < 5)
+                                    .OrderBy(t => t.ud1).OrderBy(t => t.createTime).ToList();
                                 foreach (var wcsTask in wcsTasks)
                                 {
                                     _logger.Info($"当前任务?{wcsTask.ToJsonString()}");

src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs

@@ -173,6 +173,7 @@ namespace Khd.Core.Wcs.Wcs
                                     newTask.currPointNo = baseEquip.equipNo;
                                     newTask.fromFloorNo = FloorNo;
                                     newTask.taskStatus = 0;
+                                    newTask.ud1 = 10;
                                     newTask.updateTime = DateTime.Now;
                                     dbContext.Add(newTask);
                                     WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);