fix

ServiceCenter/Logs/LogHub.cs

@@ -8,10 +8,11 @@ namespace ServiceCenter.Logs
     public class LogHub
     {
         /// <summary>
-        ///  发布一条世界交互日志
+        ///  发布世界交互日志
         /// </summary>
         /// <param name="logs"></param>
-        public static void WorldPublish(ConcurrentQueue<KeyLog> logs)
+        /// <param name="World">当前世界</param>
+        public static void WorldPublish(ConcurrentQueue<KeyLog> logs, string World)
         {
             if (logs.Count > 0)
             {
@@ -28,14 +29,14 @@ namespace ServiceCenter.Logs
                     }));
                 }
                 //存入业务报警内容
-                List<BusinessAlarm> businesses = logs.Where(v => v.Log.Level != LogLevelEnum.Low).Select(v => new BusinessAlarm()
+                List<BusinessAlarm> businesses = logs.Where(v => v.Log.Level != LogLevelEnum.Low && v.Log.LogUpLoad == LogUpLoadEnum.UpLoadWMS).Select(v => new BusinessAlarm()
                 {
                     BusinessName = v.Channel.System,
                     DevNo = v.Channel.Item,
                     Con = v.ToString(),
                     Time = DateTime.Now
                 }).ToList();
-                RedisHub.WMS.Set($"{nameof(BusinessAlarm)}", JsonConvert.SerializeObject(businesses));
+                RedisHub.WMS.Set($"{nameof(BusinessAlarm)}:{World}", JsonConvert.SerializeObject(businesses));
             }
         }
 
@@ -54,21 +55,6 @@ namespace ServiceCenter.Logs
             }));
         }
 
-        /// <summary>
-        ///   增加一条处理日志
-        /// </summary>
-        /// <param name="title">文件名</param>
-        /// <param name="con">内容</param>
-        public static void InterfaceProcessLog(string title, string con)
-        {
-            RedisHub.Default.RPush("LogHub", JsonConvert.SerializeObject(new LogModel
-            {
-                path = $"D:\\WCSLogs\\{DateTime.Now.yyyyMMdd()}\\接口处理日志",
-                Title = $"{title}.txt",
-                Con = $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--{con}\n"
-            }));
-        }
-
         public static void init()
         {
             while (true)

WCS.Entity.Protocol/Station/StationEnum.cs

@@ -50,80 +50,91 @@ namespace WCS.Entity.Protocol.Station
         /// <summary>
         /// 选中状态位
         /// </summary>
-        [Description("自动")]
+        [Description("选中状态位")]
         Choice_Bit = 1 << 1,
 
         /// <summary>
         /// 任务有货
         /// </summary>
-        [Description("自动")]
+        [Description("任务有货")]
         OT_Status = 1 << 2,
 
         /// <summary>
         /// 光电有货
         /// </summary>
-        [Description("自动")]
+        [Description("光电有货")]
         PH_Status = 1 << 3,
 
         /// <summary>
         /// 运行状态位
         /// </summary>
-        [Description("自动")]
+        [Description("运行状态位")]
         Run = 1 << 4,
 
         /// <summary>
         /// 正转
         /// </summary>
+        [Description("正转")]
         Fwd_1 = 1 << 5,
 
         /// <summary>
         /// 反转
         /// </summary>
+        [Description("反转")]
         Rev_1 = 1 << 6,
 
         /// <summary>
         /// 上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）
         /// </summary>
+        [Description("上升/右转/伸出（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉伸出）")]
         Up_Right_Front_2 = 1 << 7,
 
         /// <summary>
         /// 下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）
         /// </summary>
+        [Description("下降/左转/缩回（顶升移栽升降、拆码盘机升降、提升机升降、拆码盘机拨叉缩回）")]
         Down_Left_Back_2 = 1 << 8,
 
         /// <summary>
         /// 高位（顶升移栽升降、拆码盘机升降、提升机升降）
         /// </summary>
+        [Description("高位（顶升移栽升降、拆码盘机升降、提升机升降）")]
         High_Station_2 = 1 << 9,
 
         /// <summary>
         /// 中位（拆码盘机升降）
         /// </summary>
+        [Description("中位（拆码盘机升降）")]
         Mid_Station_2 = 1 << 10,
 
         /// <summary>
         /// 低位（顶升移栽升降、拆码盘机升降、提升机升降）
         /// </summary>
+        [Description("低位（顶升移栽升降、拆码盘机升降、提升机升降）")]
         Low_Station_2 = 1 << 11,
 
         /// <summary>
         /// 前位（拆码盘机拨叉伸出）
         /// </summary>
+        [Description("前位（拆码盘机拨叉伸出）")]
         Front_Station_2 = 1 << 12,
 
         /// <summary>
         /// 后位（拆码盘机拨叉缩回）
         /// </summary>
+        [Description("后位（拆码盘机拨叉缩回）")]
         Back_Station_2 = 1 << 13,
 
         /// <summary>
         /// 手动入库
         /// </summary>
+        [Description("手动入库")]
         ManualStorage = 1 << 14,
 
         /// <summary>
         /// 上位机未分配任务
         /// </summary>
+        [Description("上位机未分配任务")]
         UnassignedTask = 1 << 15,
     }
 
@@ -136,81 +147,97 @@ namespace WCS.Entity.Protocol.Station
         /// <summary>
         /// 外形/条码等货物故障
         /// </summary>
+        [Description("外形/条码等货物故障")]
         Goods_Err = 1 >> 0,
 
         /// <summary>
         /// 前超长故障
         /// </summary>
+        [Description("前超长故障")]
         F_Outside = 1 >> 1,
 
         /// <summary>
         /// 后超长故障
         /// </summary>
+        [Description("后超长故障")]
         B_Outside = 1 >> 2,
 
         /// <summary>
         /// 左超宽故障
         /// </summary>
+        [Description("左超宽故障")]
         L_Outside = 1 >> 3,
 
         /// <summary>
         /// 右超宽故障
         /// </summary>
+        [Description("右超宽故障")]
         R_Outside = 1 >> 4,
 
         /// <summary>
         /// 超高故障
         /// </summary>
+        [Description("超高故障")]
         H_Outside = 1 >> 5,
 
         /// <summary>
         /// 条码读取失败
         /// </summary>
+        [Description("条码读取失败")]
         BCR_Noread = 1 >> 6,
 
         /// <summary>
         /// 超重
         /// </summary>
+        [Description("超重")]
         Overload = 1 >> 7,
 
         /// <summary>
         /// 货物严重外检故障
         /// </summary>
+        [Description("货物严重外检故障")]
         Goods_Err_1 = 1 >> 8,
 
         /// <summary>
         /// 二维条码未读出
         /// </summary>
+        [Description("二维条码未读出")]
         BCR_Noread_1 = 1 >> 9,
 
         /// <summary>
         /// 备用
         /// </summary>
+        [Description("备用")]
         RES1 = 1 >> 10,
 
         /// <summary>
         /// 备用
         /// </summary>
+        [Description("备用")]
         RES2 = 1 >> 11,
 
         /// <summary>
         /// 备用
         /// </summary>
+        [Description("备用")]
         RES3 = 1 >> 12,
 
         /// <summary>
         /// 备用
         /// </summary>
+        [Description("备用")]
         RES4 = 1 >> 13,
 
         /// <summary>
         /// 备用
         /// </summary>
+        [Description("备用")]
         RES5 = 1 >> 14,
 
         /// <summary>
         /// 备用
         /// </summary>
+        [Description("备用")]
         RES6 = 1 >> 15,
     }
 }

WCS.WorkEngineering/worlds/MainWorld.cs

@@ -49,7 +49,7 @@ namespace WCS.WorkEngineering.Worlds
         /// </summary>
         protected override void AfterUpdate()
         {
-            LogHub.WorldPublish(Logs);
+            LogHub.WorldPublish(Logs, this.GetType().Name);
         }
 
         /// <summary>