Merge branch '新增连廊线开发' of http://120.77.11.229:3000/zuolinhao/YG-MW-WCS into 新增连廊线开发

Projects/永冠/WCS.Service/ProtocolProxy.cs

@@ -58,10 +58,10 @@ namespace WCS.Service
                 for (int i = 0; i < list.Count - 1; i++)
                 {
                     var obj = list[i];
-                    db.Default.Attach(obj);
+                    //db.Default.Attach(obj);
                     obj.ISLAST = false;
                 }
-                db.Default.SaveChanges();
+                //db.Default.SaveChanges();
             }
             var res = Enumerable.LastOrDefault(list);
             return res;
@@ -75,19 +75,19 @@ namespace WCS.Service
 
             if (last != null)
             {
-                db.Default.Attach(last);
+                //db.Default.Attach(last);
                 last.ISLAST = false;
             }
 
-            db.Default.Attach(PROTOCOL.DEVICE);
+            //db.Default.Attach(PROTOCOL.DEVICE);
 
             newobj.DEVICE = PROTOCOL.DEVICE;
             newobj.ISLAST = true;
             newobj.UPDATETIME = DateTime.Now;
             newobj.UPDATEUSER = user;
             newobj.FRAME = LogicHandler.Frame;
-            db.Default.Add(newobj);
-            db.Default.SaveChanges();
+            //db.Default.Add(newobj);
+            //db.Default.SaveChanges();
             return newobj;
         }
 
@@ -101,7 +101,6 @@ namespace WCS.Service
         static ProtocolProxy()
         {
             MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
-            //Redis = new RedisClient("212.64.66.35,password=Aa123456,database=11");
             Redis = new RedisClient("192.168.249.120,password=123456,database=10");
             WMS120Redis = new RedisClient("192.168.249.120,password=123456,database=0");
             Redis.Serialize = obj =>
@@ -175,15 +174,6 @@ namespace WCS.Service
                         p.SetValue(data, obj);
                     }
                 }
-
-                //var type = obj.GetType();
-                ////if (type == typeof(WCS_STATION521))
-                //{
-                //    var key = type.Name + "," + code;
-                //    var json = JsonConvert.SerializeObject(obj);
-                //    Redis.Set(key, json);
-                //    Redis.Publish("View," + key, json);
-                //}
             }
             catch (Exception ex)
             {
@@ -205,14 +195,6 @@ namespace WCS.Service
             {
                 var gs = AllDatas.GroupBy(v => v.Value.GetType());
 
-                //Parallel.ForEach(gs, g =>
-                //{
-                //    var value = g.Select(v => v.Value).ToArray();
-                //    var etype = g.Key;
-                //    var type = typeof(DeviceDataCollection<>).MakeGenericType(etype);
-                //    var coll = Activator.CreateInstance(type, LogicHandler.Frame, value);
-                //    Redis.Set(etype.Name, coll);
-                //});
                 DeviceDataPack pack = new DeviceDataPack();
                 pack.Frame = LogicHandler.Frame;
                 foreach (var g in gs)
@@ -251,7 +233,6 @@ namespace WCS.Service
 
                 foreach (var data in AllDatas)
                 {
-                    // LastInfo[data.Key] = data.Value.Info;
                     data.Value.Info = "";
                     if (data.Value is ProdLineData)
                     {
@@ -265,7 +246,6 @@ namespace WCS.Service
             catch (Exception ex)
             {
             }
-            //Datas.Clear();
         }
     }