解决冲突

chengsc

2024-09-12 4683c8a19e593e8f999c6f1a145e0bb73eb20dea

 Admin.NET/WCS.Application/PLC/PLCUtil.cs

@@ -1,4 +1,5 @@
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Drawing;
using Elastic.Clients.Elasticsearch;
using IoTClient;
using IoTClient.Clients.Modbus;
@@ -11,19 +12,21 @@
public class PLCUtil
{
    public readonly long PlcId;
    public readonly string PlcIP;
    private SiemensClient _client;
    private WcsPlc _modPlc;

    private readonly object OLock = new object();
    public PLCUtil(WcsPlc modPlc)
    {
        PlcId = modPlc.Id;
        PlcIP = modPlc.IP;
        _modPlc = modPlc;
        _client = new SiemensClient((SiemensVersion)modPlc.PLCType, modPlc.IP, modPlc.Port);
        _client.Open();
    }
    public bool Connected()
    public bool Connected
    {
        return _client.Connected;
        get { return _client.Connected; }
    }
    public IoTClient.Result Open()
    {
@@ -39,55 +42,73 @@
    /// <param name="DbNumber">DB区指定值</param>
    /// <param name="PosType">字符类型</param>
    /// <param name="Pos">偏移量/地址</param>
    /// <param name="Length">长度（字符串）</param>
    /// <returns></returns>
    public (IoTClient.Result, dynamic value) GetPlcDBValue(PLCDataTypeEnum PosType, string DbNumber, string Pos)
    public (IoTClient.Result, dynamic value) GetPlcDBValue(PLCDataTypeEnum PosType, string DbNumber, string Pos, int? Length = 0)
    {
        string address;
        if (DbNumber.StartsWith("DB"))
            address = DbNumber + "." + Pos;
        else
            address = DbNumber + Pos;
        dynamic result = null;
        switch (PosType)
        lock (OLock)
        {
            case PLCDataTypeEnum.Bit:
                result = _client.ReadBoolean(address);
                break;
            case PLCDataTypeEnum.Byte:
                result = _client.ReadByte(address);
                break;
            case PLCDataTypeEnum.Short:
                result = _client.ReadInt16(address);
                break;
            case PLCDataTypeEnum.UShort:
                result = _client.ReadUInt16(address);
                break;
            case PLCDataTypeEnum.Int:
                result = _client.ReadInt32(address);
                break;
            case PLCDataTypeEnum.UInt:
                result = _client.ReadUInt32(address);
                break;
            case PLCDataTypeEnum.Long:
                result = _client.ReadInt64(address);
                break;
            case PLCDataTypeEnum.ULong:
                result = _client.ReadUInt64(address);
                break;
            case PLCDataTypeEnum.Float:
                result = _client.ReadFloat(address);
                break;
            case PLCDataTypeEnum.Double:
                result = _client.ReadDouble(address);
                break;
            case PLCDataTypeEnum.String:
                result = _client.ReadString(address);
                break;
            default:
                result = new IoTClient.Result<object>();
                break;
            string address;
            if (DbNumber.StartsWith("DB"))
                address = DbNumber + "." + Pos;
            else
                address = DbNumber + Pos;
            return this.GetPlcDBValue(PosType, address, Length);
        }
        return (result, result.Value);
    }
    /// <summary>
    /// 读取PLC值
    /// </summary>
    /// <param name="PosType">字符类型</param>
    /// <param name="Pos">偏移量/地址</param>
    /// <param name="Length">长度（字符串）</param>
    /// <returns></returns>
    public (IoTClient.Result, dynamic value) GetPlcDBValue(PLCDataTypeEnum PosType, string Pos, int? Length = 0)
    {
        lock (OLock)
        {
            dynamic result = null;
            switch (PosType)
            {
                case PLCDataTypeEnum.Bit:
                    result = _client.ReadBoolean(Pos);
                    break;
                case PLCDataTypeEnum.Byte:
                    result = _client.ReadByte(Pos);
                    break;
                case PLCDataTypeEnum.Short:
                    result = _client.ReadInt16(Pos);
                    break;
                case PLCDataTypeEnum.UShort:
                    result = _client.ReadUInt16(Pos);
                    break;
                case PLCDataTypeEnum.Int:
                    result = _client.ReadInt32(Pos);
                    break;
                case PLCDataTypeEnum.UInt:
                    result = _client.ReadUInt32(Pos);
                    break;
                case PLCDataTypeEnum.Long:
                    result = _client.ReadInt64(Pos);
                    break;
                case PLCDataTypeEnum.ULong:
                    result = _client.ReadUInt64(Pos);
                    break;
                case PLCDataTypeEnum.Float:
                    result = _client.ReadFloat(Pos);
                    break;
                case PLCDataTypeEnum.Double:
                    result = _client.ReadDouble(Pos);
                    break;
                case PLCDataTypeEnum.String:
                    result = _client.ReadString(Pos, Convert.ToUInt16(Length));
                    break;
                default:
                    result = new IoTClient.Result<object>();
                    break;
            }
            return (result, result.Value);
        }
    }
    /// <summary>
    /// 批量读取PLC值
@@ -95,49 +116,52 @@
    /// <returns></returns>
    public Result<Dictionary<string, object>> GetPlcBatchDBValue(Dictionary<string, PLCDataTypeEnum> listaddress)
    {
        Dictionary<string, DataTypeEnum> addresses = new Dictionary<string, DataTypeEnum>();
        foreach (var address in listaddress)
        lock (OLock)
        {
            switch (address.Value)
            Dictionary<string, DataTypeEnum> addresses = new Dictionary<string, DataTypeEnum>();
            foreach (var address in listaddress)
            {
                case PLCDataTypeEnum.Bit:
                    addresses.Add(address.Key, DataTypeEnum.Bool);
                    break;
                case PLCDataTypeEnum.Byte:
                    addresses.Add(address.Key, DataTypeEnum.Byte);
                    break;
                case PLCDataTypeEnum.Short:
                    addresses.Add(address.Key, DataTypeEnum.Int16);
                    break;
                case PLCDataTypeEnum.UShort:
                    addresses.Add(address.Key, DataTypeEnum.UInt16);
                    break;
                case PLCDataTypeEnum.Int:
                    addresses.Add(address.Key, DataTypeEnum.Int32);
                    break;
                case PLCDataTypeEnum.UInt:
                    addresses.Add(address.Key, DataTypeEnum.UInt32);
                    break;
                case PLCDataTypeEnum.Long:
                    addresses.Add(address.Key, DataTypeEnum.Int64);
                    break;
                case PLCDataTypeEnum.ULong:
                    addresses.Add(address.Key, DataTypeEnum.UInt64);
                    break;
                case PLCDataTypeEnum.Float:
                    addresses.Add(address.Key, DataTypeEnum.Float);
                    break;
                case PLCDataTypeEnum.Double:
                    addresses.Add(address.Key, DataTypeEnum.Double);
                    break;
                case PLCDataTypeEnum.String:
                    addresses.Add(address.Key, DataTypeEnum.String);
                    break;
                default:
                    break;
                switch (address.Value)
                {
                    case PLCDataTypeEnum.Bit:
                        addresses.Add(address.Key, DataTypeEnum.Bool);
                        break;
                    case PLCDataTypeEnum.Byte:
                        addresses.Add(address.Key, DataTypeEnum.Byte);
                        break;
                    case PLCDataTypeEnum.Short:
                        addresses.Add(address.Key, DataTypeEnum.Int16);
                        break;
                    case PLCDataTypeEnum.UShort:
                        addresses.Add(address.Key, DataTypeEnum.UInt16);
                        break;
                    case PLCDataTypeEnum.Int:
                        addresses.Add(address.Key, DataTypeEnum.Int32);
                        break;
                    case PLCDataTypeEnum.UInt:
                        addresses.Add(address.Key, DataTypeEnum.UInt32);
                        break;
                    case PLCDataTypeEnum.Long:
                        addresses.Add(address.Key, DataTypeEnum.Int64);
                        break;
                    case PLCDataTypeEnum.ULong:
                        addresses.Add(address.Key, DataTypeEnum.UInt64);
                        break;
                    case PLCDataTypeEnum.Float:
                        addresses.Add(address.Key, DataTypeEnum.Float);
                        break;
                    case PLCDataTypeEnum.Double:
                        addresses.Add(address.Key, DataTypeEnum.Double);
                        break;
                    case PLCDataTypeEnum.String:
                        addresses.Add(address.Key, DataTypeEnum.String);
                        break;
                    default:
                        break;
                }
            }
            return _client.BatchRead(addresses);
        }
        return _client.BatchRead(addresses);
    }
    /// <summary>
    /// 写入PLC值
@@ -149,6 +173,13 @@
            address = DbNumber + "." + Pos;
        else
            address = DbNumber + Pos;
        return this.SetPlcDBValue(PosType, address, Pos, Value);
    }
    /// <summary>
    /// 写入PLC值
    /// </summary>
    public IoTClient.Result SetPlcDBValue(PLCDataTypeEnum PosType, string Pos, string Value)
    {
        switch (PosType)
        {
            case PLCDataTypeEnum.Bit:
@@ -163,25 +194,25 @@
                        throw new Exception("写入值错误");
                    }
                }
                return _client.Write(address, bit);
                return _client.Write(Pos, bit);
            case PLCDataTypeEnum.Byte:
                return _client.Write(address, byte.Parse(Value));
                return _client.Write(Pos, byte.Parse(Value));
            case PLCDataTypeEnum.Short:
                return _client.Write(address, short.Parse(Value));
                return _client.Write(Pos, short.Parse(Value));
            case PLCDataTypeEnum.UShort:
                return _client.Write(address, ushort.Parse(Value));
                return _client.Write(Pos, ushort.Parse(Value));
            case PLCDataTypeEnum.Int:
                return _client.Write(address, int.Parse(Value));
                return _client.Write(Pos, int.Parse(Value));
            case PLCDataTypeEnum.UInt:
                return _client.Write(address, uint.Parse(Value));
                return _client.Write(Pos, uint.Parse(Value));
            case PLCDataTypeEnum.Long:
                return _client.Write(address, long.Parse(Value));
                return _client.Write(Pos, long.Parse(Value));
            case PLCDataTypeEnum.ULong:
                return _client.Write(address, ulong.Parse(Value));
                return _client.Write(Pos, ulong.Parse(Value));
            case PLCDataTypeEnum.Float:
                return _client.Write(address, float.Parse(Value));
                return _client.Write(Pos, float.Parse(Value));
            case PLCDataTypeEnum.Double:
                return _client.Write(address, float.Parse(Value));
                return _client.Write(Pos, float.Parse(Value));
            default:
                return new IoTClient.Result();
        }