反馈MES工单完成

huanghongfeng

2024-07-19 bb929bd0809eefc1108dd779846ff07d997f7ef0

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs

@@ -3,6 +3,7 @@
using System.Net.NetworkInformation;
using WIDESEA_Comm.DataHandle;
using WIDESEA_Comm.LogInfo;
using static FreeSql.Internal.GlobalFilter;

namespace WIDESEA_WCS.WCSClient
{
@@ -134,8 +135,11 @@
            }
            else if (typeof(DataType) == typeof(string))//字符串
            {
                var bytes = (byte[])GetContent(siemensPLCClient.Read(dbAddress, (ushort)len), dbAddress);
                string str = DataParse.GetStr(bytes, 0);
                //var bytes = (byte[])GetContent(siemensPLCClient.Read(dbAddress, (ushort)len), dbAddress);
                //string str = DataParse.GetStr(bytes, 0);
                //return (DataType)(str as object);
                var str = GetContent(siemensPLCClient.ReadString(dbAddress, (ushort)len), dbAddress).ToString();
                str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "")?.Replace("\u000e\u000e", "")?.Replace("\n", "")?.Replace("?", "")?.Trim();
                return (DataType)(str as object);
            }
            else
@@ -151,8 +155,17 @@
        /// <returns></returns>
        public override DataType ReadByOrder<DataType>(string orderName, string Method = null)
        {
            var item = itemGroups.Where(t => t.name.Equals(orderName)).FirstOrDefault();
            if (Method != null) { item = itemGroups.Where(t => t.name.Equals(orderName) && t.Methods.Equals(Method)).FirstOrDefault(); }
            DBItemGroup item = null;
            //var item = itemGroups.Where(t => t.name.Equals(orderName)).FirstOrDefault();
            //if (Method != null) { item = itemGroups.Where(t => t.name.Equals(orderName) && t.Methods.Equals(Method)).FirstOrDefault(); }
            var items = itemGroups.Where(t => t.name.Contains(orderName)).ToList();
            if (items.Count > 0)
            {
                if (Method != null)
                    item = items.Where(t => t.Methods.Contains(Method)).FirstOrDefault();
                else
                    item = items.Where(t => t.name.Contains(orderName)).FirstOrDefault();
            }
            if (item == null)
            {
                throw new Exception($"PLC{PLCName},未定义指令{orderName}");