From c34f8f93417c5a0125f9c55ba3d347411995ac13 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 15:05:32 +0800
Subject: [PATCH] 1
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs | 92 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 33 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 19d8bc9..d66f6ba 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;
@@ -84,12 +85,12 @@
else
{
var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP1004.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜 1.鍙栨帹鍑烘爣璁帮紝2鍙栨帹鍑哄師鍥狅紙1锛歯ok锛�2鍜�3锛歴pc锛�4锛氱姸鎬佷笉鏄� 5:浜岀淮鐮佽瘑鍒け璐� 锛夛紝3 鍙栨帹鍑轰簩缁寸爜
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+
+ WorkPieceLogMiddle wplog = null;
+ var value_bool = value.ToString().ToUpper().Equals("TRUE");
+ if (value_bool)
+ {
+ wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wplog.WorkingProcedure = WorkingProcedure;
wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
@@ -120,37 +121,62 @@
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
}
}
- if (wplog.OP10Flag != "1" && wplog.OP10Flag != "2" && wplog.OP10Flag != "3")
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]寮傚父");
- wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]寮傚父";
- }
- if (wplog.OP10Flag == "1")
- {
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭1鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
- WorkPieceInfoManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
- threadStatusMonitor.Threadstatue = 1;
- 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.OP10Flag}] SPC";
- threadStatusMonitor.Threadstatue = 1;
- }
-
-
-
-
-
+ //鐩戞帶涓婄嚎
+ MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
}
- SystemValue.value_OP1004 = value.ToString();
+ else
+ {
+ SystemValue.value_OP1004 = value.ToString();
+ }
+
+ if (wplog != null)
+ {
+ var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+ if (isRight)
+ {
+ #region 澶勭悊涓氬姟
+
+ if (SystemValue.value_OP1004.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+ {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+ //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+ //涓氬姟浠ｇ爜 1.鍙栨帹鍑烘爣璁帮紝2鍙栨帹鍑哄師鍥狅紙1锛歯ok锛�2鍜�3锛歴pc锛�4锛氱姸鎬佷笉鏄� 5:浜岀淮鐮佽瘑鍒け璐� 锛夛紝3 鍙栨帹鍑轰簩缁寸爜
+ threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+ if (wplog.OP10Flag != "1" && wplog.OP10Flag != "2" && wplog.OP10Flag != "3")
+ {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+ Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]寮傚父");
+ wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]寮傚父";
+ }
+ if (wplog.OP10Flag == "1")
+ {
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭1鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]");
+
+ WorkPiecePushOffManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
+ threadStatusMonitor.Threadstatue = 1;
+ 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}]");
+
+ WorkPieceSPCPushOffManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
+ wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}] SPC";
+ threadStatusMonitor.Threadstatue = 1;
+ }
+
+
+
+
+
+ }
+ SystemValue.value_OP1004 = value.ToString();
+
+ #endregion
+ }
+ }
}
SystemValue.lbl_Alert_OP1004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
--
Gitblit v1.9.3