fix

WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

@@ -141,7 +141,7 @@ namespace WCS.WorkEngineering.Systems
 
                 //开始存储设备信息
                 RedisHub.Monitor.RPush("Packs", pack);
-                if (RedisHub.Monitor.LLen("Packs") > 50000)
+                if (RedisHub.Monitor.LLen("Packs") > 100000)
                 {
                     RedisHub.Monitor.LTrim("Packs", 5000, -1);
                 }

WCS.WorkEngineering/Systems/MainSysyem.cs

@@ -50,292 +50,312 @@ namespace WCS.WorkEngineering.Systems
                 var sw = new Stopwatch();
                 sw.Start();
 
-                var db = new SqlSugarHelper().PLC;
-                var pack = RedisHub.Monitor.LPop<DeviceDataPack>("DataCollectionpacks"); ;
-                if (pack == null) return;
-
-                Parallel.ForEach(pack.GetType().GetProperties().OrderBy(x => x.Name), ps =>
+                var number = new List<int>();
+                number.AddRange(new[] { 1, 2, 3, 4, 5 });
+                Parallel.ForEach(number, n =>
                 {
-                    var sw10 = new Stopwatch();
-                    sw10.Start();
-                    var typeName = "";
-                    try
+                    var db = new SqlSugarHelper().PLC;
+                    var pack = RedisHub.Monitor.LPop<DeviceDataPack>("DataCollectionpacks"); ;
+                    if (pack == null) return;
+
+                    Parallel.ForEach(pack.GetType().GetProperties().OrderBy(x => x.Name), ps =>
                     {
-                        if (ps.PropertyType == typeof(ProtocolData<WCS_BCR80>[]))
+                        var sw10 = new Stopwatch();
+                        sw10.Start();
+                        var typeName = "";
+                        try
                         {
-                            if (pack.BCR80.Any())
+                            if (ps.PropertyType == typeof(ProtocolData<WCS_BCR80>[]))
                             {
-                                var value = pack.BCR80.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_BCR80).Name;
+                                if (pack.BCR80.Any())
+                                {
+                                    var value = pack.BCR80.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_BCR80).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_BCR81>[]))
-                        {
-                            if (pack.BCR81.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_BCR81>[]))
                             {
-                                var value = pack.BCR81.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_BCR81).Name;
+                                if (pack.BCR81.Any())
+                                {
+                                    var value = pack.BCR81.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_BCR81).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_BCR83>[]))
-                        {
-                            if (pack.BCR83.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_BCR83>[]))
                             {
-                                var value = pack.BCR83.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_BCR83).Name;
+                                if (pack.BCR83.Any())
+                                {
+                                    var value = pack.BCR83.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_BCR83).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_RGV520>[]))
-                        {
-                            if (pack.RGV520.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_RGV520>[]))
                             {
-                                var value = pack.RGV520.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_RGV520).Name;
+                                if (pack.RGV520.Any())
+                                {
+                                    var value = pack.RGV520.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_RGV520).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_RGV521>[]))
-                        {
-                            if (pack.RGV521.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_RGV521>[]))
                             {
-                                var value = pack.RGV521.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_RGV521).Name;
+                                if (pack.RGV521.Any())
+                                {
+                                    var value = pack.RGV521.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_RGV521).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot520>[]))
-                        {
-                            if (pack.Robot520.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_RGV523>[]))
                             {
-                                var value = pack.Robot520.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Robot520).Name;
+                                if (pack.RGV523.Any())
+                                {
+                                    var value = pack.RGV523.Select(x => new QuestDb_RGV523()
+                                    {
+                                        Alarm = Convert.ToString(x.Data.Alarm),
+                                        Code = x.Data.Code,
+                                        Frame = x.Data.Frame.ToLocalTime()
+                                    }).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(GetString(sql));
+                                    typeName = typeof(WCS_RGV523).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot521>[]))
-                        {
-                            if (pack.Robot521.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot520>[]))
                             {
-                                var value = pack.Robot521.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Robot521).Name;
+                                if (pack.Robot520.Any())
+                                {
+                                    var value = pack.Robot520.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Robot520).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot522>[]))
-                        {
-                            if (pack.Robot522.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot521>[]))
                             {
-                                var value = pack.Robot522.Select(x => new QuestDb_Robot522()
+                                if (pack.Robot521.Any())
                                 {
-                                    Alarm = Convert.ToString(x.Data.Alarm),
-                                    Code = x.Data.Code,
-                                    Frame = x.Data.Frame
-                                }).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Robot522).Name;
+                                    var value = pack.Robot521.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Robot521).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot530>[]))
-                        {
-                            if (pack.Robot530.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot522>[]))
                             {
-                                var value = pack.Robot530.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Robot530).Name;
+                                if (pack.Robot522.Any())
+                                {
+                                    var value = pack.Robot522.Select(x => new QuestDb_Robot522()
+                                    {
+                                        Alarm = Convert.ToString(x.Data.Alarm),
+                                        Code = x.Data.Code,
+                                        Frame = x.Data.Frame.ToLocalTime()
+                                    }).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Robot522).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot531>[]))
-                        {
-                            if (pack.Robot531.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot530>[]))
                             {
-                                var value = pack.Robot531.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Robot531).Name;
+                                if (pack.Robot530.Any())
+                                {
+                                    var value = pack.Robot530.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Robot530).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_SRM520>[]))
-                        {
-                            if (pack.SRM520.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Robot531>[]))
                             {
-                                var value = pack.SRM520.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_SRM520).Name;
+                                if (pack.Robot531.Any())
+                                {
+                                    var value = pack.Robot531.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Robot531).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_SRM521>[]))
-                        {
-                            if (pack.SRM521.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_SRM520>[]))
                             {
-                                var value = pack.SRM521.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_SRM521).Name;
+                                if (pack.SRM520.Any())
+                                {
+                                    var value = pack.SRM520.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_SRM520).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_SRM523>[]))
-                        {
-                            if (pack.SRM523.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_SRM521>[]))
                             {
-                                var value = pack.SRM523.Select(x => new QuestDb_SRM523()
+                                if (pack.SRM521.Any())
                                 {
-                                    Alarm = $"{Convert.ToString(x.Data.Alarm1)}，{Convert.ToString(x.Data.Alarm1)}",
-                                    Code = x.Data.Code,
-                                    Frame = x.Data.Frame
-                                }).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_SRM523).Name;
+                                    var value = pack.SRM521.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_SRM521).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station520>[]))
-                        {
-                            if (pack.Station520.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_SRM523>[]))
                             {
-                                var value = pack.Station520.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station520).Name;
+                                if (pack.SRM523.Any())
+                                {
+                                    var value = pack.SRM523.Select(x => new QuestDb_SRM523()
+                                    {
+                                        Alarm = $"{Convert.ToString(x.Data.Alarm1)}，{Convert.ToString(x.Data.Alarm1)}",
+                                        Code = x.Data.Code,
+                                        Frame = x.Data.Frame.ToLocalTime()
+                                    }).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(GetString(sql));
+                                    typeName = typeof(WCS_SRM523).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station521>[]))
-                        {
-                            if (pack.Station521.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station520>[]))
                             {
-                                var value = pack.Station521.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station521).Name;
+                                if (pack.Station520.Any())
+                                {
+                                    var value = pack.Station520.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station520).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station523>[]))
-                        {
-                            if (pack.Station523.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station521>[]))
                             {
-                                var value = pack.Station523.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station523).Name;
+                                if (pack.Station521.Any())
+                                {
+                                    var value = pack.Station521.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station521).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station524>[]))
-                        {
-                            if (pack.Station524.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station523>[]))
                             {
-                                var value = pack.Station524.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
+                                if (pack.Station523.Any())
+                                {
+                                    var value = pack.Station523.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station523).Name;
+                                }
+                            }
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station524>[]))
+                            {
+                                if (pack.Station524.Any())
+                                {
+                                    var value = pack.Station524.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
 
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station524).Name;
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station524).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station525>[]))
-                        {
-                            if (pack.Station525.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station525>[]))
                             {
-                                var value = pack.Station525.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station525).Name;
+                                if (pack.Station525.Any())
+                                {
+                                    var value = pack.Station525.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station525).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station90>[]))
-                        {
-                            if (pack.Station90.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station90>[]))
                             {
-                                var value = pack.Station90.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station90).Name;
+                                if (pack.Station90.Any())
+                                {
+                                    var value = pack.Station90.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station90).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Station91>[]))
-                        {
-                            if (pack.Station91.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Station91>[]))
                             {
-                                var value = pack.Station91.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Station91).Name;
+                                if (pack.Station91.Any())
+                                {
+                                    var value = pack.Station91.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Station91).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss520>[]))
-                        {
-                            if (pack.Truss520.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss520>[]))
                             {
-                                var value = pack.Truss520.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Truss520).Name;
+                                if (pack.Truss520.Any())
+                                {
+                                    var value = pack.Truss520.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Truss520).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss521>[]))
-                        {
-                            if (pack.Truss521.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss521>[]))
                             {
-                                var value = pack.Truss521.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Truss521).Name;
+                                if (pack.Truss521.Any())
+                                {
+                                    var value = pack.Truss521.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Truss521).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss523>[]))
-                        {
-                            if (pack.Truss523.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss523>[]))
                             {
-                                var value = pack.Truss523.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Truss523).Name;
+                                if (pack.Truss523.Any())
+                                {
+                                    var value = pack.Truss523.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Truss523).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss530>[]))
-                        {
-                            if (pack.Truss530.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss530>[]))
                             {
-                                var value = pack.Truss530.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Truss530).Name;
+                                if (pack.Truss530.Any())
+                                {
+                                    var value = pack.Truss530.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Truss530).Name;
+                                }
                             }
-                        }
-                        else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss531>[]))
-                        {
-                            if (pack.Truss531.Any())
+                            else if (ps.PropertyType == typeof(ProtocolData<WCS_Truss531>[]))
                             {
-                                var value = pack.Truss531.Select(x => x.Data).ToList();
-                                var sql = db.Insertable(value).ToSqlString();
-                                db.Ado.ExecuteCommand(sql);
-                                typeName = typeof(WCS_Truss531).Name;
+                                if (pack.Truss531.Any())
+                                {
+                                    var value = pack.Truss531.Select(x => x.Data).ToList();
+                                    var sql = db.Insertable(value).ToSqlString();
+                                    db.Ado.ExecuteCommand(sql);
+                                    typeName = typeof(WCS_Truss531).Name;
+                                }
                             }
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        World.Log($"错误内容:{e.Message}");
-                    }
-                    finally
-                    {
-                        sw10.Stop();
-                        World.Log($"执行耗时:{typeName}:{sw10.ElapsedMilliseconds}");
-                    }
-                });
+                        catch (Exception e)
+                        {
+                            World.Log($"错误内容:{e.Message}");
+                        }
+                        finally
+                        {
+                            sw10.Stop();
+                            World.Log($"执行耗时:{typeName}:{sw10.ElapsedMilliseconds}");
+                        }
+                    });
 
-                sw.Stop();
-                World.Log($"数据处理耗时:{sw.ElapsedMilliseconds}");
+                    sw.Stop();
+                    World.Log($"数据处理耗时:{sw.ElapsedMilliseconds}");
+                });
             }
             catch (Exception e)
             {
@@ -362,10 +382,8 @@ namespace WCS.WorkEngineering.Systems
 
         public string GetString(string value)
         {
-            return value.Replace("INSERT INTO ", "")
-                .Replace(",N'", ",'")
+            return value.Replace(",N'", ",'")
                 .Replace("\0", "")
-                .Replace("wcs_", "")
                 .Replace("(N'", "('") + "\r";
         }
     }

WCS.WorkEngineering/WorkStart.cs

@@ -416,7 +416,7 @@ namespace WCS.WorkEngineering
                 //三台堆垛机IP主机位分别是 41、49、57、65、73、81
                 srm.AddProtocol<ISRM520>(0, 520, $"10.30.37.{ip}");
                 srm.AddProtocol<ISRM521>(0, 521, $"10.30.37.{ip}");
-                srm.AddProtocol<ISRM523>(0, 537, $"10.30.37.{ip}");
+                srm.AddProtocol<ISRM523>(0, 523, $"10.30.37.{ip}");
 
                 //增加巷道
                 var tunnel = new Device($"TY{i + 1}");
@@ -453,31 +453,31 @@ namespace WCS.WorkEngineering
                             SqlSugarHelper.SetPLC(connectionString.Key);
 
                             //_db.CodeFirst.InitTables<WCS_SRM520>();
-                            _db.CodeFirst.InitTables<WCS_SRM521>();
-                            _db.CodeFirst.InitTables<QuestDb_SRM523>();
-                            _db.CodeFirst.InitTables<WCS_RGV520>();
-                            _db.CodeFirst.InitTables<WCS_RGV521>();
-                            _db.CodeFirst.InitTables<QuestDb_RGV523>();
-                            _db.CodeFirst.InitTables<WCS_BCR80>();
-                            _db.CodeFirst.InitTables<WCS_BCR81>();
-                            _db.CodeFirst.InitTables<WCS_BCR83>();
-                            _db.CodeFirst.InitTables<WCS_Station520>();
-                            _db.CodeFirst.InitTables<WCS_Station521>();
-                            _db.CodeFirst.InitTables<WCS_Station523>();
-                            _db.CodeFirst.InitTables<WCS_Station524>();
-                            _db.CodeFirst.InitTables<WCS_Station525>();
-                            _db.CodeFirst.InitTables<WCS_Station90>();
-                            _db.CodeFirst.InitTables<WCS_Station91>();
-                            _db.CodeFirst.InitTables<WCS_Truss520>();
-                            _db.CodeFirst.InitTables<WCS_Truss521>();
-                            _db.CodeFirst.InitTables<WCS_Truss523>();
-                            _db.CodeFirst.InitTables<WCS_Truss530>();
-                            _db.CodeFirst.InitTables<WCS_Truss531>();
-                            _db.CodeFirst.InitTables<WCS_Robot520>();
-                            _db.CodeFirst.InitTables<WCS_Robot521>();
-                            _db.CodeFirst.InitTables<QuestDb_Robot522>();
-                            _db.CodeFirst.InitTables<WCS_Robot530>();
-                            _db.CodeFirst.InitTables<WCS_Robot531>();
+                            //_db.CodeFirst.InitTables<WCS_SRM521>();
+                            //_db.CodeFirst.InitTables<QuestDb_SRM523>();
+                            //_db.CodeFirst.InitTables<WCS_RGV520>();
+                            //_db.CodeFirst.InitTables<WCS_RGV521>();
+                            //_db.CodeFirst.InitTables<QuestDb_RGV523>();
+                            //_db.CodeFirst.InitTables<WCS_BCR80>();
+                            //_db.CodeFirst.InitTables<WCS_BCR81>();
+                            //_db.CodeFirst.InitTables<WCS_BCR83>();
+                            //_db.CodeFirst.InitTables<WCS_Station520>();
+                            //_db.CodeFirst.InitTables<WCS_Station521>();
+                            //_db.CodeFirst.InitTables<WCS_Station523>();
+                            //_db.CodeFirst.InitTables<WCS_Station524>();
+                            //_db.CodeFirst.InitTables<WCS_Station525>();
+                            //_db.CodeFirst.InitTables<WCS_Station90>();
+                            //_db.CodeFirst.InitTables<WCS_Station91>();
+                            //_db.CodeFirst.InitTables<WCS_Truss520>();
+                            //_db.CodeFirst.InitTables<WCS_Truss521>();
+                            //_db.CodeFirst.InitTables<WCS_Truss523>();
+                            //_db.CodeFirst.InitTables<WCS_Truss530>();
+                            //_db.CodeFirst.InitTables<WCS_Truss531>();
+                            //_db.CodeFirst.InitTables<WCS_Robot520>();
+                            //_db.CodeFirst.InitTables<WCS_Robot521>();
+                            //_db.CodeFirst.InitTables<QuestDb_Robot522>();
+                            //_db.CodeFirst.InitTables<WCS_Robot530>();
+                            //_db.CodeFirst.InitTables<WCS_Robot531>();
                             var a = false;
                             break;