fix

Projects/永冠OPP/WCS.Entity.Protocol/Station/IStation521.cs

@@ -88,8 +88,8 @@ namespace WCS.Entity.Protocol
     [Flags]
     public enum IstationStatus : ushort
     {
-        RES1 = 1 << 0,
-        RES2 = 1 << 1,
+        备用1 = 1 << 0,
+        备用2 = 1 << 1,
         RES3 = 1 << 2,
         上位机未分配任务 = 1 << 3,
         光电状态 = 1 << 4,
@@ -101,8 +101,8 @@ namespace WCS.Entity.Protocol
         超高故障 = 1 << 10,
         条码未读出 = 1 << 11,
         超重 = 1 << 12,
-        RES5 = 1 << 13,
-        RES6 = 1 << 14,
+        AGV放货完成信号 = 1 << 13,
+        AGV取货完成信号 = 1 << 14,
         RES7 = 1 << 15,
     }
 }

Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -1,20 +1,21 @@
 using DBHelper;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Entity.Protocol.SRM;
 using WCS.Service.Extensions;
+using WCS.Service.Handlers;
 
 namespace WCS.Service.Works.Station
 {
     /// <summary>
-    /// 车间入库
+    /// 涂布入库
     /// </summary>
-    //[WorkTitle(typeof(ProductHandler), "车间入库")]
-    public class 车间入库 : Work<StationDeviceGroup>
+    [WorkTitle(typeof(CoatingHandler), "涂布入库")]
+    public class 涂布入库 : Work<StationDeviceGroup>
     {
         protected override void Do(StationDeviceGroup obj)
         {
@@ -22,7 +23,7 @@ namespace WCS.Service.Works.Station
             {
                 var station = obj.Entity.CODE;
 
-                #region 处理新增入库任务
+                #region 处理新增AGV任务
 
                 DB.Do(db =>
                 {
@@ -40,7 +41,7 @@ namespace WCS.Service.Works.Station
                         pld.Code = position;
                         pld.TaskList.Add(agvtask);
 
-                        if (Ltc.Do(agvtask, agvtask => agvtask.Status == AGVTaskStatus.新建))
+                        if (agvtask.Status == AGVTaskStatus.新建)
                         {
                             var qty = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库 && v.Status > AGVTaskStatus.新建 && v.Status < AGVTaskStatus.完成)
                            .Where(v => v.Position == agvtask.Position).Count();
@@ -49,94 +50,180 @@ namespace WCS.Service.Works.Station
                             {
                                 throw new Exception($"{agvtask.Position}正在执行的入库任务数量已达{qty},暂停入库");
                             }
-                            //当前工位是否可以放货
-                        }
-                        else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.完成))
-                        {
-                            agvtask.Status = agvtask.AGVStatus;
+                            //暂时管控同一时间被确认的任务数为1
+                            if (db.Default.Set<WCS_AGVTask>().Any(v => v.Status == AGVTaskStatus.确认 && v.Station == obj.Entity.CODE)) continue;
+                            agvtask.Station = obj.Entity.CODE;
+                            agvtask.Status = AGVTaskStatus.确认;
                             agvtask.UpdateTime = DateTime.Now;
                             db.Default.SaveChanges();
                         }
-                        else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.取消))
+                        else if (agvtask.Status < agvtask.AGVStatus)
                         {
-                            agvtask.Status = agvtask.AGVStatus;
-                            agvtask.UpdateTime = DateTime.Now;
-                            db.Default.SaveChanges();
+                            if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
+                            {
+                                if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位))) continue;
+                                if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动))) continue;
+                                if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) continue;
+                                if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) continue;
+                                if (obj.Items.Any(v => v.Data2.Tasknum > 10000)) continue;
+
+                                agvtask.Status = agvtask.AGVStatus;
+                                agvtask.UpdateTime = DateTime.Now;
+                                db.Default.SaveChanges();
+                            }
+                            else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
+                            {
+                                if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号))) throw new WarnException("顶升下降信号未清除");
+                                if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new WarnException("AGV放货完成后输送线无光电信号");
+
+                                agvtask.Status = agvtask.AGVStatus;
+                                agvtask.UpdateTime = DateTime.Now;
+                                db.Default.SaveChanges();
+                                foreach (var dev in obj.Items)
+                                {
+                                    dev.Data.Istation521Status = IstationStatus.AGV放货完成信号;
+                                }
+                            }
+                            else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.完成))
+                            {
+                                agvtask.Status = agvtask.AGVStatus;
+                                agvtask.UpdateTime = DateTime.Now;
+                                db.Default.SaveChanges();
+                            }
+                            else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.取消))
+                            {
+                                agvtask.Status = agvtask.AGVStatus;
+                                agvtask.UpdateTime = DateTime.Now;
+                                db.Default.SaveChanges();
+                            }
                         }
                     }
                 });
 
-                #endregion 处理新增入库任务
+                #endregion 处理新增AGV任务
+            });
+        }
 
-                //空闲自动，停止运行
-                if (obj.Items.Any(v => v.Data2.VoucherNo != v.Data.VoucherNo)) throw new WarnException("等待执行任务");
-                if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动))) return;
-                if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException("设备运行中");
-                if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new DoException("没有光电");
+        protected override bool SelectDevice(WCS_DEVICE dev)
+        {
+            return dev.CODE == "G1386" || dev.CODE == "G1394";
+        }
+    }
+
+    /// <summary>
+    /// 涂布入库分配巷道
+    /// </summary>
+    [WorkTitle(typeof(CoatingHandler), "涂布入库分配巷道")]
+    public class 涂布入库分配巷道 : Work<StationDeviceGroup>
+    {
+        protected override void Do(StationDeviceGroup obj)
+        {
+            obj.EX(obj =>
+            {
+                var code = obj.Entity.CODE;
+                //当前组有一个运行的设备就停止执行
+                foreach (var item in obj.Items)
+                {
+                    var dev = Device.Find(item.Entity.CODE).Create<StationDevice>();
+                    if (!dev.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new DoException("无光电");
+                    if (dev.Data.VoucherNo != dev.Data2.VoucherNo)
+                        throw new WarnException($"等待任务[{dev.Data2.Tasknum}]执行--凭证号不一致[{dev.Data.VoucherNo}][{dev.Data2.VoucherNo}]");
+                    if (dev.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new WarnException("设备运行中");
+                    if (dev.Data2.Tasknum > 10000 && dev.Data2.Request != IstationRequest.请求分配目标地址)
+                        throw new WarnException("有任务无请求");
+                }
+
+                //获取需要进行巷道分配的设备
+                var devs = obj.TaskedDeviceGetNextAddress() ?? throw new WarnException("无可用任务");
 
-                var taskIds = new List<int>();
-                obj.Items.ToList().ForEach(dev => taskIds.Add(dev.Data2.Tasknum));
                 DB.Do(db =>
-                            {
-                                var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID));
-                                if (taskList == null) throw new WarnException($"WCS任务号{JsonConvert.SerializeObject(taskIds)}不存在");
-                                if (taskList.Any(v => v.TYPE != TaskType.出库)) throw new WarnException("有任务的类型不是出库");
-                                if (taskList.Any(v => v.AgvTask == 0)) throw new WarnException("人工出库任务,请手动搬走");
-                                var agvtask = db.Default.Set<WCS_AGVTask>().Find(taskList.FirstOrDefault().AgvTask);
-                                if (agvtask == null) throw new WarnException($"AGV任务号{taskList.FirstOrDefault().AgvTask}不存在");
-
-                                if (agvtask.Status == AGVTaskStatus.确认)
-                                {
-                                    var flag = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.叫料)
-                                    .Where(v => v.Status > AGVTaskStatus.确认 && v.Status < AGVTaskStatus.取放完成).Count();
-                                    if (flag > 2) throw new Exception("有2未完成的AGV出库任务");
-
-                                    taskList.ToList().ForEach(task =>
-                                            {
-                                                task.STATUS = WCS.Entity.TaskStatus.已完成;
-                                                task.UPDATETIME = DateTime.Now;
-                                                task.ENDTIME = DateTime.Now;
-                                            });
-
-                                    agvtask.Station = obj.Entity.CODE;
-                                    agvtask.Status = AGVTaskStatus.执行;
-                                    agvtask.UpdateTime = DateTime.Now;
-                                    db.Default.SaveChanges();
-                                }
-                                else if (agvtask.Status < agvtask.AGVStatus)
-                                {
-                                    if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
-                                    {
-                                        if (agvtask.Status < AGVTaskStatus.执行) throw new WarnException($"AGV状态错误-{agvtask.Status}");
-                                        if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.RES1))) throw new WarnException("任务清零信号未清除");
-
-                                        agvtask.Status = agvtask.AGVStatus;
-                                        agvtask.UpdateTime = DateTime.Now;
-                                        db.Default.SaveChanges();
-                                    }
-                                    else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
-                                    {
-                                        if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.RES1))) throw new WarnException("任务清零信号未清除");
-                                        if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new WarnException("AGV取货完成后依然有光电信号");
-                                        if (agvtask.Status < AGVTaskStatus.请求_允许) throw new WarnException("AGV任务状态有误");
-
-                                        agvtask.Status = agvtask.AGVStatus;
-                                        agvtask.UpdateTime = DateTime.Now;
-                                        db.Default.SaveChanges();
-
-                                        obj.Items.ToList().ForEach(dev =>
-                            {
-                                dev.Data2.Status = IstationStatus.RES1;
-                            });
-                                    }
-                                }
-                            });
+                {
+                    var taskIds = devs.Select(p => p.Data2.Tasknum);
+                    var tasks = db.Default.Set<WCS_TASK>().Where(p => taskIds.Any(v => v == p.ID)).ToList();
+                    var res = WMS.GetTunnelList(tasks.Select(v => v.WMSTASK.ToString()).ToList(), code);
+                    if (string.IsNullOrEmpty(res.TunnelNum)) throw new WarnException($"WMS未返回巷道");
+                    var tunnelNo = res.TunnelNum.Split(',').Select(v => "TY" + v).ToList();
+
+                    var tunnels = Device.Where(v => tunnelNo.Contains(v.CODE)).ToList();
+
+                    List<TunnelInfo> tunnelInfos = new List<TunnelInfo>();
+                    foreach (var item in tunnels)
+                    {
+                        //当前巷道的取货点
+                        var allIn = Device.Where(v => v.Is(DF.SRM涂布取货)) //一楼所有取货点
+                                          .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
+                                          .Select(v => v.CODE)
+                                          .ToList();
+                        var q = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.Contains(p.NEXT.CODE))) //下一个目标地址包含取货点的设备
+                                      .Select(v => v.Create<StationDevice>()) //取所有可以到达取货点设备的信息
+                                      .Where(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位) && !v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum < 10000)//筛选出空闲的路径点，此处因输送机都是一个动力，因此可以先找路径点再找设备组
+                                      .Distinct()
+                                      .FirstOrDefault();//去一次重
+                        if (q == null) continue;
+                        var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == q.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
+
+                        tunnelInfos.Add(new TunnelInfo
+                        {
+                            Tunnel = item,
+                            taskIN = dev, //找到放货点设备所在组
+                            SRM = Device.Where(p => p.IsSC()).FirstOrDefault(p => item.ROUTES.Any(d => d.NEXT.CODE == p.CODE)).Create<SRMDevice>()
+                        });
+                    }
+                    //筛选出优先级最高的可用巷道
+                    var tunnelInfo = tunnelInfos.Where(v => { try { return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程 && v.SRM.Data2.SRMStatus == SCRunStatus.空闲; } catch { return false; } })
+                                                .Where(v => !db.Default.Set<WCS_TASK>().Any(p => p.Priority > 0 && p.DEVICE == v.SRM.Entity.CODE && p.STATUS < TaskStatus.堆垛机完成))
+                                                .OrderBy(v => tunnelNo.IndexOf(v.Tunnel.CODE)).FirstOrDefault();
+                    if (tunnelInfo == null) throw new WarnException("无可用巷道");
+
+                    //开始向设备中写入任务信息
+                    foreach (var item in devs)
+                    {
+                        var dev = Device.Find(item.Entity.CODE).Create<StationDevice>();
+                        var task = tasks.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
+
+                        task.DEVICE = tunnelInfo.SRM.Entity.CODE;
+                        task.TUNNEL = tunnelInfo.Tunnel.CODE;
+                        task.ADDRNEXT = dev.Data.Goodsend.ToString();
+                        task.TaskGroupKey = res.WMSTaskGroupKey;
+                        task.ADDRTO = task.DEVICE;
+                        db.Default.SaveChanges();
+
+                        var msg = $"下达从{obj.Entity.CODE}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{ task.TUNNEL }]-[{task.DEVICE}]";
+                        msg += $"[{dev.Data.Tasknum}][{obj.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
+
+                        task.CreateStatusLog(db, msg, this.GetType());
+
+                        dev.Data.Tasknum = task.ID;
+                        dev.Data.Goodsstart = obj.Entity.CODE.Replace("G", "").ToShort();
+                        dev.Data.Goodsend = tunnelInfo.taskIN.CODE.Replace("G", "").ToShort();
+                        dev.Data.Goodsnum = (short)devs.Count();
+                        dev.Data.CmdType = IstationCmdType.分配目标地址;
+                        dev.Data.VoucherNo++;
+                    }
+                });
             });
         }
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return dev.CODE == "G1386" || dev.CODE == "G1394";
+            return dev.CODE == "G2" || dev.CODE == "G3";
+        }
+    }
+
+    /// <summary>
+    /// 涂布入库分配巷道
+    /// </summary>
+    [WorkTitle(typeof(CoatingHandler), "涂布入库分配巷道")]
+    public class 涂布入库旋转台二次分配巷道 : Work<StationDeviceGroup>
+    {
+        protected override void Do(StationDeviceGroup obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override bool SelectDevice(WCS_DEVICE dev)
+        {
+            throw new NotImplementedException();
         }
     }
 }

Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -78,7 +78,7 @@ namespace WCS.Service.Works.Station
                     //开始写入目标地址
                     obj.Data.Tasknum = task.ID;
                     obj.Data.Goodsstart = obj.Entity.CODE.ToShort();
-                    obj.Data.Goodsend = task.ADDRNEXT.Replace("G","").ToShort();
+                    obj.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
                     obj.Data.CmdType = IstationCmdType.堆垛机放货完成请求目标地址;
                     obj.Data.VoucherNo++;
                 });
@@ -244,60 +244,60 @@ namespace WCS.Service.Works.Station
                  var taskIds = new List<int>();
                  obj.Items.ToList().ForEach(dev => taskIds.Add(dev.Data2.Tasknum));
                  DB.Do(db =>
-                              {
-                                  var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID));
-                                  if (taskList == null) throw new WarnException($"WCS任务号{JsonConvert.SerializeObject(taskIds)}不存在");
-                                  if (taskList.Any(v => v.TYPE != TaskType.出库)) throw new WarnException("有任务的类型不是出库");
-                                  if (taskList.Any(v => v.AgvTask == 0)) throw new WarnException("人工出库任务,请手动搬走");
-                                  var agvtask = db.Default.Set<WCS_AGVTask>().Find(taskList.FirstOrDefault().AgvTask);
-                                  if (agvtask == null) throw new WarnException($"AGV任务号{taskList.FirstOrDefault().AgvTask}不存在");
+                 {
+                     var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID));
+                     if (taskList == null) throw new WarnException($"WCS任务号{JsonConvert.SerializeObject(taskIds)}不存在");
+                     if (taskList.Any(v => v.TYPE != TaskType.出库)) throw new WarnException("有任务的类型不是出库");
+                     if (taskList.Any(v => v.AgvTask == 0)) throw new WarnException("人工出库任务,请手动搬走");
+                     var agvtask = db.Default.Set<WCS_AGVTask>().Find(taskList.FirstOrDefault().AgvTask);
+                     if (agvtask == null) throw new WarnException($"AGV任务号{taskList.FirstOrDefault().AgvTask}不存在");
 
-                                  if (agvtask.Status == AGVTaskStatus.确认)
-                                  {
-                                      var flag = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.叫料)
-                                      .Where(v => v.Status > AGVTaskStatus.确认 && v.Status < AGVTaskStatus.取放完成).Count();
-                                      if (flag > 2) throw new Exception("有2未完成的AGV出库任务");
+                     if (agvtask.Status == AGVTaskStatus.确认)
+                     {
+                         var flag = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.叫料)
+                         .Where(v => v.Status > AGVTaskStatus.确认 && v.Status < AGVTaskStatus.取放完成).Count();
+                         if (flag > 2) throw new Exception("有2未完成的AGV出库任务");
 
-                                      taskList.ToList().ForEach(task =>
-                                              {
-                                                  task.STATUS = WCS.Entity.TaskStatus.已完成;
-                                                  task.UPDATETIME = DateTime.Now;
-                                                  task.ENDTIME = DateTime.Now;
-                                              });
+                         taskList.ToList().ForEach(task =>
+                                 {
+                                     task.STATUS = WCS.Entity.TaskStatus.已完成;
+                                     task.UPDATETIME = DateTime.Now;
+                                     task.ENDTIME = DateTime.Now;
+                                 });
 
-                                      agvtask.Station = obj.Entity.CODE;
-                                      agvtask.Status = AGVTaskStatus.执行;
-                                      agvtask.UpdateTime = DateTime.Now;
-                                      db.Default.SaveChanges();
-                                  }
-                                  else if (agvtask.Status < agvtask.AGVStatus)
-                                  {
-                                      if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
-                                      {
-                                          if (agvtask.Status < AGVTaskStatus.执行) throw new WarnException($"AGV状态错误-{agvtask.Status}");
-                                          if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.RES1))) throw new WarnException("任务清零信号未清除");
+                         agvtask.Station = obj.Entity.CODE;
+                         agvtask.Status = AGVTaskStatus.执行;
+                         agvtask.UpdateTime = DateTime.Now;
+                         db.Default.SaveChanges();
+                     }
+                     else if (agvtask.Status < agvtask.AGVStatus)
+                     {
+                         if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
+                         {
+                             if (agvtask.Status < AGVTaskStatus.执行) throw new WarnException($"AGV状态错误-{agvtask.Status}");
+                             if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV取货完成信号))) throw new WarnException("任务清零信号未清除");
 
-                                          agvtask.Status = agvtask.AGVStatus;
-                                          agvtask.UpdateTime = DateTime.Now;
-                                          db.Default.SaveChanges();
-                                      }
-                                      else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
-                                      {
-                                          if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.RES1))) throw new WarnException("任务清零信号未清除");
-                                          if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new WarnException("AGV取货完成后依然有光电信号");
-                                          if (agvtask.Status < AGVTaskStatus.请求_允许) throw new WarnException("AGV任务状态有误");
+                             agvtask.Status = agvtask.AGVStatus;
+                             agvtask.UpdateTime = DateTime.Now;
+                             db.Default.SaveChanges();
+                         }
+                         else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
+                         {
+                             if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV取货完成信号))) throw new WarnException("任务清零信号未清除");
+                             if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new WarnException("AGV取货完成后依然有光电信号");
+                             if (agvtask.Status < AGVTaskStatus.请求_允许) throw new WarnException("AGV任务状态有误");
 
-                                          agvtask.Status = agvtask.AGVStatus;
-                                          agvtask.UpdateTime = DateTime.Now;
-                                          db.Default.SaveChanges();
+                             agvtask.Status = agvtask.AGVStatus;
+                             agvtask.UpdateTime = DateTime.Now;
+                             db.Default.SaveChanges();
 
-                                          obj.Items.ToList().ForEach(dev =>
+                             foreach (var dev in obj.Items)
                              {
-                                 dev.Data2.Status = IstationStatus.RES1;
-                             });
-                                      }
-                                  }
-                              });
+                                 dev.Data.Istation521Status = IstationStatus.AGV取货完成信号;
+                             }
+                         }
+                     }
+                 });
              });
         }
 

WCS.Core/DataTrans/DataField.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 
 namespace WCS.Core
 {
     public delegate void ValueChangedHandler<T>(PlcItem<T> sender, T value);
+
     public delegate void ValueChangedHandler(PlcItem sender, object value);
 
     public abstract class PlcItem
@@ -18,7 +16,6 @@ namespace WCS.Core
 
         public byte ArrayLength, StringLength;
 
-
         public string Id;
         public string Name;
         public string IP;
@@ -48,7 +45,7 @@ namespace WCS.Core
             DataSizeOfBits = _getBitLen(DataType);
         }
 
-        int GetTypeLen(Type type)
+        private int GetTypeLen(Type type)
         {
             var bitLen = _getBitLen(type);
             var mod = bitLen % 8;
@@ -57,7 +54,7 @@ namespace WCS.Core
             return bitLen / 8;
         }
 
-        int _getBitLen(Type type)
+        private int _getBitLen(Type type)
         {
             if (type.IsArray)
                 return _getBitLen(type.GetElementType()) * ArrayLength;
@@ -85,11 +82,12 @@ namespace WCS.Core
         }
 
         protected abstract void setValue(object value);
+
         protected abstract object getValue();
 
-        object lastValue;
+        private object lastValue;
 
-        bool ValueEquals(object obj1, object obj2)
+        private bool ValueEquals(object obj1, object obj2)
         {
             if (obj1.GetType().IsArray)
             {
@@ -112,11 +110,11 @@ namespace WCS.Core
             }
         }
     }
+
     public class PlcItem<T> : PlcItem
     {
         public PlcItem(string id, string name, DataBlock db, int start, byte arrLen = 1, byte strLen = 0) : base(id, name, db, typeof(T), start, arrLen, strLen)
         {
-
         }
 
         public new T Value
@@ -151,7 +149,6 @@ namespace WCS.Core
                         Thread.Sleep(100);
                     }
                 }
-
             }
         }
 
@@ -159,11 +156,5 @@ namespace WCS.Core
         {
             return Db.Read<T>(Start, StringLength, ArrayLength);
         }
-
-
-
-
-
-
     }
-}
+}