From 3fe40b373c89b75a7f1d409e7938a785de023bc0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 23 8月 2024 06:08:49 +0800
Subject: [PATCH] 获取OP50的某个工位的哪个面
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config | 34 +++++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs | 5 ++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - 复制用.config | 20 +++++-----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs | 11 ++++-
4 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
index ff66494..1d09c90 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
+++ b/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 "";
}
}
diff --git "a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config" "b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config"
index 59f5e59..25782bf 100644
--- "a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config"
+++ "b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.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>
\ No newline at end of file
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
index a357a8b..494546b 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
+++ b/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"/>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index f1c23ba..903b47c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -227,6 +227,11 @@
/// </summary>
MonitorTest = 504,
+ /// <summary>
+ /// 鐩戞帶OP50鍝釜闈�
+ /// </summary>
+ MonitorOP50Side = 505,
+
}
--
Gitblit v1.9.3