瀏覽代碼

修改项目结构

章政 7 年之前
父節點
當前提交
57452b809f

+ 0 - 104
PLCDataReader/ClassFile/BaseUtil.cs

@@ -1,104 +0,0 @@
-namespace ClassFile
-{
-    class BaseUtil
-    {
-        /// <summary>
-        /// 获取LRC
-        /// </summary>
-        /// <param name="SQL"></param>
-        public static string getLRC(string SENDMESSAGE)
-        {
-            string message = SENDMESSAGE.Trim();
-            if (message.Length % 2 != 0)
-            {
-                message = message + "0";
-            }
-
-            int LRC = 0x0;
-            for (int i = 0; i < message.Length; i = i + 2)
-            {
-                int inside = int.Parse(message.Substring(i, 1).ToString() + message.Substring(i + 1, 1).ToString(), System.Globalization.NumberStyles.HexNumber);
-                LRC += inside;
-            }
-            string _LRC = string.Format("{0:X2}", LRC);
-            string LRCre = "";
-            for (int i = 0; i < _LRC.Length; i++)
-            {
-                int index;
-                index = 0xF - int.Parse(_LRC.Substring(i, 1).ToString(), System.Globalization.NumberStyles.HexNumber);
-                LRCre += string.Format("{0:X}", index);
-            }
-
-            LRCre = string.Format("{0:X}", int.Parse(LRCre, System.Globalization.NumberStyles.HexNumber) + 1);
-
-            return LRCre;
-        }
-
-        public static string ASCIIToString(string ASCII)
-        {
-            string ReturnStr = "";
-            ASCII = ASCII.Replace(" ", "").Replace("3A", "").Replace("0D", "").Replace("0A", "");
-            System.Console.WriteLine(ASCII);
-            for (int i = 0; i < ASCII.Length; i = i + 2)
-            {
-                if (i + 2 < ASCII.Length)
-                {
-                    switch (ASCII.Substring(i, 2))
-                    {
-                        case "30":
-                            ReturnStr += "0";
-                            break;
-                        case "31":
-                            ReturnStr += "1";
-                            break;
-                        case "32":
-                            ReturnStr += "2";
-                            break;
-                        case "33":
-                            ReturnStr += "3";
-                            break;
-                        case "34":
-                            ReturnStr += "4";
-                            break;
-                        case "35":
-                            ReturnStr += "5";
-                            break;
-                        case "36":
-                            ReturnStr += "6";
-                            break;
-                        case "37":
-                            ReturnStr += "7";
-                            break;
-                        case "38":
-                            ReturnStr += "8";
-                            break;
-                        case "39":
-                            ReturnStr += "9";
-                            break;
-                        case "41":
-                            ReturnStr += "A";
-                            break;
-                        case "42":
-                            ReturnStr += "B";
-                            break;
-                        case "43":
-                            ReturnStr += "C";
-                            break;
-                        case "44":
-                            ReturnStr += "D";
-                            break;
-                        case "45":
-                            ReturnStr += "E";
-                            break;
-                        case "46":
-                            ReturnStr += "F";
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }
-            return ReturnStr;
-        }
-    }
-}

+ 0 - 1131
PLCDataReader/ClassFile/DataHelper.cs

@@ -1,1131 +0,0 @@
-using Oracle.ManagedDataAccess.Client;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Text;
-
-namespace ClassFile
-{
-    class DataHelper
-    {
-        //系统默认的的连接字符串
-        private string ConnectionStrings = UAS_PLCDataReader.Properties.Settings.Default.Properties["MES"].DefaultValue.ToString();
-        //用户选择的数据库的连接字符串
-        public static string DBConnectionString;
-        public static OracleConnection connection = null;
-        OracleCommand command = null;
-        int ReconnectTime = 0;
-        /// <summary>
-        /// 执行构造函数的时候打开数据库的链接
-        /// </summary>
-        public DataHelper()
-        {
-            try
-            {
-                //如果选择的是默认数据则直接用配置文件的信息连接,否则选择数据库的账套信息
-                if (DBConnectionString == null || DBConnectionString == ConnectionStrings)
-                    connection = new OracleConnection(ConnectionStrings);
-                else
-                    connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-            }
-            catch (Exception e) { /*LogManager.DoLog(e.Message);*/ }
-        }
-
-        /// <summary>
-        /// 根据表名获取该表字段数据类型
-        /// </summary>
-        public DataTable GetColumnDataType(string TableName)
-        {
-            DataTable dt = new DataTable();
-            command = new OracleCommand("select Column_Name,Data_Type from cols where TABLE_name=upper('" + TableName + "')", connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
-            ad.Dispose();
-            command.Dispose();
-            return dt;
-        }
-
-        /// <summary>
-        /// 获取第一行第一列的信息
-        /// </summary>
-        public object getFieldDataByCondition(string TableName, string Field, string Condition)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select " + Field + " from " + TableName + " where " + Condition;
-            command = new OracleCommand(sql, connection);
-            Console.WriteLine(sql);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter();
-            ad.SelectCommand = command;
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            ad.Dispose();
-            command.Dispose();
-            if (dt.Rows.Count > 0)
-            {
-                return dt.Rows[0][0];
-            }
-            else
-            {
-                return "";
-            }
-        }
-
-        /// <summary>
-        /// 执行打印的SQL
-        /// </summary>
-        /// <param name="SQL">SQL语句</param>
-        /// <param name="Parameters">动态添加的参数,主要根据条码枪扫描获取</param>
-        /// <returns></returns>
-        public object ExecutePrintSQL(string SQL, params string[] Parameters)
-        {
-            //按照?拆分数据,然后以:Param替换问号,同时添加参数
-            string[] Param = SQL.Split('?');
-            int ParamNum = Param.Length - 1;
-            //条码打印必然存在需要维护的参数
-            if (ParamNum > 0)
-            {
-                StringBuilder sb = new StringBuilder();
-                for (int i = 0; i < ParamNum; i++)
-                {
-                    sb.Append(Param[i] + ":Param" + i);
-                }
-                command = new OracleCommand(sb.ToString(), connection);
-
-                for (int i = 0; i < ParamNum; i++)
-                {
-                    command.Parameters.Add("Param" + i, OracleDbType.Varchar2, Parameters[i], ParameterDirection.Input);
-                }
-                OracleDataAdapter ad = new OracleDataAdapter(command);
-                DataTable dt = new DataTable();
-                ad.Fill(dt);
-                ad.Dispose();
-                command.Dispose();
-                return dt;
-            }
-            return "参数错误,请检查SQL语句";
-        }
-
-        /// <summary>
-        /// 获取指定表的记录的条数 ,带条件
-        /// </summary>
-        /// <returns></returns>
-        public int getRowCount(string TableName, string Condition)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select count(1) from " + TableName + " where " + Condition;
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
-            ad.Dispose();
-            command.Dispose();
-            return int.Parse(dt.Rows[0][0].ToString());
-        }
-
-        /// <summary>
-        /// 获取指定表的记录的条数 ,不带条件
-        /// </summary>
-        /// <param name="TableName"></param>
-        /// <returns></returns>
-        public int getRowCount(string TableName)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select count(1) from " + TableName;
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-
-            ad.Fill(dt);
-            ad.Dispose();
-            command.Dispose();
-            return int.Parse(dt.Rows[0][0].ToString());
-        }
-
-        /// <summary>
-        /// 通过表名和获取单行的记录
-        /// </summary>
-        public DataTable getFieldsDataByCondition(string TableName, string[] Fields, string Condition)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select ";
-            sql += AddField(Fields);
-            sql += " from " + TableName + " where " + Condition + " and rownum=1";
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            ad.Dispose();
-            command.Dispose();
-            return dt;
-        }
-
-        /// <summary>
-        /// 将DataTable导入到指定的表中
-        /// </summary>
-        /// <param name="DataTable"></param>
-        /// <param name="TableName"></param>
-        public void InsertDataTable(DataTable DataTable, string TableName)
-        {
-            for (int i = 0; i < DataTable.Rows.Count; i++)
-            {
-                for (int j = 0; j < DataTable.Columns.Count; j++)
-                {
-
-                }
-            }
-        }
-
-        /// <summary>
-        /// 按分页获取数据
-        /// </summary>
-        /// <param name="TableName">表名</param>
-        /// <param name="Fields">查询字段</param>
-        /// <param name="CurrentPage">当前页面</param>
-        /// <param name="PageSize">页面展示条数</param>
-        /// <param name="Caller"></param>
-        /// <returns></returns>
-        // SELECT * FROM (SELECT   A.*  FROM (SELECT* FROM datalist) A WHERE ROWNUM <= 50) WHERE ROWNUM >= 21
-        public DataTable getFieldsDatasByPageing(string TableName, string Fields, int CurrentPage, int PageSize, string Caller, params string[] condition)
-        {
-            DataTable dt = new DataTable();
-            StringBuilder sql = new StringBuilder();
-            //先查询出配置出去的列
-            //获取查询的列
-            string[] caption = GetCaptionFromField(Fields);
-            //获取对应列的描述
-            string[] field = GetField(Fields);
-            sql.Append(" select * from (select RowNum RN, A.* from (select ");
-            sql.Append(AddField(caption));
-            if (condition.Length > 0)
-            {
-                if (condition[0] != null && condition[0].Trim() != "")
-                    sql.Append(" from " + TableName + " where " + condition[0] + " ) A where ROWNUM <=" + CurrentPage * PageSize + ") where RN>" + (CurrentPage - 1) * PageSize);
-                else
-                    sql.Append(" from " + TableName + ") A where ROWNUM <= " + CurrentPage * PageSize + ") where RN> " + (CurrentPage - 1) * PageSize);
-            }
-            command = new OracleCommand(sql.ToString(), connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
-            ad.Dispose();
-            command.Dispose();
-            dt.Columns.RemoveAt(0);
-            foreach (DataColumn dc in dt.Columns)
-            {
-                dc.ColumnName = field[dt.Columns.IndexOf(dc)];
-                dc.Caption = caption[dt.Columns.IndexOf(dc)];
-            }
-            return dt;
-        }
-
-        /// <summary>
-        /// 通过表名,字段和条件获取DataTable类型的数据
-        /// </summary>
-        public DataTable getFieldsDatasByCondition(string TableName, string[] Fields, string Condition)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select ";
-            sql += AddField(Fields);
-            sql += " from " + TableName + " where " + Condition;
-            
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            ad.Dispose();
-            command.Dispose();
-            return dt;
-        }
-
-        /// <summary>
-        /// 通过表名,字段获取DataTable类型的数据
-        /// </summary>
-        public DataTable getFieldsDatas(string TableName, string Fields)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select ";
-            sql += Fields;
-            sql += " from " + TableName;
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.SelectCommand = command;
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            ad.Dispose();
-            command.Dispose();
-            return dt;
-        }
-
-        /// <summary>
-        /// 根据DataTable和指定的表名更新数据,如果需要保存新增的数据则需要传递一条Insert的SQL
-        /// </summary>
-        /// <param name="DataTable"></param>
-        /// <param name="TableName"></param>
-        /// <param name="Condition"></param>
-        public void UpDateTableByCondition(DataTable DataTable, string TableName, string PrimaryKey, params string[] sql)
-        {
-            if (DataTable == null)
-            {
-                return;
-            }
-            StringBuilder sb = new StringBuilder();
-            //预防插入的DataTable中存在不属于该表的列,在进行下一步操作之前全部剔除
-            DataTable data = (DataTable)ExecuteSql("select Column_Name,Data_Type from cols where TABLE_name=upper('" + TableName + "')", "select");
-            //将所有的字段拼接起来
-            for (int i = 0; i < data.Rows.Count; i++)
-            {
-                sb.Append("#" + data.Rows[i]["Column_Name"].ToString());
-            }
-            //移除掉所有不属于该表的列
-            for (int i = DataTable.Columns.Count - 1; i >= 0; i--)
-            {
-                if (!sb.ToString().Contains(DataTable.Columns[i].ColumnName.ToUpper()))
-                {
-                    DataTable.Columns.RemoveAt(i);
-                }
-            }
-            sb.Clear();
-            //计算有多少个是新加的行,根据主键为空来进行判断
-            int NewRowCount = 0;
-            for (int i = 0; i < DataTable.Rows.Count; i++)
-            {
-                if (DataTable.Rows[i][PrimaryKey] == null || DataTable.Rows[i][PrimaryKey].ToString() == "")
-                {
-                    NewRowCount = NewRowCount + 1;
-                }
-            }
-            if (sql.Length > 0)
-            {
-                if (NewRowCount > 0)
-                {
-                    //获取参数的个数
-                    int paramsNum = sql[0].Split(':').Length - 1;
-                    //解析参数的数据
-                    string[] param = GetParamFromSQL(sql[0]);
-                    //新建一个二维数组去
-                    string[][] param_array = new string[paramsNum][];
-                    //实例化每个一维数组
-                    for (int i = 0; i < paramsNum; i++)
-                    {
-                        param_array[i] = new string[NewRowCount];
-                    }
-                    //设置每列参数的索引
-                    int num = 0;
-                    //变量所有的行,如果有主键为空的则移除,不为空的进行参数的拼接
-                    for (int i = DataTable.Rows.Count - 1; i >= 0; i--)
-                    {
-                        if (DataTable.Rows[i][PrimaryKey] == null || DataTable.Rows[i][PrimaryKey].ToString() == "")
-                        {
-                            //当为新添加行的时候才去设置参数,设置过后索引+1
-                            for (int j = 0; j < paramsNum; j++)
-                            {
-                                param_array[j][num] = DataTable.Rows[i][param[j]].ToString();
-                            }
-                            DataTable.Rows.RemoveAt(i);
-                            num++;
-                        }
-                    }
-                    BatchInsertDataTable(sql[0], param, param_array);
-                }
-            }
-            //不是新增行的启用更新的方法
-            sb.Append("update " + TableName + " set ");
-            //拼接语句,特殊处理日期
-
-            foreach (DataColumn dc in DataTable.Columns)
-            {
-                if (!dc.DataType.ToString().Equals("System.DateTime"))
-                {
-                    sb.Append(dc.Caption + "=:" + dc.Caption + ",");
-                }
-                else
-                {
-                    sb.Append(dc.Caption + "=:" + dc.Caption + ",");
-                }
-            }
-            sb.Remove(sb.Length - 1, 1);
-            sb.Append(" where " + PrimaryKey + "=:" + PrimaryKey);
-            command = new OracleCommand(sb.ToString(), connection);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            // 参数的长度是DataTable的行数决定的
-            command.ArrayBindCount = DataTable.Rows.Count;
-            //默认全部是Varchar2类型的
-            OracleDbType ob = OracleDbType.Varchar2;
-            for (int i = 0; i < DataTable.Columns.Count; i++)
-            {
-                object[] param = new object[DataTable.Rows.Count];
-                for (int j = 0; j < DataTable.Rows.Count; j++)
-                {
-                    DateTime dt = DateTime.Now;
-                    if (DateTime.TryParse(DataTable.Rows[j][i].ToString(), out dt))
-                    {
-                        param[j] = dt;
-                        ob = OracleDbType.Date;
-                    }
-                    else
-                    {
-                        ob = OracleDbType.Varchar2;
-                        param[j] = DataTable.Rows[j][i];
-                    }
-                }
-                //添加批量更新的参数
-                command.Parameters.Add(new OracleParameter(DataTable.Columns[i].Caption, ob, param, ParameterDirection.Input));
-            }
-            ad.UpdateCommand = command;
-            ad.Update(DataTable);
-            ad.Dispose();
-            command.Dispose();
-        }
-
-        /// <summary>
-        /// 获取DbFind的数据的DataTable的结构
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="caller"></param>
-        /// <returns></returns>
-        public DataTable GetDbFindDataTable(string field, string caller)
-        {
-            string sql = "select * from dbfindsetui where ds_caller='" + caller + "' and ds_whichui='" + field + "'";
-            DataTable dt = (DataTable)ExecuteSql(sql, "select");
-            if (dt.Rows.Count != 0)
-            {
-                //通过#号分割字段
-                string[] dbfield = dt.Rows[0]["ds_findtoui"].ToString().Split('#');
-                string[] cnfield = dt.Rows[0]["ds_dbcaption"].ToString().Split('#');
-                //获取查询要查询的Table
-                string dbtable = dt.Rows[0]["ds_tables"].ToString();
-                //拼接查询的字段
-                for (int i = 0; i < dbfield.Length; i++)
-                {
-                    dbfield[i] = dbfield[i].Split(',')[0];
-                }
-                //新建一个空的DataTable
-                DataTable dt1 = new DataTable();
-                //往空的DataTable添加结构,ColumnName是中文,Caption是实际的字段名称
-                for (int i = 0; i < cnfield.Length; i++)
-                {
-                    dt1.Columns.Add(cnfield[i]);
-                    dt1.Columns[i].Caption = dbfield[i];
-                }
-                //返回一个带有结构的空的DataTable
-                //DbFind.BindTable1 = dbtable;
-                return dt1;
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// 检测内容是否存在
-        /// </summary>
-        /// <param name="TableName"></param>
-        /// <param name="Condition"></param>
-        /// <returns></returns>
-        public bool CheckExist(string TableName, string Condition)
-        {
-            string sql = "select count(1) from " + TableName + " where " + Condition;
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            DataTable dt = new DataTable();
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            ad.Dispose();
-            command.Dispose();
-            return int.Parse(dt.Rows[0][0].ToString()) > 0;
-        }
-
-        /// <summary>
-        /// 直接执行SQL,同时传入SQL的类型
-        /// </summary>
-        /// <param name="SQL"></param>
-        /// <param name="Type"></param>
-        /// <returns></returns>
-        public object ExecuteSql(string SQL, string Type, params object[] names)
-        {
-            object result = null;
-            command = new OracleCommand(SQL, connection);
-            Reconnect(command);
-            //用来拼接参数的
-            if (names.Length > 0)
-            {
-                string[] par = SQL.Split(':');
-                //用来存参数的数组
-                StringBuilder[] addpar = new StringBuilder[par.Length - 1];
-                for (int i = 0; i < par.Length - 1; i++)
-                {
-                    //新建一个char类型的数组用来存储每个字节的变量
-                    char[] c = par[i + 1].ToCharArray();
-                    addpar[i] = new StringBuilder();
-                    for (int j = 0; j < c.Length; j++)
-                    {
-                        if (c[j] != ' ' && c[j] != ',' && c[j] != ')')
-                        {
-                            addpar[i].Append(c[j]);
-                        }
-                        else
-                        {
-                            break;
-                        }
-                    }
-                }
-                for (int i = 0; i < addpar.Length; i++)
-                    command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
-            }
-            Console.WriteLine(SQL);
-            switch (Type.ToUpper())
-            {
-                case "SELECT":
-                    OracleDataAdapter ad = new OracleDataAdapter(command);
-                    result = new DataTable();
-                    try
-                    {
-                        ad.Fill((DataTable)result);
-                    }
-                    catch (Exception)
-                    {
-                        connection = new OracleConnection(DBConnectionString);
-                        connection.Open();
-                        command = new OracleCommand(SQL, connection);
-                        ad = new OracleDataAdapter();
-                        ad.SelectCommand = command;
-                        ad.Fill((DataTable)result);
-                    }
-                    break;
-                case "DELETE":
-                    try
-                    {
-                        result = command.ExecuteNonQuery();
-                    }
-                    catch (Exception)
-                    {
-                        command.Connection = new OracleConnection(DBConnectionString);
-                        command.Connection.Open();
-                        result = command.ExecuteNonQuery();
-                    }
-                    break;
-                case "UPDATE":
-                    try
-                    {
-                        result = command.ExecuteNonQuery();
-                    }
-                    catch (Exception)
-                    {
-                        command.Connection = new OracleConnection(DBConnectionString);
-                        command.Connection.Open();
-                        result = command.ExecuteNonQuery();
-                    }
-                    break;
-                case "INSERT":
-                    try
-                    {
-                        result = command.ExecuteNonQuery();
-                    }
-                    catch (Exception)
-                    {
-                        command.Connection = new OracleConnection(DBConnectionString);
-                        command.Connection.Open();
-                        result = command.ExecuteNonQuery();
-                    }
-                    break;
-            }
-            command.Dispose();
-            return result;
-        }
-
-        /// <summary>
-        /// 为了同步BS端的条码维护,检测时允许问号的存在,在检测时默认将问号换成:Param参数
-        /// </summary>
-        /// <param name="SQL"></param>
-        public void CheckSQL(string SQL)
-        {
-            SQL = SQL.Replace("?", ":Param");
-            command = new OracleCommand(SQL, connection);
-            command.ExecuteNonQuery();
-            command.Dispose();
-        }
-
-        public int GetDistinctRowCount(string TableName, string Field)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select distinct count('" + Field + "') from " + TableName;
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            ad.Dispose();
-            command.Dispose();
-            return int.Parse(dt.Rows[0][0].ToString());
-        }
-
-        /// <summary>
-        /// 根据Caller获取流水号
-        /// </summary>
-        /// <param name="Caller"></param>
-        /// <returns></returns>
-        public string GetSerialNumberByCaller(string Caller)
-        {
-            string SerialNumber = getFieldDataByCondition("MaxNumbers", "mn_number", "mn_tablename='" + Caller + "'").ToString();
-            UpdateByCondition("MaxNumbers", "mn_number=mn_number+1", "mn_tablename='" + Caller + "'");
-            return SerialNumber;
-        }
-
-        /// <summary>
-        /// 根据主键ID删除表的数据
-        /// </summary>
-        /// <param name="TableName">表名</param>
-        /// <param name="ID">主键</param>
-        /// <param name="DeleteID">需要删除主键ID的数组</param>
-        public void DeleteDataByID(string TableName, string ID, string[] DeleteID)
-        {
-            string sql = "delete from " + TableName + " where " + ID + " =:DeleteID";
-
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            command.ArrayBindCount = DeleteID.Length;
-            command.Parameters.Add(new OracleParameter("DeleteID", OracleDbType.Long, DeleteID, ParameterDirection.Input));
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
-            command.Dispose();
-        }
-
-        /// <summary>
-        /// 通过序列的名称获取序列
-        /// </summary>
-        /// <param name="SeqName"></param>
-        /// <returns></returns>
-        public string GetSEQ(string SeqName)
-        {
-            DataTable dt = new DataTable();
-            dt = (DataTable)ExecuteSql("SELECT " + SeqName + ".NEXTVAL FROM DUAL", "select");
-            return dt.Rows[0][0].ToString();
-        }
-
-        /// <summary>
-        /// 通过序列的名称获取序列
-        /// </summary>
-        /// <param name="SeqName"></param>
-        /// <returns></returns>
-        public string[] GetSEQ(string SeqName, int Num)
-        {
-            DataTable dt = new DataTable();
-            dt = (DataTable)ExecuteSql("SELECT " + SeqName + ".nextval  FROM DUAL CONNECT BY LEVEL<=" + Num, "select");
-            string[] SerialNum = new string[dt.Rows.Count];
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                SerialNum[i] = dt.Rows[i][0].ToString();
-            }
-            return SerialNum;
-        }
-
-        public void SaveDataTable(DataTable dt, string TableName, string ID, params string[] sql)
-        {
-            if (dt == null)
-            {
-                return;
-            }
-            StringBuilder sb = new StringBuilder();
-            //预防插入的DataTable中存在不属于该表的列,在进行下一步操作之前全部剔除
-            DataTable data = (DataTable)ExecuteSql("select Column_Name,Data_Type from cols where TABLE_name=upper('" + TableName + "')", "select");
-            //将所有的字段拼接起来
-            for (int i = 0; i < data.Rows.Count; i++)
-            {
-                sb.Append("#" + data.Rows[i]["Column_Name"].ToString());
-            }
-            //移除掉所有不属于该表的列
-            for (int i = dt.Columns.Count - 1; i >= 0; i--)
-            {
-                if (!sb.ToString().Contains(dt.Columns[i].ColumnName.ToUpper()))
-                {
-                    dt.Columns.RemoveAt(i);
-                }
-            }
-            sb.Clear();
-            //计算有多少个是新加的行,根据主键为空来进行判断
-            int NewRowCount = 0;
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                if (dt.Rows[i][ID] == null || dt.Rows[i][ID].ToString() == "")
-                {
-                    NewRowCount = NewRowCount + 1;
-                }
-            }
-            if (sql.Length > 0)
-            {
-                if (NewRowCount > 0)
-                {
-                    //获取参数的个数
-                    int paramsNum = sql[0].Split(':').Length - 1;
-                    //解析参数的数据
-                    string[] param = GetParamFromSQL(sql[0]);
-                    //新建一个二维数组去
-                    string[][] param_array = new string[paramsNum][];
-                    //实例化每个一维数组
-                    for (int i = 0; i < paramsNum; i++)
-                    {
-                        param_array[i] = new string[NewRowCount];
-                    }
-                    //设置每列参数的索引
-                    int num = 0;
-                    //变量所有的行,如果有主键为空的则移除,不为空的进行参数的拼接
-                    for (int i = dt.Rows.Count - 1; i >= 0; i--)
-                    {
-                        if (dt.Rows[i][ID] == null || dt.Rows[i][ID].ToString() == "")
-                        {
-                            //当为新添加行的时候才去设置参数,设置过后索引+1
-                            for (int j = 0; j < paramsNum; j++)
-                            {
-                                param_array[j][num] = dt.Rows[i][param[j]].ToString();
-                            }
-                            dt.Rows.RemoveAt(i);
-                            num++;
-                        }
-                    }
-                    BatchInsertDataTable(sql[0], param, param_array);
-                }
-            }
-            sb.Clear();
-            sb.Append("update " + TableName + " set ");
-            int ColumnCount = dt.Columns.Count;
-            int RowCount = dt.Rows.Count;
-            //存数据的参数
-            List<string[]> Parameter = new List<string[]>();
-            //存参数名的参数
-            string[] ParName = new string[ColumnCount];
-            for (int i = 0; i < ColumnCount; i++)
-            {
-                ParName[i] = dt.Columns[i].ColumnName;
-                if (i == dt.Columns.Count - 1)
-                    sb.Append(dt.Columns[i].ColumnName + "=:" + dt.Columns[i].ColumnName);
-                else
-                    sb.Append(dt.Columns[i].ColumnName + "=:" + dt.Columns[i].ColumnName + ",");
-            }
-            sb.Append(" where " + ID + " =:" + ID);
-            //先添加参数
-            Parameter.Add(ParName);
-            //添加参数的具体内容
-            for (int i = 0; i < ColumnCount; i++)
-            {
-                string[] par = new string[RowCount];
-                for (int j = 0; j < RowCount; j++)
-                {
-                    par[j] = dt.Rows[j][i].ToString();
-                }
-                Parameter.Add(par);
-            }
-            BatchInsert(sb.ToString(), Parameter.ToArray());
-        }
-
-        /// <summary>
-        /// 批量通过SQL来执行插入操作 ,参数的第一个数一个string[]数组,用来传递需要添加的参数的名称
-        /// 之后的是名称参数数组对应的 ,所有的插入参数数据长度必须是一致的
-        /// </summary>
-        /// <param name="sql"></param>
-        /// <param name="names"></param>
-        public void BatchInsert(string sql, params object[][] names)
-        {
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            command.ArrayBindCount = names[1].Length;
-
-            //因为第一个数组保存的是参数的名称,所以循环从1而不是0开始
-            //将第一个数组的下标固定为0作为循环添加的参数的名称
-            for (int i = 1; i <= names[0].Length; i++)
-            {
-                command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
-            }
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
-            command.Dispose();
-        }
-
-        public void BatchInsertDataTable(string sql, string[] param, params object[][] param1)
-        {
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            command.ArrayBindCount = param1[0].Length;
-            //因为第一个数组保存的是参数的名称,所以循环从1而不是0开始
-            //将第一个数组的下标固定为0作为循环添加的参数的名称
-            for (int i = 0; i < param.Length; i++)
-            {
-                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, param1[i], ParameterDirection.Input));
-            }
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
-            command.Dispose();
-        }
-
-        /// <summary>
-        /// 取Configs表中的配置,进行该客户是否执行某个操作
-        /// </summary>
-        /// <param name="Code"></param>
-        /// <param name="Caller"></param>
-        /// <returns></returns>
-        public object GetConfig(string Code, string Caller)
-        {
-            DataTable dt = new DataTable();
-            string sql = "select Data from configs where code='" + Code + "' and caller='" + Caller + "'";
-            dt = (DataTable)ExecuteSql(sql, "select");
-            if (dt.Rows.Count == 0)
-            {
-                return "";
-            }
-            else
-            {
-                return dt.Rows[0]["Data"];
-            }
-        }
-
-
-        //将数据类型的列类型转换为DataTable
-        public DataTable DataTypeColumnToDataTable(DataTable dt)
-        {
-            DataTable dt1 = new DataTable();
-            dt1.Rows.Add();
-            foreach (DataRow dr in dt.Rows)
-            {
-                dt1.Columns.Add(dr[0].ToString());
-                int index = dt.Rows.IndexOf(dr);
-                if (dr[1].ToString() == "NUMBER")
-                {
-                    dt1.Rows[0][index] = 0;
-                }
-                if (dr[1].ToString() == "VARCHAR2")
-                {
-                    dt1.Rows[0][index] = "这是一段文字";
-                }
-                if (dr[1].ToString() == "DATE")
-                {
-                    dt1.Rows[0][index] = DateTime.Now.ToString("yyyy-MM-dd");
-                }
-                if (dr[1].ToString() == "FLOAT")
-                {
-                    dt1.Rows[0][index] = 1.0;
-                }
-                if (dr[1].ToString() == "CLOB")
-                {
-                    dt1.Rows[0][index] = "一段长文字";
-                }
-            }
-            return dt1;
-        }
-
-
-        /// <summary>
-        /// 通过条件更新
-        /// </summary>
-        /// <param name="TableName"></param>
-        /// <param name="update"></param>
-        /// <param name="condition"></param>
-        public string UpdateByCondition(string TableName, string update, string condition)
-        {
-            string sql = "update " + TableName + " set " + update + " where " + condition;
-            command = new OracleCommand(sql, connection);
-            Console.WriteLine(sql);
-            Reconnect(command);
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
-            command.Dispose();
-            return sql;
-        }
-
-        /// <summary>
-        /// 调用存储过程
-        /// </summary>
-        /// <param name="ProcedureName"></param>    
-        /// <param name="param"></param>
-        public void CallProcedure(string ProcedureName, ref string[] param)
-        {
-            command = new OracleCommand(ProcedureName);
-            command.Connection = connection;
-            Reconnect(command);
-            command.CommandText = ProcedureName;
-            command.CommandType = CommandType.StoredProcedure;
-            for (int i = 0; i < param.Length; i++)
-                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 200, param[i], ParameterDirection.InputOutput));
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
-            for (int i = 0; i < command.Parameters.Count; i++)
-                param[i] = command.Parameters[i].Value.ToString();
-            command.Dispose();
-        }
-
-        /// <summary>
-        /// 出现异常进行回滚的执行方法
-        /// </summary>
-        /// <param name="SQL"></param>
-        public void ExecuteSQLTran(params string[] SQL)
-        {
-            OracleTransaction tx = connection.BeginTransaction();
-            command = new OracleCommand();
-            command.Connection = connection;
-            command.Transaction = tx;
-            try
-            {
-                foreach (string sql in SQL)
-                {
-
-                    if (!String.IsNullOrEmpty(sql))
-                    {
-                        Console.WriteLine(sql);
-                        command.CommandText = sql;
-                        try
-                        {
-                            command.ExecuteNonQuery();
-                        }
-                        catch (Exception)
-                        {
-                            command.Connection = new OracleConnection(DBConnectionString);
-                            command.Connection.Open();
-                            command.ExecuteNonQuery();
-                        }
-                    }
-                }
-                tx.Commit();
-            }
-            catch (Exception E)
-            {
-                tx.Rollback();
-                throw new Exception(E.Message);
-            }
-            command.Dispose();
-        }
-
-        /// <summary>
-        /// 用于将string 的数组转换成SQL的查询内容
-        /// </summary>
-        /// <param name="Fields"></param>
-        /// <returns></returns>
-        private string AddField(string[] Fields)
-        {
-            string sql = " ";
-            foreach (string field in Fields)
-            {
-                sql += field + ",";
-            }
-            return sql.Substring(0, sql.Length - 1);
-        }
-        /// <summary>
-        /// 通过查询的内容获取到字段的描述
-        /// </summary>
-        /// <param name="field"></param>
-        /// <returns></returns>
-        private static string[] GetCaptionFromField(string field)
-        {
-            string[] caption = field.Split(',');
-            for (int i = 0; i < caption.Length; i++)
-            {
-                caption[i] = caption[i].Substring(0, caption[i].LastIndexOf("as")).Trim();
-            }
-            return caption;
-        }
-
-        /// <summary>
-        /// 通过查询的语句获取查询的字段
-        /// </summary>
-        /// <param name="field"></param>
-        /// <returns></returns>
-        private static string[] GetField(string field)
-        {
-            string[] fields = field.Split(',');
-            for (int i = 0; i < fields.Length; i++)
-            {
-                fields[i] = fields[i].Substring(fields[i].LastIndexOf("as") + 2, fields[i].Length - fields[i].LastIndexOf("as") - 2).Trim();
-            }
-            return fields;
-        }
-
-        public object GetLabelParam(string sql)
-        {
-            DataTable dt = new DataTable();
-            command = new OracleCommand(sql, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter();
-            ad.SelectCommand = command;
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
-            if (dt.Rows.Count > 0)
-            {
-                ad.Dispose();
-                command.Dispose();
-                return dt.Rows[0][0];
-            }
-            else
-            {
-                command.Dispose();
-                return "";
-            }
-        }
-
-        public static string[] GetParamFromSQL(string SQL)
-        {
-            string[] par = SQL.Split(':');
-            //用来存参数的数组
-            StringBuilder[] addpar = new StringBuilder[par.Length - 1];
-            string[] param = new string[par.Length - 1];
-            for (int i = 0; i < par.Length - 1; i++)
-            {
-                //新建一个char类型的数组用来存储每个字节的变量
-                char[] c = par[i + 1].ToCharArray();
-                addpar[i] = new StringBuilder();
-
-                for (int j = 0; j < c.Length; j++)
-                {
-                    if (c[j] != ' ' && c[j] != ',' && c[j] != ')')
-                    {
-                        addpar[i].Append(c[j]);
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-            }
-            for (int i = 0; i < par.Length - 1; i++)
-            {
-                param[i] = addpar[i].ToString();
-            }
-            return param;
-        }
-
-        public void Dispose()
-        {
-
-        }
-
-        private void Reconnect(OracleCommand cmd)
-        {
-            if (cmd.Connection.State == ConnectionState.Closed)
-            {
-                cmd.Connection.Open();
-                //LogManager.DoLog("超时重连");
-            }
-        }
-    }
-}

+ 0 - 66
PLCDataReader/ClassFile/LogManager.cs

@@ -1,66 +0,0 @@
-using System;
-using System.IO;
-
-namespace ClassFile
-{
-    class LogManager
-    {
-        public static string LogAddress = @"C:\LogInfo\";
-        /// <summary>
-        /// 记录操作
-        /// </summary>
-        /// <param name="Message"></param>
-        public static void DoLog(string Message)
-        {
-            try
-            {
-                StreamWriter sw = File.AppendText(LogAddress + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                sw.WriteLine("\n【时间】" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\n");
-                sw.WriteLine("【消息】" + Message + "\n");
-                sw.WriteLine("---------------------------------------------------------------------------------------------------------------");
-                sw.Close();
-            }
-            catch (Exception) { }
-        }
-
-        /// <summary>
-        /// 记录操作和SQL
-        /// </summary>
-        /// <param name="Message"></param>
-        /// <param name="SQL"></param>
-        public static void DoLog(string Message, string SQL)
-        {
-            try
-            {
-                StreamWriter sw = File.AppendText(LogAddress + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                sw.WriteLine("\n【时间】" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\n");
-                sw.WriteLine("【消息】" + Message + "\n");
-                sw.WriteLine("【SQL】" + SQL + "\n");
-                sw.WriteLine("---------------------------------------------------------------------------------------------------------------");
-                sw.Close();
-            }
-            catch (Exception) { }
-        }
-
-        /// <summary>
-        /// 记录SQL
-        /// </summary>
-        /// <param name="SQL"></param>
-        public static void DoSQLLog(string SQL)
-        {
-            try
-            {
-                StreamWriter sw = File.AppendText(LogAddress + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                sw.WriteLine("\n【时间】" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\n");
-                sw.WriteLine("【SQL】" + SQL + "\n");
-                sw.WriteLine("---------------------------------------------------------------------------------------------------------------");
-                sw.Close();
-            }
-            catch (Exception) { }
-        }
-
-
-
-       
-    }
-}

+ 1 - 2
PLCDataReader/MainWindow.cs

@@ -2,8 +2,7 @@
 using System.Windows.Forms;
 using System.Net;
 using System.Net.Sockets;
-using ClassFile;
-using System.Text;
+using UAS_PLCDataReader.PublicMethod;
 
 namespace UAS_PLCDataReader
 {

+ 1 - 1
PLCDataReader/Program.cs

@@ -4,7 +4,7 @@ using System.Security.Principal;
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-using ClassFile;
+using UAS_PLCDataReader.PublicMethod;
 
 namespace UAS_PLCDataReader
 {

+ 2 - 3
PLCDataReader/Properties/Settings.Designer.cs

@@ -26,9 +26,8 @@ namespace UAS_PLCDataReader.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES_PROD;Pool" +
-            "ing=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=21" +
-            "8.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));" +
-            "")]
+            "ing=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=19" +
+            "2.168.253.6)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

+ 1 - 1
PLCDataReader/Properties/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="MES" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES_PROD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES_PROD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.253.6)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
   </Settings>
 </SettingsFile>

+ 87 - 0
PLCDataReader/PublicMethod/BaseUtil.cs

@@ -8,6 +8,7 @@ using System.Windows.Forms;
 using UAS_PLCDataReader.DataOperate;
 using DevExpress.Utils;
 using UAS_PLCDataReader.CustomerControl.ValueLabel;
+using System.Collections.Generic;
 
 namespace UAS_PLCDataReader.PublicMethod
 {
@@ -269,5 +270,91 @@ namespace UAS_PLCDataReader.PublicMethod
                 }
             }
         }
+
+        public static string ASCIIToString(string ASCII)
+        {
+            string ReturnStr = "";
+            ASCII = ASCII.Replace(" ", "").Replace("3A", "").Replace("0D", "").Replace("0A", "");
+            for (int i = 0; i < ASCII.Length; i = i + 2)
+            {
+                if (i + 2 < ASCII.Length)
+                {
+                    switch (ASCII.Substring(i, 2))
+                    {
+                        case "30":
+                            ReturnStr += "0";
+                            break;
+                        case "31":
+                            ReturnStr += "1";
+                            break;
+                        case "32":
+                            ReturnStr += "2";
+                            break;
+                        case "33":
+                            ReturnStr += "3";
+                            break;
+                        case "34":
+                            ReturnStr += "4";
+                            break;
+                        case "35":
+                            ReturnStr += "5";
+                            break;
+                        case "36":
+                            ReturnStr += "6";
+                            break;
+                        case "37":
+                            ReturnStr += "7";
+                            break;
+                        case "38":
+                            ReturnStr += "8";
+                            break;
+                        case "39":
+                            ReturnStr += "9";
+                            break;
+                        case "41":
+                            ReturnStr += "A";
+                            break;
+                        case "42":
+                            ReturnStr += "B";
+                            break;
+                        case "43":
+                            ReturnStr += "C";
+                            break;
+                        case "44":
+                            ReturnStr += "D";
+                            break;
+                        case "45":
+                            ReturnStr += "E";
+                            break;
+                        case "46":
+                            ReturnStr += "F";
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            return ReturnStr;
+        }
+
+        public static int[] GetDecimalData(string HexStr, int DataSize)
+        {
+            //去除前面的指令字符和数据长度字符
+            HexStr = HexStr.Replace(":", "");
+            string RealData = HexStr.Substring(6);
+            List<int> ReturnData = new List<int>();
+            //每个地址位存的数据是DataSize个
+            for (int i = 0; i < RealData.Length; i = i + DataSize)
+            {
+                if (i + DataSize < RealData.Length)
+                {
+                    if (Convert.ToInt32("0x" + (RealData.Substring(i, DataSize).Substring(0, 4)), 16) / 1 != 0)
+                        ReturnData.Add(Convert.ToInt32("0x" + (RealData.Substring(i, DataSize).Substring(0, 4)), 16));
+                    else
+                        break;
+                }
+            }
+            return ReturnData.ToArray();
+        }
     }
 }

+ 7 - 5
PLCDataReader/PublicMethod/ModeBusTCPServer.cs

@@ -106,9 +106,10 @@ namespace UAS_PLCDataReader.PublicMethod
                 IPHostEntry IpEntry = Dns.GetHostEntry(Dns.GetHostName());
                 for (int i = 0; i < IpEntry.AddressList.Length; i++)
                 {
-                    if (IpEntry.AddressList[i].AddressFamily == AddressFamily.InterNetwork) {
-                        if(IpEntry.AddressList[i].ToString().Contains("192.168.127.20"))
-                        iP = IpEntry.AddressList[i].ToString();
+                    if (IpEntry.AddressList[i].AddressFamily == AddressFamily.InterNetwork)
+                    {
+                        if (IpEntry.AddressList[i].ToString().Contains("192.168.127.20"))
+                            iP = IpEntry.AddressList[i].ToString();
                     }
                 }
                 //定义一个套接字用于监听客户端发来的信息  包含3个参数(IP4寻址协议,流式连接,TCP协议)
@@ -121,7 +122,7 @@ namespace UAS_PLCDataReader.PublicMethod
                 socketWatch.Bind(endpoint);
                 //将套接字的监听队列长度限制为20
                 socketWatch.Listen(20);
-                Task.Factory.StartNew(WatchConnecting,TaskCreationOptions.LongRunning);
+                Task.Factory.StartNew(WatchConnecting, TaskCreationOptions.LongRunning);
                 ////创建一个监听线程 
                 //threadWatch = new Thread(WatchConnecting);
                 ////将窗体线程设置为与后台同步
@@ -176,7 +177,7 @@ namespace UAS_PLCDataReader.PublicMethod
                                         string hexOutput = String.Format("{0:X}", value);
                                         strH += hexOutput + " ";
                                     }
-                                    item.Send(Encoding.UTF8.GetBytes(strH));
+                                    item.Send(arr);
                                     break;
                             }
                         }
@@ -250,6 +251,7 @@ namespace UAS_PLCDataReader.PublicMethod
                 //将接收到的信息存入到内存缓冲区,并返回其字节数组的长度    
                 try
                 {
+
                     int length = socketServer.Receive(arrServerRecMsg);
                     if (length == 0)
                     {

+ 0 - 4
PLCDataReader/UAS_PLCDataReader.csproj

@@ -179,9 +179,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClassFile\BaseUtil.cs" />
-    <Compile Include="ClassFile\DataHelper.cs" />
-    <Compile Include="ClassFile\LogManager.cs" />
     <Compile Include="CustomerControl\AutoDataGridControl\AutoDataGridControl.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -272,7 +269,6 @@
     <Compile Include="MainWindow.Designer.cs">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="ClassFile\ModeBusTCPServer.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PublicMethod\BaseUtil.cs" />

+ 1 - 1
PLCDataReader/app.config

@@ -8,7 +8,7 @@
     <userSettings>
         <UAS_PLCDataReader.Properties.Settings>
             <setting name="MES" serializeAs="String">
-                <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES_PROD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+                <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES_PROD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.253.6)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
             </setting>
         </UAS_PLCDataReader.Properties.Settings>
     </userSettings>

+ 3 - 4
PLCDataReader/ClassFile/ModeBusTCPServer.cs → TestProject/ModeBusTCPServer.cs

@@ -5,9 +5,8 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
-using UAS_PLCDataReader;
 
-namespace ClassFile
+namespace TestProject
 {
     class ModeBusTCPServer
     {
@@ -147,11 +146,11 @@ namespace ClassFile
                                     }
                                     item.Send(Encoding.UTF8.GetBytes(strH));
                                     break;
-                            }                        
+                            }
                         }
                     }
                     else
-                    {   
+                    {
                         int index = SelectIP.Items.IndexOf(item.RemoteEndPoint.ToString());
                         SelectIP.Items.RemoveAt(index);
                         if (SelectIP.Items.Count > 0)