From 8a9ca879c839467051db1e5d3e7986537ac5afce Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 9月 2024 13:54:55 +0800
Subject: [PATCH] 测量岛数据展示
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
index 783d32c..8a2a57a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
@@ -106,7 +106,7 @@
//plcService.Close();
//plcService.OpenService();
}
- string value_01 = "";
+ string value_01 = "";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
while (true)
{
threadStatusMonitor.ErrorMsg = "";
@@ -134,19 +134,20 @@
//string hostname = Environment.MachineName;
object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- WorkPieceLog wplog = new WorkPieceLog();
+ WorkPieceLog wplog = null;
+
+ var value_bool = value.ToString().ToUpper().Equals("TRUE");
+ if (value_bool)
+ {
+ wplog = new WorkPieceLog();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wplog.WorkingProcedure = WorkingProcedure;
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();
@@ -174,12 +175,26 @@
//鐩戞帶娴嬭瘯鏁版嵁锛屾ā鎷燂紝娴嬭瘯
MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
//鐩戞帶涓婄嚎
- MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog);
+ MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
+ }
+ //if (wplog != null)
+ //{
+ // var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+ // if (isRight)
+ // {
+ #region 澶勭悊涓氬姟
+
+ if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+ {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+ //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+ //涓氬姟浠ｇ爜
+ threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
//鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
string sideValue = GetSideForOP50(plcService, wplog);
wplog.MonitoringPoint += sideValue;
- wplog.CreatedUserName = wplog.MonitoringPoint;
+ //wplog.CreatedUserName = wplog.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);
//璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
@@ -189,12 +204,15 @@
}
value_01 = value.ToString();
+ #endregion
+ // }
+ //}
}
threadStatusMonitor.Remarks = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
{
- threadStatusMonitor.ThreadFrequency = 1000;
- Thread.Sleep(1000);
+ threadStatusMonitor.ThreadFrequency = 700;
+ Thread.Sleep(700);
}
else
{
--
Gitblit v1.9.3