From 399d645911d598ddcc8a840cf33e42e3604e58be Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 19 6月 2024 07:34:26 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 0248bdf..61d7a8a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -153,7 +153,7 @@
}
DateTime? fileFindTime = null;
DateTime? op60QualityTime = null;
-
+
// 璐ㄩ噺淇℃伅锛氭定鏂姏鐭�... 棰勬嫥绱у姏鐭� 棰勬嫥绱ц搴� 缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
//kistler_crack 娑ㄦ柇鍔涚煩 宸ヤ綅3 娑ㄦ柇鍔涚煩锛圷 - Maximum锛� 璐ㄩ噺缁撴灉锛圧esult锛�
//kistler_bush 鍘嬭鍔涚煩 宸ヤ綅6 琛鍘嬭鍔涚煩锛圷 - Maximum锛� 琛鍘嬭浣嶇Щ锛圔lock X锛� 璐ㄩ噺缁撴灉锛圧esult锛�
@@ -340,11 +340,11 @@
var gongweiStr = DataCapturePointCode.Substring(DataCapturePointCode.Length - 1, 1);
if (wplog.Op60_Place_Flag == false)
{
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}锛岃鍙朞p60_Place_Flag:false");
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}锛屼笉閫氳繃锛岃鍙朞p60_Place_Flag:false");
continue;
};
-
-
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}锛屾牎楠岄�氳繃锛岃鍙朞p60_Place_Flag:true");
+
var time = DateTimeHelper.GetDateTime();
if (fileFindTime == null)
@@ -359,14 +359,15 @@
{
files.Add((FileInfo)file);
}
- files = files.OrderByDescending(o => o.LastWriteTime).ToList();//鍙栨渶鏂扮殑鏂囦欢 銆怑ditby shaocx,2024-06-19銆�
if (files.Count() > 0)
{
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢files.Count()}涓紝鏄寚瀹氱殑宸ヤ欢{wplog.WorkPieceID},,宸ヤ綅{gongweiStr}涓婃鑾峰彇灏间集涓佹枃浠堕噷鐨勬椂闂村��:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}");
- files = files.OrderByDescending(o => o.LastWriteTime).ToList();
+ files = files.OrderByDescending(o => o.LastWriteTime).ToList();//鍙栨渶鏂扮殑鏂囦欢 銆怑ditby shaocx,2024-06-19銆�
List<OP60Info> op60Infos = new List<OP60Info>();
bool isFindFile = false;
- foreach (var file in files)
+ //娉ㄦ剰锛氬彧鍙栫涓�涓枃浠跺氨鍙互鍟�!!!!!! 銆怑ditby shaocx,2024-06-19銆�
+ var doFiles = new List<FileInfo>() { files.First() };
+ foreach (var file in doFiles)
{//鍙栧�掑簭鍖归厤鐨勬枃浠跺悕涓哄伐浠跺彿鐨勬枃浠�
if (file.Name.Contains("SP-" + gongweiStr))
{
@@ -403,18 +404,30 @@
{
if (op60QualityTime.HasValue)
{
+ //if (op60Infos[0].datetimeHandle > op60QualityTime.Value)
+ //{//杩欎釜鏃堕棿鍒ゆ柇瑕佷笉瑕佹嬁鎺夛紵锛� 銆怑ditby shaocx,2024-06-19銆�
+ // wplog.QualityOP60To1 = op60Infos[0].value;
+ // wplog.QualityOP60To2 = op60Infos[1].value;
+ // wplog.OP60QualityFilePath = file.FullName;
+ // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}鎴愬姛璧嬪�间簡OP60QualityFilePath绛夊瓧娈�");
+ //}
+ //else
+ //{
+ // var msg = $"锛屽洜涓哄垽鏂椂闂翠笉绗﹀悎锛宱p60Infos[0].datetimeHandle:{(op60Infos[0].datetimeHandle == null ? "" : op60Infos[0].datetimeHandle.ToString())}灏忎簬绛変簬op60QualityTime:{(op60QualityTime.Value == null ? "" : op60QualityTime.Value.ToString())}";
+ // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}娌¤兘璧嬪�糘P60QualityFilePath绛夊瓧娈�,{msg}");
+ // break;
+ //}
+ wplog.QualityOP60To1 = op60Infos[0].value;
+ wplog.QualityOP60To2 = op60Infos[1].value;
+ wplog.OP60QualityFilePath = file.FullName;
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}鎴愬姛璧嬪�间簡OP60QualityFilePath绛夊瓧娈碉紝璇诲彇鏃堕棿:{op60Infos[0].datetimeHandle.ToString()}");
if (op60Infos[0].datetimeHandle > op60QualityTime.Value)
{//杩欎釜鏃堕棿鍒ゆ柇瑕佷笉瑕佹嬁鎺夛紵锛� 銆怑ditby shaocx,2024-06-19銆�
- wplog.QualityOP60To1 = op60Infos[0].value;
- wplog.QualityOP60To2 = op60Infos[1].value;
- wplog.OP60QualityFilePath = file.FullName;
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}鎴愬姛璧嬪�间簡OP60QualityFilePath绛夊瓧娈�");
}
else
{
- var msg = $"锛屽洜涓哄垽鏂椂闂翠笉绗﹀悎锛宱p60Infos[0].datetimeHandle:{(op60Infos[0].datetimeHandle == null ? "" : op60Infos[0].datetimeHandle.ToString())}灏忎簬绛変簬op60QualityTime:{(op60QualityTime.Value == null ? "" : op60QualityTime.Value.ToString())}";
+ var msg = $"锛屽彧鏄鍛婏紒鍥犱负鍒ゆ柇鏃堕棿涓嶇鍚堬紝op60Infos[0].datetimeHandle:{(op60Infos[0].datetimeHandle == null ? "" : op60Infos[0].datetimeHandle.ToString())}灏忎簬绛変簬op60QualityTime:{(op60QualityTime.Value == null ? "" : op60QualityTime.Value.ToString())}";
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}娌¤兘璧嬪�糘P60QualityFilePath绛夊瓧娈�,{msg}");
- break;
}
}
else
@@ -422,7 +435,7 @@
wplog.QualityOP60To1 = op60Infos[0].value;
wplog.QualityOP60To2 = op60Infos[1].value;
wplog.OP60QualityFilePath = file.FullName;
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}鎴愬姛璧嬪�间簡OP60QualityFilePath绛夊瓧娈�");
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢wplog.WorkPieceID},宸ヤ綅{gongweiStr}鎴愬姛璧嬪�间簡OP60QualityFilePath绛夊瓧娈碉紝璇诲彇鏃堕棿:{op60Infos[0].datetimeHandle.ToString()}");
}
op60QualityTime = op60Infos[0].datetimeHandle;
break;
@@ -591,7 +604,7 @@
}
}
-
+
/// <summary>
/// 鑾峰彇OP20鐨勫摢涓潰
--
Gitblit v1.9.3