林豪 左 hace 2 años
padre
commit
8d8eacb377
Se han modificado 2 ficheros con 2 adiciones y 1 borrados
  1. 1 1
      ServiceCenter/Logs/LogHub.cs
  2. 1 0
      WCS.WorkEngineering/Systems/AgvSystems.cs

+ 1 - 1
ServiceCenter/Logs/LogHub.cs

@@ -63,7 +63,7 @@ namespace ServiceCenter.Logs
         /// <param name="system">系统</param>
         /// <param name="devCode">设备号</param>
         /// <param name="msg">内容</param>
-        public static async void ExRecord(this SystemBase system, string devCode, string msg, List<object> ints)
+        public static async void ExRecord<T>(this SystemBase system, string devCode, string msg, List<T> ints)
         {
             var key = $"{system.World.Description}:{devCode}";
             RedisHub.Default.RPush(key, msg + ints.JsonToString());

+ 1 - 0
WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -170,6 +170,7 @@ namespace WCS.WorkEngineering.Systems
                                               .Select(v => v.Sources).SelectMany(v => v).Where(v => v.HasProtocol(typeof(ISRM520))) //筛选出堆垛机
                                               .Select(v => new SRM(v, this.World)) //转换为SRM
                                               .Where(v => !v.Data2.Status.HasFlag(SrmStatus.Alarm) && v.Data2.AutoStatus == SrmAutoStatus.Automatic) //筛选出可用堆垛机
+                                              .Where(v => tunnelNo.Contains(v.Entity.Code)) //筛选出巷道优先级最高的堆垛机
                                               .MinBy(v => tunnelNo.IndexOf(v.Entity.Code));//按照巷道优先级排序
                                 this.ExRecord(obj.Entity.Code, $"AGV任务{agv.ID},可用堆垛机{srm.Entity.Code}");
                             }