From 5c34ca4f23c702291188f122b05165310b579cbc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 31 8月 2024 10:03:54 +0800
Subject: [PATCH] 监控上线

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config                           |  340 +++++++++++++++++++++++++++++++++++++
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs                                              |    2 
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs                                                 |   50 +++++
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs                         |   56 +++++-
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - 复制用.config                     |   16 
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/PLCDataCapture/PLCManger.cs |   32 ++
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs  |    2 
 7 files changed, 472 insertions(+), 26 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/PLCDataCapture/PLCManger.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/PLCDataCapture/PLCManger.cs
index 1def89c..7365c9b 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/PLCDataCapture/PLCManger.cs
+++ b/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;
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 77f72e9..783d32c 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
@@ -173,6 +173,8 @@
 
                                 //鐩戞帶娴嬭瘯鏁版嵁锛屾ā鎷燂紝娴嬭瘯
                                 MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
+                                //鐩戞帶涓婄嚎
+                                MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog);
 
                                 //鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
                                 string sideValue = GetSideForOP50(plcService, wplog);
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
index c3f927a..6864ea7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/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);
+                }
+            });
         }
     }
 }
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 25782bf..fd59844 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"
@@ -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>
\ 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 494546b..974215b 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
+++ b/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"/>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
index a06b941..5d77545 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
+++ b/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}宸ュ簭锛學orkPieceID: {item.WorkPieceID}  \r\n";
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index 0fd29e8..c6db01e 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -237,6 +237,56 @@
         MonitorOP50Side = 505,
 
 
+        //鏂板 銆怑ditby 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

--
Gitblit v1.9.3