ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Siemens/SiemensS7Communicator.cs
@@ -70,6 +70,12 @@
        private ILogNet _logNet;
        private bool _isPing = true;
        /// <summary>
        /// æ˜¯å¦åœ¨å†™å…¥æ•°æ®åŽè¯»å–数据确认。
        /// </summary>
        public override bool IsReadAfterWrite { get; set; } = true;
        #endregion Private Member
        #region Public Member
@@ -239,30 +245,48 @@
            }
        }
        private object Read(string address, TypeCode typeCode)
        private object Read(string address, TypeCode typeCode, ushort length = 1)
        {
            try
            {
                switch (typeCode)
                {
                    case TypeCode.Int32:
                        return (int)GetContent(plc.ReadInt32(address), address);
                        if (length > 1)
                            return (int[])GetContent(plc.ReadInt32(address, length), address);
                        else
                            return (int)GetContent(plc.ReadInt32(address), address);
                    case TypeCode.UInt32:
                        return (uint)GetContent(plc.ReadUInt32(address), address);
                        if (length > 1)
                            return (uint[])GetContent(plc.ReadUInt32(address, length), address);
                        else
                            return (uint)GetContent(plc.ReadUInt32(address), address);
                    case TypeCode.Int16:
                        return (short)GetContent(plc.ReadInt16(address), address);
                        if (length > 1)
                            return (short[])GetContent(plc.ReadInt16(address, length), address);
                        else
                            return (short)GetContent(plc.ReadInt16(address), address);
                    case TypeCode.UInt16:
                        return (ushort)GetContent(plc.ReadUInt16(address), address);
                        if (length > 1)
                            return (ushort[])GetContent(plc.ReadUInt16(address, length), address);
                        else
                            return (ushort)GetContent(plc.ReadUInt16(address), address);
                    case TypeCode.Single:
                        return (float)GetContent(plc.ReadFloat(address), address);
                        if (length > 1)
                            return (float[])GetContent(plc.ReadFloat(address, length), address);
                        else
                            return (float)GetContent(plc.ReadFloat(address), address);
                    case TypeCode.Boolean:
                        return (bool)GetContent(plc.ReadBool(address), address);
                        if (length > 1)
                            return (bool[])GetContent(plc.ReadBool(address, length), address);
                        else
                            return (bool)GetContent(plc.ReadBool(address), address);
                    case TypeCode.Byte:
                        return (byte)GetContent(plc.ReadByte(address), address);
                        return (byte[])GetContent(plc.Read(address, length), address);
                    case TypeCode.String:
                        return (string)GetContent(plc.ReadString(address), address);
                        return (string)GetContent(plc.ReadString(address, length), address);
                    case TypeCode.Char:
                        return (char)GetContent(plc.ReadByte(address), address);
                        return (char[])GetContent(plc.Read(address, length), address);
                    default:
                        throw new CommunicationException(string.Format(CommunicationExceptionMessage.DataTypeErrorException, typeCode.ToString(), address), CommunicationErrorType.TypeError);
                }
@@ -391,6 +415,19 @@
        }
        /// <summary>
        /// ä»ŽPLC读取数据。
        /// </summary>
        /// <typeparam name="T">读取数据的类型泛型。</typeparam>
        /// <param name="address">源地址,具体格式取决于使用的工业协议。</param>
        /// <param name="length">读取的长度。</param>
        /// <returns>读取到的数据,如果读取失败则可能返回null或抛出异常。</returns>
        public override T[] Read<T>(string address, ushort length)
        {
            Type type = typeof(T);
            return (T[])Read(address, Type.GetTypeCode(type), length);
        }
        /// <summary>
        /// ä»ŽPLC读取数据返回object。
        /// </summary>
        /// <param name="address">源地址,具体格式取决于使用的工业协议。</param>
@@ -446,6 +483,18 @@
            return GetResult(Write(address, value), address, value);
        }
        /// <summary>
        /// å‘PLC写入数据。
        /// </summary>
        /// <typeparam name="T">写入数据的类型泛型。</typeparam>
        /// <param name="address">源地址,具体格式取决于使用的工业协议。</param>
        /// <param name="values">要写入的数据。</param>
        /// <returns>如果写入成功则返回true,否则抛出异常。</returns>
        public override bool Write<T>(string address, T[] values)
        {
            return GetResult(Write(address, values), address, values);
        }
        public override bool WriteNoRead<T>(string address, T value)
        {
            OperateResult operate= Write(address, value);