fix

ServiceCenter/SqlSugars/SqlSugarHelper.cs

@@ -18,6 +18,10 @@ namespace ServiceCenter.SqlSugars
         /// </summary>
         private static string _Default { get; set; } = "";
 
+        /// <summary>
+        /// PLC据库连接Key
+        /// </summary>
+        private static string _PLCEX { get; set; } = "";
         /// <summary>
         /// PLC据库连接Key
         /// </summary>
@@ -55,6 +59,15 @@ namespace ServiceCenter.SqlSugars
             _PLC = configId;
         }
 
+        /// <summary>
+        ///  设置 plc数据库连接Key
+        /// </summary>
+        /// <param name="configId">多租户Dlog ID</param>
+        public static void SetPLCEX(string configId)
+        {
+            _PLCEX = configId;
+        }
+
         /// <summary>
         /// 默认数据库连接Key
         /// </summary>
@@ -94,6 +107,19 @@ namespace ServiceCenter.SqlSugars
             }
         }
 
+        /// <summary>
+        /// plc数据库连接Key
+        /// </summary>
+        public SqlSugarScopeProvider PLCEX
+        {
+            get
+            {
+                if (_PLCEX == "") throw new Exception("请调用[SqlSugarHelper.SetPLC]方法设置默认数据库连接");
+                if (_Db == null) throw new Exception("请调用[SqlSugarHelper.SetDb]方法设置设置数据库连接");
+                return _Db.GetConnectionScope(_PLCEX);
+            }
+        }
+
         /// <summary>
         ///  设置数据库连接
         /// </summary>

业务工程/分拣库/WCS.Entity.Protocol/HUB/DevAlarmInfo.cs

@@ -18,7 +18,7 @@ namespace WCS.Entity.Protocol.HUB
         {
         }
 
-        public DevAlarmInfo(string alarm, DateTime startTime, DateTime endTime, long duration, DevType type, string code, DateTime frame)
+        public DevAlarmInfo(string alarm, DateTime startTime, DateTime endTime, long duration, string type, string code, DateTime frame)
         {
             Alarm = alarm;
             StartTime = startTime;
@@ -32,7 +32,7 @@ namespace WCS.Entity.Protocol.HUB
         /// <summary>
         ///  运行模式
         /// </summary>
-
+        [SugarColumn(ColumnDataType = "symbol")]
         public string Alarm { get; set; }
 
         /// <summary>
@@ -55,6 +55,7 @@ namespace WCS.Entity.Protocol.HUB
         /// <summary>
         /// 类型
         /// </summary>
-        public DevType Type { get; set; }
+        [SugarColumn(ColumnDataType = "symbol")]
+        public string Type { get; set; }
     }
 }

业务工程/分拣库/WCS.Entity.Protocol/HUB/DevRunInfo.cs

@@ -28,7 +28,7 @@ namespace WCS.Entity.Protocol.HUB
         /// <param name="type"></param>
         /// <param name="code"></param>
         /// <param name="frame"></param>
-        public DevRunInfo(string runMode, string runStatus, DateTime startTime, DateTime endTime, long duration, DevType type, string code, DateTime frame)
+        public DevRunInfo(string runMode, string runStatus, DateTime startTime, DateTime endTime, long duration, string type, string code, DateTime frame)
         {
             RunMode = runMode;
             RunStatus = runStatus;
@@ -43,13 +43,13 @@ namespace WCS.Entity.Protocol.HUB
         /// <summary>
         ///  运行模式
         /// </summary>
-
+        [SugarColumn(ColumnDataType = "symbol")]
         public string RunMode { get; set; }
 
         /// <summary>
         ///  运行状态
         /// </summary>
-
+        [SugarColumn(ColumnDataType = "symbol")]
         public string RunStatus { get; set; }
 
         /// <summary>
@@ -72,7 +72,8 @@ namespace WCS.Entity.Protocol.HUB
         /// <summary>
         /// 类型
         /// </summary>
-        public DevType Type { get; set; }
+        [SugarColumn(ColumnDataType = "symbol")]
+        public string Type { get; set; }
     }
 
     public enum DevType

业务工程/分拣库/WCS.Entity.Protocol/QuestDBBaseEntity.cs

@@ -10,10 +10,11 @@ namespace WCS.Entity.Protocol
     public class QuestDBBaseEntity
     {
         [DataMember(Order = 0)]
-        
+        [TimeDbSplitField(DateType.Month)]
         public DateTime Frame { get; set; }
 
         [DataMember(Order = 1)]
+        [SugarColumn(ColumnDataType = "symbol")]
         public string Code { get; set; }
     }
 }

业务工程/分拣库/WCS.Entity.Protocol/RGV/RGVEnum.cs

@@ -159,9 +159,9 @@ namespace WCS.Entity.Protocol.RGV
         Manual = 3,
 
         /// <summary>
-        ///  故障
+        ///  报警
         /// </summary>
-        [Description("故障")]
+        [Description("报警")]
         Alarm = 5,
 
         /// <summary>

业务工程/分拣库/WCS.Entity.Protocol/SRM/SrmEnum.cs

@@ -115,9 +115,9 @@ namespace WCS.Entity.Protocol.SRM
         KeepInRepair = 4,
 
         /// <summary>
-        ///  设备故障
+        ///  报警
         /// </summary>
-        [Description("设备故障")]
+        [Description("报警")]
         Alarm = 5
     }
 

业务工程/分拣库/WCS.Entity.Protocol/Truss/TrussEnum.cs

@@ -21,9 +21,9 @@ namespace WCS.Entity.Protocol.Truss
         Execute = 2,
 
         /// <summary>
-        ///  报警中
+        ///  报警
         /// </summary>
-        [Description("报警中")]
+        [Description("报警")]
         Alarm = 3,
 
         /// <summary>

业务工程/分拣库/WCS.WorkEngineering/Systems/一楼扫码入库.cs

@@ -24,8 +24,6 @@ namespace WCS.WorkEngineering.Systems
     {
         protected override bool ParallelDo => true;
 
-        
-
         public override void Do(Device<IStation520, IStation521, IStation523, IStation91, IBCR81> obj)
         {
             obj.入库站点是否被禁止();
@@ -150,8 +148,8 @@ namespace WCS.WorkEngineering.Systems
 
         public override bool Select(Device dev)
         {
-            //return dev.Code == "2532";
-            return dev.HasFlag(Extensions.DeviceFlags.一楼扫码);
+            return dev.Code is "2532" or "2732" or "2932" or "3132" or "3332" or "3532";
+            //return dev.HasFlag(Extensions.DeviceFlags.一楼扫码);
         }
     }
 }