From 09a12e1094e90fe83c5578de64b56e9237c60507 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 14:13:33 +0800
Subject: [PATCH] 代码回归
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs
index 4648c22..19d8bc9 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs
@@ -94,8 +94,9 @@
wplog.WorkingProcedure = WorkingProcedure;
wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.OnlineTime = DateTimeHelper.GetDateTime();
@@ -130,7 +131,7 @@
WorkPieceInfoManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
threadStatusMonitor.Threadstatue = 1;
- wplog.Remarks = (wplog.Remarks ?? "") + $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] NOOK";
+ wplog.Remarks =$"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] NOOK";
}
//else if (wplog.OP10Flag == 2 || wplog.OP10Flag == 3)
else
@@ -138,7 +139,7 @@
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭23鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
- wplog.Remarks = (wplog.Remarks ?? "") + $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] SPC";
+ wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] SPC";
threadStatusMonitor.Threadstatue = 1;
}
--
Gitblit v1.9.3