schangxiang@126.com
2024-08-23 3fe40b373c89b75a7f1d409e7938a785de023bc0
获取OP50的某个工位的哪个面
已修改4个文件
70 ■■■■ 文件已修改
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - 复制用.config 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
@@ -293,10 +293,15 @@
        {
            try
            {
                if (!(DataCapturePointCode.Contains("OP5001A") || DataCapturePointCode.Contains("OP5001B")))
                {
                    return "";
                }
                object value_M88 = plcService.ReadValuePointV2("M88", PLCManger.GetTypeForString("int"));
                int i_value_M88 = 0;
                var isRight = int.TryParse(value_M88.ToString(), out i_value_M88);
                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"读取 {DataCapturePointCode}工序监控测量标记数据,获取OP50的哪个面,i_value_M88:{i_value_M88},工件号:{wplog.WorkPieceID}");
                Log4NetHelper.WriteInfoLog(LogType.MonitorOP50Side, $"读取 {DataCapturePointCode}工序监控测量标记数据,获取OP50的哪个面,i_value_M88:{i_value_M88},工件号:{wplog.WorkPieceID}");
                if (isRight)
                {
                    if (i_value_M88 == 64)
@@ -320,12 +325,12 @@
                        return "4";
                    }
                }
                Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"读取 {DataCapturePointCode}工序监控测量标记数据时,无效数值,获取OP50的哪个面,,i_value_M88:{i_value_M88},工件号:{wplog.WorkPieceID}", null);
                Log4NetHelper.WriteErrorLog(LogType.MonitorOP50Side, $"读取 {DataCapturePointCode}工序监控测量标记数据时,无效数值,获取OP50的哪个面,,i_value_M88:{i_value_M88},工件号:{wplog.WorkPieceID}", null);
                return "";
            }
            catch (Exception ex)
            {
                Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"读取 {DataCapturePointCode}工序监控测量标记数据时异常,获取OP50的哪个面,工件号:{wplog.WorkPieceID}", ex);
                Log4NetHelper.WriteErrorLog(LogType.MonitorOP50Side, $"读取 {DataCapturePointCode}工序监控测量标记数据时异常,获取OP50的哪个面,工件号:{wplog.WorkPieceID}", ex);
                return "";
            }
        }
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - ¸´ÖÆÓÃ.config
@@ -5,9 +5,9 @@
  <appSettings>
  </appSettings>
  <log4net>
    <!--  ç›‘控测试数据线程【信息】日志-->
    <appender name="MonitorTest_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Info\\" />
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="MonitorOP50Side_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_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="MonitorTest_Info" />
        <loggerToMatch value="MonitorOP50Side_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控测试数据线程【错误】日志-->
    <appender name="MonitorTest_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Error\\" />
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="MonitorOP50Side_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_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="MonitorTest_Error" />
        <loggerToMatch value="MonitorOP50Side_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="MonitorTest_Info"/>
      <appender-ref ref="MonitorTest_Error"/>
      <appender-ref ref="MonitorOP50Side_Info"/>
      <appender-ref ref="MonitorOP50Side_Error"/>
    </root>
  </log4net>
</configuration>
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
@@ -5,6 +5,38 @@
  <appSettings>
  </appSettings>
  <log4net>
    <!--  ç›‘控OP50哪个面线程【信息】日志-->
    <appender name="MonitorOP50Side_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_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="MonitorOP50Side_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控OP50哪个面线程【错误】日志-->
    <appender name="MonitorOP50Side_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorOP50Side_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="MonitorOP50Side_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  ç›‘控测试数据线程【信息】日志-->
    <appender name="MonitorTest_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Info\\" />
@@ -589,6 +621,8 @@
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="MonitorOP50Side_Info"/>
      <appender-ref ref="MonitorOP50Side_Error"/>
      <appender-ref ref="MonitorTest_Info"/>
      <appender-ref ref="MonitorTest_Error"/>
      <appender-ref ref="OP7009_Info"/>
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -227,6 +227,11 @@
        /// </summary>
        MonitorTest = 504,
        /// <summary>
        /// ç›‘控OP50哪个面
        /// </summary>
        MonitorOP50Side = 505,
    }