监控上线

schangxiang@126.com

2024-08-31 5c34ca4f23c702291188f122b05165310b579cbc

监控上线

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/PLCDataCapture/PLCManger.cs

@@ -44,7 +44,7 @@
                    return typeof(Char);
                case "real":
                    return typeof(double);
                    //return typeof(Single);
                //return typeof(Single);
                case "bool":
                    return typeof(bool);
                case "string":
@@ -58,7 +58,7 @@
            }
        }

        public static object GetVauleForObjectType(object vaule,TypeCode type)
        public static object GetVauleForObjectType(object vaule, TypeCode type)
        {

            switch (type)
@@ -77,7 +77,7 @@
                    return Convert.ToString(vaule);
                case TypeCode.Byte:
                    return Convert.ToByte(vaule);
                    

                default:
                    return Convert.ToString(vaule);
            }
@@ -85,7 +85,7 @@

        public static LogType GetLogTypeForWorkingProcedure(string wp)
        {
            switch(wp)
            switch (wp)
            {

                case "OP05":
@@ -115,14 +115,34 @@
            }
        }

        public static string GetWorkPieceIDForPLC(DataCaptureConfig _dataCaptureConfig,PLCService plcService)

        /// <summary>
        /// ä¸Šçº¿
        /// </summary>
        /// <param name="wp"></param>
        /// <returns></returns>
        public static LogType GetLogTypeForOnLine(string wp)
        {
            //强制转换
            try
            {
                LogType _logType = (LogType)Enum.Parse(typeof(LogType), wp);
                return _logType;
            }
            catch (Exception ex)
            {
                return LogType.OtherOnLine;
            }
        }

        public static string GetWorkPieceIDForPLC(DataCaptureConfig _dataCaptureConfig, PLCService plcService)
        {
            try
            {
                var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
                return valueid.ToString().Trim();
            }
            catch(Exception ex)
            catch (Exception ex)
            {
                Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {_dataCaptureConfig.WorkingProcedure}工序监控读码标记 è¯»å–工件码数据时异常：", ex);
                throw;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs

@@ -173,6 +173,8 @@

                                //监控测试数据，模拟，测试
                                MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
                                //监控上线
                                MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog);

                                //特殊处理OP50 ã€Editby shaocx,2024-08-16】
                                string sideValue = GetSideForOP50(plcService, wplog);

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs

@@ -6,6 +6,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static Org.BouncyCastle.Math.EC.ECCurve;

namespace iWare_SCADA_BusinessLogical.Utils
{
@@ -21,26 +22,59 @@
        /// <returns></returns>
        public static void MonitorTestForOP3501(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
        {
            try
            Task.Run(() =>
            {
                if (_dataCaptureConfig.DataCapturePointCode == "OP3501")
                try
                {
                    if (_dataCaptureConfig.DataCapturePointCode == "OP3501")
                    {
                        //记录下 è§¦å‘的点位和找到的二维码值
                        var str = "";
                        str = $"OP3501 è§¦å‘的点位 DbNumber:{_dataCaptureConfig.DbNumber},Offset:{_dataCaptureConfig.Offset},值是{value.ToString()}";

                        var col = colConfig.First(o => o.DataCapturePointCode == _dataCaptureConfig.DataCapturePointCode && o.DataCapturePointCname == "二维码");

                        str += $",获取二维码值 DbNumber:{col.DbNumber},Offset:{col.Offset},值是{wplog.WorkPieceID.ToString()}";
                        //str += $",整体对象 wplog是{JsonConvert.SerializeObject(wplog)}";

                        Log4NetHelper.WriteInfoLog(LogType.MonitorTest, str);
                    }
                }
                catch (Exception ex)
                {
                    Log4NetHelper.WriteErrorLog(LogType.MonitorTest, "MonitorTestForOP3501异常", ex);
                }
            });
        }


        /// <summary>
        /// ç›‘控上线
        /// </summary>
        /// <param name="value"></param>
        /// <returns></returns>
        public static void MonitorTestForLine(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
        {
            Task.Run(() =>
            {
                LogType _LogType = PLCManger.GetLogTypeForOnLine(_dataCaptureConfig.DataCapturePointCode);
                try
                {
                    //记录下 è§¦å‘的点位和找到的二维码值
                    var str = "";
                    str = $"OP3501 è§¦å‘的点位 DbNumber:{_dataCaptureConfig.DbNumber},Offset:{_dataCaptureConfig.Offset},值是{value.ToString()}";

                    var col = colConfig.First(o => o.DataCapturePointCode == _dataCaptureConfig.DataCapturePointCode && o.DataCapturePointCname == "二维码");

                    str += $",获取二维码值 DbNumber:{col.DbNumber},Offset:{col.Offset},值是{wplog.WorkPieceID.ToString()}";
                    str += $",上线获取二维码值 ,值是{wplog.WorkPieceID.ToString()}";
                    //str += $",整体对象 wplog是{JsonConvert.SerializeObject(wplog)}";

                    Log4NetHelper.WriteInfoLog(LogType.MonitorTest, str);
                    Log4NetHelper.WriteInfoLog(_LogType, str);

                }
            }
            catch (Exception ex)
            {
                Log4NetHelper.WriteErrorLog(LogType.MonitorTest, "MonitorTestForOP3501异常", ex);
            }
                catch (Exception ex)
                {
                    Log4NetHelper.WriteErrorLog(_LogType, "MonitorTestForLine异常:" + ex.Message, ex);
                }
            });
        }
    }
}

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - ¸´ÖÆÓÃ.config

@@ -6,8 +6,8 @@
  </appSettings>
  <log4net>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="MonitorOP50Side_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_Info\\" />
    <appender name="OP1003_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1003_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
@@ -17,13 +17,13 @@
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="MonitorOP50Side_Info" />
        <loggerToMatch value="OP1003_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="MonitorOP50Side_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_Error\\" />
    <appender name="OP1003_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1003_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
@@ -33,14 +33,14 @@
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="MonitorOP50Side_Error" />
        <loggerToMatch value="OP1003_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="MonitorOP50Side_Info"/>
      <appender-ref ref="MonitorOP50Side_Error"/>
      <appender-ref ref="OP1003_Info"/>
      <appender-ref ref="OP1003_Error"/>
    </root>
  </log4net>
</configuration>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config

@@ -6,6 +6,38 @@
  </appSettings>
  <log4net>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OtherOnLine_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OtherOnLine_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OtherOnLine_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OtherOnLine_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OtherOnLine_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OtherOnLine_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="MonitorOP50Side_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_Info\\" />
      <appendToFile value="true" />
@@ -619,8 +651,316 @@
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP5001A_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP5001A_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP5001A_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP5001A_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP5001A_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP5001A_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP5001B_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP5001B_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP5001B_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP5001B_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP5001B_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP5001B_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP3001_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP3001_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP3001_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP3001_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP3001_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP3001_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP3501_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP3501_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP3501_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP3501_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP3501_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP3501_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP6001_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP6001_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP6001_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP6001_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP6001_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP6001_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP7001_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP7001_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP7001_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP7001_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP7001_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP7001_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP8001_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP8001_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP8001_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP8001_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP8001_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP8001_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP1002_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1002_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP1002_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP1002_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1002_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP1002_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP1003_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1003_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间：%d [%t] %n消息级别：%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP1003_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP1003_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1003_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间：%d [%t] %n异常级别：%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP1003_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="OP1003_Info"/>
      <appender-ref ref="OP1003_Error"/>
      <appender-ref ref="OP1002_Info"/>
      <appender-ref ref="OP1002_Error"/>
      <appender-ref ref="OP8001_Info"/>
      <appender-ref ref="OP8001_Error"/>
      <appender-ref ref="OP7001_Info"/>
      <appender-ref ref="OP7001_Error"/>
      <appender-ref ref="OP6001_Info"/>
      <appender-ref ref="OP6001_Error"/>
      <appender-ref ref="OP3501_Info"/>
      <appender-ref ref="OP3501_Error"/>
      <appender-ref ref="OP3001_Info"/>
      <appender-ref ref="OP3001_Error"/>
      <appender-ref ref="OP5001B_Info"/>
      <appender-ref ref="OP5001B_Error"/>
      <appender-ref ref="OP5001A_Info"/>
      <appender-ref ref="OP5001A_Error"/>
      <appender-ref ref="OtherOnLine_Info"/>
      <appender-ref ref="OtherOnLine_Error"/>
      <appender-ref ref="MonitorOP50Side_Info"/>
      <appender-ref ref="MonitorOP50Side_Error"/>
      <appender-ref ref="MonitorTest_Info"/>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs

@@ -285,7 +285,7 @@
            total += "\r\n";

            //处理
            workPieceProcessList = workPieceProcessList.OrderBy(x => x.WorkingProcedureCurrent).ToList();
            workPieceProcessList = workPieceProcessList.OrderBy(x => x.WorkingProcedureCurrent).ThenBy(x=>x.WorkPieceID).ToList();
            foreach (var item in workPieceProcessList)
            {
                str += $"缺少{item.WorkingProcedureCurrent}工序，WorkPieceID: {item.WorkPieceID}  \r\n";

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs

@@ -237,6 +237,56 @@
        MonitorOP50Side = 505,


        //新增 ã€Editby shaocx,2024-08-31】
        /// <summary>
        /// å…¶ä»–上线
        /// </summary>
        OtherOnLine = 509,

        /// <summary>
        /// OP5001A
        /// </summary>
        OP5001A = 510,
        /// <summary>
        /// OP5001B
        /// </summary>
        OP5001B = 511,

        /// <summary>
        /// OP3001
        /// </summary>
        OP3001 = 512,

        /// <summary>
        /// OP3501
        /// </summary>
        OP3501 = 513,

        /// <summary>
        /// OP6001
        /// </summary>
        OP6001 = 514,

        /// <summary>
        /// OP7001
        /// </summary>
        OP7001 = 515,

        /// <summary>
        /// OP8001
        /// </summary>
        OP8001 = 516,

        /// <summary>
        /// OP1002
        /// </summary>
        OP1002 = 518,

        /// <summary>
        /// OP1003
        /// </summary>
        OP1003 = 519,

    }

    public enum WorkingProcedureForHMI