From d77286d01ca9e332573f8c8847b7fd658a9c961f Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Sun, 8 Oct 2023 17:25:38 +0800
Subject: [PATCH] 1

---
 .../Tnb.WarehouseMgr/WareHouseService.cs      | 27 +++++++------------
 .../Tnb.WarehouseMgr/WmsDeliveryService.cs    |  2 +-
 apihost/Tnb.API.Entry/Startup.cs              |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 6377a6a9..cefa342a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -60,11 +60,7 @@ namespace Tnb.WarehouseMgr
             _elevatorControlService = elevatorControlService;
             AddUnExecuteTask = async code =>
             {
-                (int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(code, CancellationToken.None);
-                if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯)
-                {
-                    await _elevatorControlService.CallLift(code, 5, CancellationToken.None);
-                }
+                await _elevatorControlService.CallLift(code, 5, CancellationToken.None);
             };
         }
 
@@ -344,13 +340,13 @@ namespace Tnb.WarehouseMgr
                     //呼梯操作
                     //获取目标库位为电梯库位的任务
 
-                    var endLocCodes = disTasks.Select(it => (it.endlocation_code, it.device_id, it.id)).Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase)).ToList();
-                    if (endLocCodes?.Count > 0)
-                    {
-                        await CallingLanding(endLocCodes);
-                    }
-                    //调用AGV创建任务链接口
-                    await AgvDispatch(disTasks, agvCts.Token);
+                    //var endLocCodes = disTasks.Select(it => (it.endlocation_code, it.device_id, it.id)).Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase)).ToList();
+                    //if (endLocCodes?.Count > 0)
+                    //{
+                    //    await CallingLanding(endLocCodes);
+                    //}
+                    ////调用AGV创建任务链接口
+                    //await AgvDispatch(disTasks, agvCts.Token);
 
                 }
             }
@@ -407,11 +403,8 @@ namespace Tnb.WarehouseMgr
                         {
                             var devName = _elevatorMap[devId].ToString();
                             elevatorQueueItem.task_status = "执行中";
-                            (int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(devName, CancellationToken.None);
-                            if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯)
-                            {
-                                await _elevatorControlService.CallLift(devName, 5, CancellationToken.None);
-                            }
+                            await _elevatorControlService.CallLift(devName, 5, CancellationToken.None);
+
                         }
 
                         //如果当前电梯有任务在做，将当前呼梯任务放入待执行队列
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
index 0def8659..919a7bdb 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
@@ -160,7 +160,7 @@ namespace Tnb.WarehouseMgr
                         var isOk = await _wareHouseService.GenPreTask(preTasks, null!);
                         if (isOk)
                         {
-                            if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)) && input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)) && input.data[nameof(WmsDelivery.endlocation_id)] != null && input.data[nameof(WmsDelivery.endlocation_id)] != null)
+                            if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)) && input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)) && input.data[nameof(WmsDelivery.startlocation_id)] != null && input.data[nameof(WmsDelivery.endlocation_id)] != null)
                             {
                                 //查询库位表
                                 var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString());
diff --git a/apihost/Tnb.API.Entry/Startup.cs b/apihost/Tnb.API.Entry/Startup.cs
index d5143ae7..d595c879 100644
--- a/apihost/Tnb.API.Entry/Startup.cs
+++ b/apihost/Tnb.API.Entry/Startup.cs
@@ -66,7 +66,7 @@ public class Startup : AppStartup
         services.AddTaskMessageNotify();
 
         //定时任务
-        services.AddTimedTaskService();
+        services.AddHostedService<TimedTaskBackgroundService>();
         //Agv心跳监听服务
         services.AddAgvHeartbeatMonitor();
         //services.AddHostedService<TimedTaskBackgroundService>();