From cfceebf60dbc98bee6f5e279d6c8822564bb8686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Wed, 25 Sep 2024 12:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wcs/Program.cs             | 3 ++-
 src/Khd.Core.Wcs/Wcs/FirstFloor.cs      | 5 ++++-
 src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Khd.Core.Wcs/Program.cs b/src/Khd.Core.Wcs/Program.cs
index caa6ecb..b00d3c4 100644
--- a/src/Khd.Core.Wcs/Program.cs
+++ b/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;
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 6ac101c..84e60e9 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/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()}");
diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
index b22963a..b4789f2 100644
--- a/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
+++ b/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);