Merge branch 'master' into wxw

wxw

8 天以前 6a738089d6471d048c32ce7f3dcbd15c935ada79

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

@@ -7,6 +7,8 @@
using IoTClient.Common.Enums;
using IoTClient.Enums;
using IoTClient.Interfaces;
using System.Text;
using System.Text.RegularExpressions;

namespace WCS.Application;
public class PLCUtil
@@ -15,6 +17,7 @@
    public readonly string PlcIP;
    private SiemensClient _client;
    private WcsPlc _modPlc;
    private Task<WcsPlc> modPlc;
    private readonly object OLock = new object();
    public PLCUtil(WcsPlc modPlc)
    {
@@ -24,6 +27,7 @@
        _client = new SiemensClient((SiemensVersion)modPlc.PLCType, modPlc.IP, modPlc.Port);
        _client.Open();
    }

    public bool Connected
    {
        get { return _client.Connected; }
@@ -101,7 +105,24 @@
                    result = _client.ReadDouble(Pos);
                    break;
                case PLCDataTypeEnum.String:
                    result = _client.ReadString(Pos, Convert.ToUInt16(Length));
                    {
                        string dpos = IncrementCode(Pos);
                        Result<byte[]> result1 = _client.ReadString(Pos, 1);
                        if (result1.IsSucceed)
                        {
                            Result<byte[]> result2 = _client.ReadString(dpos, (ushort)(result1.Value[0]));
                            Result<string> result3 = new Result<string>(result2);
                            if (result3.IsSucceed)
                            {
                                result3.Value = Encoding.ASCII.GetString(result2.Value, 0, result1.Value[0]).Replace("\0", "");
                                result = result3;
                            }
                        }
                        else
                        {
                            result = result1;
                        }
                    }
                    break;
                default:
                    result = new IoTClient.Result<object>();
@@ -109,6 +130,37 @@
            }
            return (result, result.Value);
        }
    }
    public static string IncrementCode(string code, int index = 2)
    {
        // 使用正则表达式解析字符串
        var match = Regex.Match(code, @"([A-Za-z]+)(\d+)(?:\.(\d+))?");

        if (match.Success)
        {
            // 提取字母部分
            string prefix = match.Groups[1].Value;
            // 提取数字部分
            int number1 = int.Parse(match.Groups[2].Value);
            int number2 = match.Groups[3].Success ? int.Parse(match.Groups[3].Value) : 0;

            // 处理规则
            if (match.Groups[3].Success)
            {
                // 如果有小数点分隔部分，增加2
                number2 += index;
                return $"{prefix}{number1}.{number2:D3}";
            }
            else
            {
                // 没有小数点分隔部分的，增加2
                number1 += index;
                return $"{prefix}{number1}";
            }
        }

        // 如果不匹配，返回原字符串
        return code;
    }
    /// <summary>
    /// 批量读取PLC值
@@ -173,8 +225,21 @@
            address = DbNumber + "." + Pos;
        else
            address = DbNumber + Pos;
        return this.SetPlcDBValue(PosType, address, Pos, Value);
        return this.SetPlcDBValue(PosType, address, Value);
    }

    /// <summary>
    /// 写入PLC值
    /// </summary>
    //public IoTClient.Result SetPlcDBValue(PLCDataTypeEnum PosType, string DbNumber, string Pos, byte Value)
    //{
    //    string address;
    //    if (DbNumber.StartsWith("DB"))
    //        address = DbNumber + "." + Pos;
    //    else
    //        address = DbNumber + Pos;
    //    return this.SetPlcDBValue(PosType, address, Value);
    //}
    /// <summary>
    /// 写入PLC值
    /// </summary>
@@ -213,6 +278,11 @@
                return _client.Write(Pos, float.Parse(Value));
            case PLCDataTypeEnum.Double:
                return _client.Write(Pos, float.Parse(Value));
            case PLCDataTypeEnum.String:
                {
                    string dpos = IncrementCode(Pos, 1);
                    return _client.Write(dpos, Value);
                }
            default:
                return new IoTClient.Result();
        }