Merge branch 'master' of ssh://10.10.100.21/source/mes-client

PLCDataReader/Entity/Device.cs

@@ -51,6 +51,14 @@ namespace UAS_PLCDataReader.Entity
         /// 返回参数
         /// </summary>
         private Dictionary<string, string> itemData;
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        private string makeCode;
+        /// <summary>
+        /// 指令编号
+        /// </summary>
+        private string dccode;
 
         public string Decode
         {
@@ -194,5 +202,31 @@ namespace UAS_PLCDataReader.Entity
                 okQTY = value;
             }
         }
+
+        public string MakeCode
+        {
+            get
+            {
+                return makeCode;
+            }
+
+            set
+            {
+                makeCode = value;
+            }
+        }
+
+        public string Dccode
+        {
+            get
+            {
+                return dccode;
+            }
+
+            set
+            {
+                dccode = value;
+            }
+        }
     }
 }

PLCDataReader/Main.Designer.cs

@@ -128,6 +128,7 @@ namespace UAS_PLCDataReader
             this.PollSettingCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dpc_dename = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_interval = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PollSettingItemSearchLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
@@ -168,7 +169,7 @@ namespace UAS_PLCDataReader
             this.GridViewWorkCenterStatus = new UAS_PLCDataReader.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
             this.TimerDeviceStatus = new System.Windows.Forms.Timer(this.components);
             this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
-            this.dpc_dename = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.TimerUpdateDevice = new System.Windows.Forms.Timer(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -1215,6 +1216,14 @@ namespace UAS_PLCDataReader
             this.dpc_decode.VisibleIndex = 1;
             this.dpc_decode.Width = 90;
             // 
+            // dpc_dename
+            // 
+            this.dpc_dename.Caption = "设备名称";
+            this.dpc_dename.FieldName = "DPC_DENAME";
+            this.dpc_dename.Name = "dpc_dename";
+            this.dpc_dename.Visible = true;
+            this.dpc_dename.VisibleIndex = 2;
+            // 
             // dpc_interval
             // 
             this.dpc_interval.Caption = "轮询间隔(秒)";
@@ -1615,13 +1624,10 @@ namespace UAS_PLCDataReader
             // 
             this.CommonTipController.AutoPopDelay = 10000;
             // 
-            // dpc_dename
+            // TimerUpdateDevice
             // 
-            this.dpc_dename.Caption = "设备名称";
-            this.dpc_dename.FieldName = "DPC_DENAME";
-            this.dpc_dename.Name = "dpc_dename";
-            this.dpc_dename.Visible = true;
-            this.dpc_dename.VisibleIndex = 2;
+            this.TimerUpdateDevice.Interval = 20000;
+            this.TimerUpdateDevice.Tick += new System.EventHandler(this.TimerUpdateDevice_Tick);
             // 
             // Main
             // 
@@ -1822,5 +1828,6 @@ namespace UAS_PLCDataReader
         private DevExpress.XtraGrid.Columns.GridColumn de_sourcecode;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn dpc_dename;
+        private System.Windows.Forms.Timer TimerUpdateDevice;
     }
 }

PLCDataReader/Main.cs

@@ -31,6 +31,10 @@ namespace UAS_PLCDataReader
         List<string> SQL = new List<string>();
         //存放所有的设备返回的数据，用于比较
         public static Dictionary<string, Entity.Device> ReturnData = new Dictionary<string, Entity.Device>();
+        /// <summary>
+        /// 需要更新的设备列表
+        /// </summary>
+        public static Queue<Entity.Device> QueueUpdateDevice = new Queue<Entity.Device>();
 
         #region 初始化代码
         public Main()
@@ -124,6 +128,8 @@ namespace UAS_PLCDataReader
             ButtonAddNetConfig.Grid = GridDeviceNetSetting;
             ButtonSaveNetConfig.Grid = GridDeviceNetSetting;
 
+            TimerUpdateDevice.Start();
+
             Ptime = new Dictionary<int, PollingTimer>();
         }
         /// <summary>
@@ -276,6 +282,32 @@ namespace UAS_PLCDataReader
             }
             e.Handled = true;
         }
+
+        /// <summary>
+        /// 设备数据更新列表
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TimerUpdateDevice_Tick(object sender, EventArgs e)
+        {
+            Console.WriteLine("Begin" + QueueUpdateDevice.Count);
+            while (QueueUpdateDevice.Count > 0)
+            {
+                Entity.Device item = QueueUpdateDevice.Dequeue();
+                SQL.Clear();
+                //更新轮询状态
+                sql.Clear();
+                sql.Append("update DEVICEPOLLINGCONFIG set dpc_status='Running' where dpc_decode='" + item.Decode + "' and dpc_dccode='" + item.Dccode + "'");
+                dh.ExecuteSql(sql.ToString(), "update");
+                //更新轮询日志状态
+                sql.Clear();
+                sql.Append("update DEVICEPOLLINGLOG set dpg_status='Running',dpg_senddatasize=nvl(dpg_senddatasize,0)+" + item.SendDataSize);
+                sql.Append(",dpg_receivedatasize=nvl(dpg_receivedatasize,0)+" + item.ReceiveDataSize + ",dpg_count=nvl(dpg_count,0)+1 ");
+                sql.Append(" where dpg_id=(select max(dpg_id) from DEVICEPOLLINGLOG where dpg_decode='" + item.Decode + "')");
+                dh.ExecuteSql(sql.ToString(), "update");
+            }
+            Console.WriteLine("End" + QueueUpdateDevice.Count);
+        }
         #endregion
 
         #region PageCommandSet业务代码(指令设置)
@@ -398,6 +430,7 @@ namespace UAS_PLCDataReader
             }
         }
 
+        Dictionary<string, ModBusTCPClient> client = new Dictionary<string, ModBusTCPClient>();
         /// <summary>
         /// 轮询执行的业务
         /// </summary>
@@ -410,6 +443,7 @@ namespace UAS_PLCDataReader
             DataHelper dh = pl.Dh;
             string Decode = pl.DeviceCode;
             string Dccode = pl.CommandCode;
+            string DpcID = pl.Id.ToString();
             DataTable dt = (DataTable)dh.ExecuteSql("select dnc_ip,dnc_port from DEVICENETCONFIG where dnc_decode='" + Decode + "'", "select");
             DataTable dt1 = (DataTable)dh.ExecuteSql("select dc_sendcoding,dc_value,dc_receivecoding from devicecommand where dc_code='" + Dccode + "'", "select");
             if (dt.Rows.Count > 0)
@@ -426,20 +460,49 @@ namespace UAS_PLCDataReader
                     Command = dt1.Rows[0]["dc_value"].ToString();
                     SendCommandByteSize = Encoding.Default.GetBytes(Command.ToCharArray()).Length;
                 }
+                if (client.ContainsKey(DpcID))
+                {
+                    client[DpcID].Send(Command);
+                }
+                else
+                {
+                    ModBusTCPClient modclient = new ModBusTCPClient(dt.Rows[0]["dnc_ip"].ToString(), int.Parse(dt.Rows[0]["dnc_port"].ToString()));
+                    client.Add(DpcID, modclient);
+                }
                 //发送指令
-                mbt.Send(IP, SendCoding, ReceiveCoding, Command);
+                //mbt.Send(IP, SendCoding, ReceiveCoding, Command);
+                //如果不包含该项数据则在键值对中添加
+                if (!ReturnData.ContainsKey(Decode))
+                {
+                    //添加本地数据内容
+                    Entity.Device device = new Entity.Device();
+                    device.Decode = pl.DeviceCode;
+                    device.Dename = pl.DeviceName;
+                    device.StartTime = DateTime.Now;
+                    device.RunStatus = "Running";
+                    device.SendDataSize += SendCommandByteSize;
+                    device.SendCount += 1;
+                    device.Dccode = pl.CommandCode;
+                    ReturnData.Add(Decode, device);
+                }
+                else
+                {
+                    //每次更新轮询的数据
+                    ReturnData[Decode].SendDataSize += SendCommandByteSize;
+                    ReturnData[Decode].SendCount += 1;
+                    //检测键值对是否发生变化,发生变化时赋予新值
+                }
                 //成功返回了信息
-                if (mbt.Returnvalue.ContainsKey(IP))
+                if (client[DpcID].Returnvalue.ContainsKey(IP))
                 {
-                    int ReceiveCommandByteSize = Encoding.Default.GetBytes(mbt.Returnvalue[IP].ToCharArray()).Length;
+                    int ReceiveCommandByteSize = Encoding.Default.GetBytes(client[DpcID].Returnvalue[IP].ToCharArray()).Length;
                     //存放返回的所有数据
                     Dictionary<string, string> ItemData = new Dictionary<string, string>();
-                    int[] Arr = BaseUtil.GetDecimalData(BaseUtil.ASCIIToString(mbt.Returnvalue[IP]), 8);
+                    int[] Arr = BaseUtil.GetDecimalData(BaseUtil.ASCIIToString(client[DpcID].Returnvalue[IP]), 8);
                     for (int i = 0; i < Arr.Length; i++)
                     {
                         ItemData.Add("Item" + i, Arr[i].ToString());
                     }
-                    //如果不包含该项数据则在键值对中添加
                     if (!ReturnData.ContainsKey(Decode))
                     {
                         //添加本地数据内容
@@ -449,23 +512,27 @@ namespace UAS_PLCDataReader
                         device.StartTime = DateTime.Now;
                         device.RunStatus = "Running";
                         device.ReceiveDataSize += ReceiveCommandByteSize;
-                        device.SendDataSize += SendCommandByteSize;
-                        device.SendCount += 1;
+                        device.Dccode = pl.CommandCode;
                         device.ItemData = ItemData;
                         ReturnData.Add(Decode, device);
                     }
                     else
                     {
+                        if (ReturnData[Decode].ItemData == null)
+                        {
+                            ReturnData[Decode].ItemData = ItemData;
+                        }
+                        //每次更新轮询的数据
                         ReturnData[Decode].ReceiveDataSize += ReceiveCommandByteSize;
-                        ReturnData[Decode].SendDataSize += SendCommandByteSize;
-                        ReturnData[Decode].SendCount += 1;
                         //检测键值对是否发生变化,发生变化时赋予新值
                         if ((BaseUtil.CheckDicDiff(ReturnData[Decode].ItemData, ItemData)))
                         {
                             ReturnData[Decode].ItemData = ItemData;
+                            QueueUpdateDevice.Enqueue(ReturnData[Decode]);
+                            LogicHandler.DoDeviceDataDiffLog(pl.DeviceCode, pl.DeviceName, pl.CommandCode, User.UserName);
                         }
                     }
-                    mbt.Returnvalue.Remove(IP);
+                    client[DpcID].Returnvalue.Remove(IP);
                     //SQL.Clear();
                     ////更新轮询状态
                     //sql.Clear();
@@ -508,6 +575,7 @@ namespace UAS_PLCDataReader
             }
             PollSettingPaintRowIndex.Clear();
             GridPollingSetting.Focus();
+            client.Clear();
             Ptime.Clear();
         }
 
@@ -518,22 +586,14 @@ namespace UAS_PLCDataReader
                 GridViewPollSetting.SetRowCellValue(e.RowHandle, e.Column, e.Value);
                 if (GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_ENABLE").ToString() == "0")
                 {
-                    //DialogResult cancel = XtraMessageBox.Show("确认禁用该轮询？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-                    //if (cancel.ToString() == "Yes")
-                    //{
                     int id = int.Parse(GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_ID").ToString());
                     if (Ptime.ContainsKey(id))
                     {
                         Ptime[id].Stop();
                         Ptime.Remove(id);
+                        client.Remove(id.ToString());
                         PollSettingPaintRowIndex.Remove(e.RowHandle);
                     }
-                    //}
-                    //else
-                    //{
-                    //    Cancel = false;
-                    //    GridViewPollSetting.SetRowCellValue(e.RowHandle, e.Column, -1);
-                    //}
                 }
                 else
                 {

PLCDataReader/Main.resx

@@ -476,6 +476,9 @@
   <metadata name="CommonTipController.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>164, 18</value>
   </metadata>
+  <metadata name="TimerUpdateDevice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>360, 12</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAABMLAAATCwAAAAAAAAAA

PLCDataReader/PublicMethod/LogicHandler.cs

@@ -37,5 +37,16 @@ namespace UAS_PLCDataReader.PublicMethod
                 return false;
             }
         }
+
+        /// <summary>
+        /// 进行差异日志记录
+        /// </summary>
+        public static void DoDeviceDataDiffLog(string iDeCode, string iDeName, string iCommand, string iMan)
+        {
+            sql.Clear();
+            sql.Append("insert into DeviceRunRecord(drr_id,drr_decode,drr_dename,drr_command,drr_date,drr_doman,drr_remark)");
+            sql.Append("values(DeviceRunRecord_seq.nextval,'" + iDeCode + "','" + iDeName + "','" + iCommand + "',sysdate,'" + iMan + "','')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+        }
     }
 }

PLCDataReader/PublicMethod/ModBusTCPClient.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+namespace UAS_PLCDataReader.PublicMethod
+{
+    class ModBusTCPClient
+    {
+        private Socket socket;
+
+        private IPEndPoint serverFullAddr;//完整终端地址
+
+        private bool isOpen = false;
+
+        private bool receiveData;
+
+        private Dictionary<string, string> returnvalue = new Dictionary<string, string>();
+
+        public bool IsOpen
+        {
+            get
+            {
+                return isOpen;
+            }
+
+            set
+            {
+                isOpen = value;
+            }
+        }
+
+        public string IP
+        {
+            get
+            {
+                return iP;
+            }
+
+            set
+            {
+                iP = value;
+            }
+        }
+
+        public string Port
+        {
+            get
+            {
+                return port;
+            }
+
+            set
+            {
+                port = value;
+            }
+        }
+
+        public bool ReceiveData
+        {
+            get
+            {
+                return receiveData;
+            }
+
+            set
+            {
+                receiveData = value;
+            }
+        }
+
+        public Dictionary<string, string> Returnvalue
+        {
+            get
+            {
+                return returnvalue;
+            }
+
+            set
+            {
+                returnvalue = value;
+            }
+        }
+
+        private string iP;
+
+        private string port;
+
+        public ModBusTCPClient(string IP, int Port)
+        {
+            socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            serverFullAddr = new IPEndPoint(IPAddress.Parse(IP), Port);//设置IP，端口
+            try
+            {
+                socket.Connect(serverFullAddr);
+            }
+            catch (Exception)
+            {
+
+            }
+        }
+
+        public void Send(string Command)
+        {
+            Command = Command.Replace(" ", "");
+            byte[] arr = new byte[Command.Length / 2];
+            for (int i = 0; i < Command.Length / 2; i++)
+            {
+                arr[i] = (byte)Convert.ToInt32(Command.Substring(i * 2, 2), 16);
+            }
+            socket.Send(arr);
+            byte[] receive = new byte[1024 * 1024];
+            int length = socket.Receive(receive);
+            Console.WriteLine(BaseUtil.ByteToHexadecimalString(receive, length));
+            if (!returnvalue.ContainsKey(socket.RemoteEndPoint.ToString()))
+            {
+                returnvalue.Add(socket.RemoteEndPoint.ToString(), BaseUtil.ByteToHexadecimalString(receive, length));
+            }
+        }
+    }
+}

PLCDataReader/UAS_PLCDataReader.csproj

@@ -247,6 +247,7 @@
     <Compile Include="Device\Information\DeviceStatusInfo.Designer.cs">
       <DependentUpon>DeviceStatusInfo.cs</DependentUpon>
     </Compile>
+    <Compile Include="Entity\Device.cs" />
     <Compile Include="Entity\Polling.cs" />
     <Compile Include="Entity\SocketObject.cs" />
     <Compile Include="Entity\SystemInf.cs" />
@@ -274,6 +275,7 @@
     <Compile Include="PublicMethod\BaseUtil.cs" />
     <Compile Include="PublicMethod\LogicHandler.cs" />
     <Compile Include="PublicMethod\LogManager.cs" />
+    <Compile Include="PublicMethod\ModBusTCPClient.cs" />
     <Compile Include="PublicMethod\ModeBusTCPServer.cs" />
     <Compile Include="PublicMethod\PollingTask.cs" />
     <Compile Include="PublicMethod\PollingTimer.cs">