From 4129099cc52eb307f76cda9dfc24c0c634f6cfc7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 13:38:55 +0800
Subject: [PATCH] 111
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 3866743..20da427 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
@@ -214,8 +214,9 @@
logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ;
logMiddle.Remarks = WorkingProcedure;
logMiddle.MonitoringPoint = DataCapturePointCode;
+ //logMiddle.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, DataCapturePointCode, DataCapturePointCname);
logMiddle.CreatedTime = DateTimeHelper.GetDateTime();
- logMiddle.CreatedUserName = DataCapturePointCode;
logMiddle.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
logMiddle.UpdatedTime = DateTimeHelper.GetDateTime();
logMiddle.IsDeleted = false;
@@ -270,7 +271,9 @@
//鑾峰彇鏂囦欢澶瑰悕绉�
List<string> directorylist = new List<string>();
string directory = time.ToString("yyyy-MM-dd_HH");
- string directoryOther = time.AddSeconds(-30).ToString("yyyy-MM-dd_HH");
+ //string directoryOther = time.AddSeconds(-30).ToString("yyyy-MM-dd_HH");
+ //鏀逛负璋冩暣30鍒嗛挓鍓嶇殑鏂囦欢澶� 銆怑ditby shaocx,2024-09-02銆�
+ string directoryOther = time.AddMinutes(-30).ToString("yyyy-MM-dd_HH");
directorylist.Add(directory);
if (!directory.Equals(directoryOther))
{//濡傛灉30绉掑墠鏄彟涓�涓枃浠跺す
@@ -500,7 +503,8 @@
SystemValue.OP20_Side_Value = sideValue;
}
logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
- logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ //logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢logMiddle.WorkPieceID},宸ヤ綅{gongweiStr}锛屾牎楠岄�氳繃锛岃鍙朞p60_Place_Flag:true");
--
Gitblit v1.9.3