From 6a128ef4f3a8b79d25a8fcd36a6139b46ac51a65 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 09 9月 2024 14:42:10 +0800
Subject: [PATCH] 注释不用的代码
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 8d90e5b..c5bb9b6 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
@@ -1,4 +1,5 @@
锘縰sing iWare_SCADA_BusinessLogical.BLL;
+using iWare_SCADA_BusinessLogical.BLL.Important;
using iWare_SCADA_BusinessLogical.Utils;
using iWare_SCADA_Model;
using System;
@@ -13,7 +14,7 @@
/// <summary>
/// OP10/OP40鎺ㄥ嚭鏍囪
/// </summary>
- public class DataCaptureHandler_OP1004: DataCaptureHandler
+ public class DataCaptureHandler_OP1004 : DataCaptureHandler
{
public static readonly DataCaptureHandler_OP1004 Instance = new DataCaptureHandler_OP1004();
@@ -94,10 +95,11 @@
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.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.OnlineTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
@@ -128,17 +130,17 @@
{
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭1鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
- WorkPieceInfoManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
+ WorkPiecePushOffManager.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
{
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭23鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
- wplog.Remarks = (wplog.Remarks ?? "") + $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] SPC";
+ WorkPieceSPCPushOffManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
+ wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] SPC";
threadStatusMonitor.Threadstatue = 1;
}
@@ -154,7 +156,7 @@
SystemValue.lbl_Alert_OP1004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
{
- Thread.Sleep(5000);
+ Thread.Sleep(1000);
}
else
{
--
Gitblit v1.9.3