1

schangxiang@126.com

2024-08-31 b6eea38032902e76b708c3555ee152e1ee137409

1

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs

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

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

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs

@@ -20,6 +20,7 @@
using File = System.IO.File;
using Spire.Additions.Xps.Schema;
using log4net;
using static Org.BouncyCastle.Math.EC.ECCurve;

namespace iWare_SCADA_BusinessLogical
{
@@ -248,6 +249,16 @@

                                try
                                {
                                    switch (DataCapturePointCode)
                                    {
                                        case "OP2002A":
                                        case "OP2002B":
                                        case "OP2002C":
                                            //监控上线
                                            MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, logMiddle.WorkPieceID);
                                            break;
                                    }

                                    if (WorkingProcedure.Equals("OP30"))
                                    {
                                        var time = DateTimeHelper.GetDateTime();

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs

@@ -53,7 +53,7 @@
        /// </summary>
        /// <param name="value"></param>
        /// <returns></returns>
        public static void MonitorTestForLine(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
        public static void MonitorTestForLine(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, string workPieceID)
        {
            Task.Run(() =>
            {
@@ -64,7 +64,7 @@
                    var str = "";


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

                    Log4NetHelper.WriteInfoLog(_LogType, str);

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

@@ -6,8 +6,8 @@
  </appSettings>
  <log4net>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP1003_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1003_Info\\" />
    <appender name="OP2002C_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002C_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="OP1003_Info" />
        <loggerToMatch value="OP2002C_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP1003_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP1003_Error\\" />
    <appender name="OP2002C_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002C_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="OP1003_Error" />
        <loggerToMatch value="OP2002C_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="OP2002C_Info"/>
      <appender-ref ref="OP2002C_Error"/>
    </root>
  </log4net>
</configuration>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config

@@ -939,8 +939,110 @@
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP2002A_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002A_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="OP2002A_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP2002A_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002A_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="OP2002A_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP2002B_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002B_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="OP2002B_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP2002B_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002B_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="OP2002B_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="OP2002C_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002C_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="OP2002C_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="OP2002C_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP2002C_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="OP2002C_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="OP2002C_Info"/>
      <appender-ref ref="OP2002C_Error"/>
      <appender-ref ref="OP2002B_Info"/>
      <appender-ref ref="OP2002B_Error"/>
      <appender-ref ref="OP2002A_Info"/>
      <appender-ref ref="OP2002A_Error"/>
      <appender-ref ref="OP1003_Info"/>
      <appender-ref ref="OP1003_Error"/>
      <appender-ref ref="OP1002_Info"/>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs

@@ -287,6 +287,11 @@
        /// </summary>
        OP1003 = 519,


        OP2002A = 520,
        OP2002B = 521,
        OP2002C = 522,

    }

    public enum WorkingProcedureForHMI