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_OP7009.cs | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
index c42bd85..e0d6bd9 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
@@ -85,6 +85,24 @@
}
else
{
+
+ //鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃
+ var ooDateTime = Convert.ToDateTime("0001-01-01");
+ var findTime = DateTime.Now.AddHours(-12);
+ List<WorkPieceProcess> noFinishWorkPieceProcessList = null;
+ using (DbModel db = new DbModel())
+ {
+ var dateTime = DateTime.Now;
+ noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x => x.CreatedTime >= findTime
+ && x.WorkingProcedureCurrent == WorkingProcedure
+ && x.EndTime == ooDateTime).ToList();
+ }
+ if (noFinishWorkPieceProcessList?.Count <= 0)
+ {
+ continue;
+ }
+
+
// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -92,8 +110,9 @@
wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
wplog.Remarks = WorkingProcedure;
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();
@@ -134,16 +153,7 @@
continue;
}
- //鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃
- var ooDateTime = Convert.ToDateTime("0001-01-01");
- List<WorkPieceProcess> noFinishWorkPieceProcessList = null;
- using (DbModel db = new DbModel())
- {
- var dateTime = DateTime.Now;
- noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x => x.CreatedTime >= DateTime.Now.AddHours(-12)
- && x.WorkingProcedureCurrent == WorkingProcedure
- && x.EndTime == ooDateTime).ToList();
- }
+
if (noFinishWorkPieceProcessList?.Count > 0)
{
foreach (var item in noFinishWorkPieceProcessList)
@@ -153,22 +163,9 @@
// threadStatusMonitor.Threadstatue = 1;
}
}
- else
- {
- Log4NetHelper.WriteInfoLog(LogType.OP7009, $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊兼湁鍊硷紝浣嗘槸鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃涓虹┖锛�");
- }
}
-
-
SystemValue.lbl_Alert_OP1002 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+ Thread.Sleep(5000);
}
catch (Exception ex)
--
Gitblit v1.9.3