From 2a55eedc9ba903c6a0b9cab8fa5ddc8fee9682aa Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 09:22:26 +0800
Subject: [PATCH] 显示 [StringLength(50)] public string DataCapturePointCname { get; set; }
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7006.cs | 320 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_04.cs | 18
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs | 288 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs | 328 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs | 12
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 3
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs | 332 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs | 412 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs | 8
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1004.cs | 3
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs | 3
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs | 338 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs | 8
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs | 3
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs | 7
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3506.cs | 320 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3003.cs | 328 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs | 35
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3504.cs | 334 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs | 340 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3001.cs | 412 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3007.cs | 342 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 6
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceInfo.cs | 7
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3005.cs | 334 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs | 286 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs | 15
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7005.cs | 348 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs | 330 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs | 5
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs | 344 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs | 10
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs | 3
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501.cs | 3
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3501.cs | 364 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3503.cs | 332 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3004.cs | 330 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3507.cs | 294 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 300 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs | 348 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs | 20
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs | 6
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7001.cs | 356 +-
43 files changed, 4,167 insertions(+), 4,068 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs
index 088dfd0..c511139 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs
@@ -14,7 +14,7 @@
/// <summary>
/// OP05 璁惧淇℃伅閲囬泦
/// </summary>
- public class DataCaptureHandler_OP0506: DataCaptureHandler
+ public class DataCaptureHandler_OP0506 : DataCaptureHandler
{
public static readonly DataCaptureHandler_OP0506 Instance = new DataCaptureHandler_OP0506();
@@ -52,8 +52,9 @@
wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.IsDeleted = false;
@@ -107,10 +108,11 @@
wplog.WorkingProcedure = WorkingProcedure;
wplog.EquipmentID = 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+"鑷姩";
+ wplog.UpdatedUserName = Environment.MachineName + "鑷姩";
wplog.OnlineTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs
index 0817dc9..888d801 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs
@@ -13,7 +13,7 @@
/// <summary>
/// OP05 鍛婅鐩戞帶
/// </summary>
- public class DataCaptureHandler_OP0507: DataCaptureHandler
+ public class DataCaptureHandler_OP0507 : DataCaptureHandler
{
public static readonly DataCaptureHandler_OP0507 Instance = new DataCaptureHandler_OP0507();
@@ -51,8 +51,9 @@
wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.IsDeleted = false;
@@ -118,8 +119,9 @@
wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.IsDeleted = false;
foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs
index 3e8e2d8..9456aab 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs
@@ -1,160 +1,160 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10宸ュ簭瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP1005: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1005 Instance = new DataCaptureHandler_OP1005();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP10宸ュ簭瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP1005: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP1005 Instance = new DataCaptureHandler_OP1005();
- public DataCaptureHandler_OP1005()
- {
- }
+// public DataCaptureHandler_OP1005()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP1005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// public override void DataCaptureStart()
+// {
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP1005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP1005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- SystemValue.value_OP1005 = value.ToString();
+// }
+// SystemValue.value_OP1005 = value.ToString();
- }
- SystemValue.lbl_Alert_OP1005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// }
+// SystemValue.lbl_Alert_OP1005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs
index 2130f8a..e354be7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs
@@ -1,160 +1,160 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10璁惧淇℃伅閲囬泦
- /// </summary>
- public class DataCaptureHandler_OP1006: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1006 Instance = new DataCaptureHandler_OP1006();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP10璁惧淇℃伅閲囬泦
+// /// </summary>
+// public class DataCaptureHandler_OP1006: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP1006 Instance = new DataCaptureHandler_OP1006();
- public DataCaptureHandler_OP1006()
- {
- }
+// public DataCaptureHandler_OP1006()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //if (SystemValue.value_OP1006.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP1006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //if (SystemValue.value_OP1006.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP1006 = value.ToString();
+// }
+// //SystemValue.value_OP1006 = value.ToString();
- }
- SystemValue.lbl_Alert_OP1006 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// }
+// SystemValue.lbl_Alert_OP1006 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $"{DataCapturePointCode}宸ュ簭璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"{DataCapturePointCode}宸ュ簭璁惧閲囬泦鏁版嵁 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $"{DataCapturePointCode}宸ュ簭璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"{DataCapturePointCode}宸ュ簭璁惧閲囬泦鏁版嵁 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs
index 03e7af1..2272d6f 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs
@@ -1,190 +1,190 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10 鍛婅鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP1007: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1007 Instance = new DataCaptureHandler_OP1007();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP10 鍛婅鐩戞帶
+// /// </summary>
+// public class DataCaptureHandler_OP1007: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP1007 Instance = new DataCaptureHandler_OP1007();
- public DataCaptureHandler_OP1007()
- {
- }
+// public DataCaptureHandler_OP1007()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
- wplog.AlertTime = DateTime.Now;
- Random ran = new Random();
- //wplog.FailureType = "1101"+ ran.Next(0,100);
- wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
+// wplog.AlertTime = DateTime.Now;
+// Random ran = new Random();
+// //wplog.FailureType = "1101"+ ran.Next(0,100);
+// wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
- wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鏁呴殰).ToString();
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鏁呴殰).ToString();
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP1007.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP1007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP1007.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- }
- SystemValue.value_OP1007 = value.ToString();
+// }
+// SystemValue.value_OP1007 = value.ToString();
- }
- SystemValue.lbl_Alert_OP1007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP1007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3001.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3001.cs
index 950efea..3dd882a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3001.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3001.cs
@@ -1,234 +1,234 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30璇荤爜瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3001: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3001 Instance = new DataCaptureHandler_OP3001();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP30璇荤爜瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3001: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3001 Instance = new DataCaptureHandler_OP3001();
- public DataCaptureHandler_OP3001()
- {
- }
+// public DataCaptureHandler_OP3001()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP3001":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP3001":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.WorkPieceID = WorkPieceID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
- //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- return;
- }
- else
- {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
+// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
+// if (wplog.WorkPieceID.Length != 22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// return;
+// }
+// else
+// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
- //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- //{
- // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// //{
+// // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- //}
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+// //}
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
- return;
- }
+// return;
+// }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3001.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3001.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig,plcService);
- if(wplog.WorkPieceID.Length!=22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- continue;
- }
- else
- {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
+// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig,plcService);
+// if(wplog.WorkPieceID.Length!=22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// continue;
+// }
+// else
+// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
- foreach (var col in colConfig.Where(o=>o.DataCapturePointCode== DataCapturePointCode))
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset,col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// foreach (var col in colConfig.Where(o=>o.DataCapturePointCode== DataCapturePointCode))
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset,col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
+// }
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
- //#region 鍙嶉PLC
+// //#region 鍙嶉PLC
- //bool checkQualityInfoCompleteFlag = false;
- //bool plcFlag = true;//鍙嶉缁橮LC鐨勬爣璁�
- //string message = "";
- //checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// //bool checkQualityInfoCompleteFlag = false;
+// //bool plcFlag = true;//鍙嶉缁橮LC鐨勬爣璁�
+// //string message = "";
+// //checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
- //{
- // plcFlag = false;
- // message = !checkQualityInfoCompleteFlag ? "璺冲簭锛�" : "";
- //message += info.QualityState != (int)QualityState.OK ? "璐ㄩ噺涓嶇鍚�" : "";
- //}
- ////鍙嶉缁橮LC锛岋紙鍐欏叆鐐瑰緟瀹氾級
- //MessageModel fr = null;
- //fr = plcService.WriteValuePoint("", "", plcFlag, PLCManger.GetTypeForString("bool"));
- //if (fr.result)
- //{
- // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 鎴愬姛锛� 鍑虹幇 {message}");
- //}
- //else
- //{
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 澶辫触锛� 鍑虹幇 {message} 锛屽け璐ュ師鍥狅細{fr.resMsg}");
- //}
- //#endregion
+// //if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
+// //{
+// // plcFlag = false;
+// // message = !checkQualityInfoCompleteFlag ? "璺冲簭锛�" : "";
+// //message += info.QualityState != (int)QualityState.OK ? "璐ㄩ噺涓嶇鍚�" : "";
+// //}
+// ////鍙嶉缁橮LC锛岋紙鍐欏叆鐐瑰緟瀹氾級
+// //MessageModel fr = null;
+// //fr = plcService.WriteValuePoint("", "", plcFlag, PLCManger.GetTypeForString("bool"));
+// //if (fr.result)
+// //{
+// // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 鎴愬姛锛� 鍑虹幇 {message}");
+// //}
+// //else
+// //{
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 澶辫触锛� 鍑虹幇 {message} 锛屽け璐ュ師鍥狅細{fr.resMsg}");
+// //}
+// //#endregion
- }
- SystemValue.value_OP3001 = value.ToString();
+// }
+// SystemValue.value_OP3001 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// }
+// SystemValue.lbl_Alert_OP3001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- //catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- //{
- // SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// //catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// //{
+// // SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3003.cs
index ad47278..31f6850 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3003.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3003.cs
@@ -1,184 +1,184 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30 NOOK鎺ㄥ嚭鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3003: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3003 Instance = new DataCaptureHandler_OP3003();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP30 NOOK鎺ㄥ嚭鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3003: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3003 Instance = new DataCaptureHandler_OP3003();
- public DataCaptureHandler_OP3003()
- {
- }
+// public DataCaptureHandler_OP3003()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP3003":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP3003":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3003 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //if (SystemValue.value_OP3003.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //foreach (var col in colConfig)
- //{
- // switch(col.DbNumber+ col.Offset)
- // {
- // case "":
- var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- wplog.WorkPieceID = valuecol.ToString();
- // break;
- // }
- //}
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3003 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //if (SystemValue.value_OP3003.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //foreach (var col in colConfig)
+// //{
+// // switch(col.DbNumber+ col.Offset)
+// // {
+// // case "":
+// var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// wplog.WorkPieceID = valuecol.ToString();
+// // break;
+// // }
+// //}
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- }
- //SystemValue.value_OP3003 = value.ToString();
+// }
+// //SystemValue.value_OP3003 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3003 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3004.cs
index 785e125..a74e9e8 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3004.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3004.cs
@@ -1,188 +1,188 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30 SPC鎺ㄥ嚭鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3004: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3004 Instance = new DataCaptureHandler_OP3004();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP30 SPC鎺ㄥ嚭鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3004: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3004 Instance = new DataCaptureHandler_OP3004();
- public DataCaptureHandler_OP3004()
- {
- }
+// public DataCaptureHandler_OP3004()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP3004":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP3004":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3004 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3004.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig)
- {
- switch(col.DbNumber+ col.Offset)
- {
- case "":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3004 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3004.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig)
+// {
+// switch(col.DbNumber+ col.Offset)
+// {
+// case "":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP3004 = value.ToString();
+// }
+// //SystemValue.value_OP3004 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3004 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3005.cs
index 3a97b44..ea6cbfe 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3005.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3005.cs
@@ -1,191 +1,191 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30 宸ュ簭瀹屾垚
- /// </summary>
- public class DataCaptureHandler_OP3005: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3005 Instance = new DataCaptureHandler_OP3005();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP30 宸ュ簭瀹屾垚
+// /// </summary>
+// public class DataCaptureHandler_OP3005: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3005 Instance = new DataCaptureHandler_OP3005();
- public DataCaptureHandler_OP3005()
- {
- }
+// public DataCaptureHandler_OP3005()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP3005":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP3005":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧{DataCapturePointCode}";
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {_dataCaptureConfig.WorkingProcedure}宸ュ簭鑾峰彇鍒皗DataCapturePointCode}鏍囧織浣�");
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch(col.DataCaptureColumnTabelName)
- {
- case "WorkPieceID":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧{DataCapturePointCode}";
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {_dataCaptureConfig.WorkingProcedure}宸ュ簭鑾峰彇鍒皗DataCapturePointCode}鏍囧織浣�");
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// switch(col.DataCaptureColumnTabelName)
+// {
+// case "WorkPieceID":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- SystemValue.value_OP3005 = value.ToString().ToUpper();
+// }
+// SystemValue.value_OP3005 = value.ToString().ToUpper();
- }
- SystemValue.lbl_Alert_OP3005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3005 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3007.cs
index 682bc15..b7aec56 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3007.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3007.cs
@@ -1,195 +1,197 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30 鍛婅鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP3007: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3007 Instance = new DataCaptureHandler_OP3007();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP30 鍛婅鐩戞帶
+// /// </summary>
+// public class DataCaptureHandler_OP3007 : DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3007 Instance = new DataCaptureHandler_OP3007();
- public DataCaptureHandler_OP3007()
- {
- }
+// public DataCaptureHandler_OP3007()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP3007":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP3007":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// /*
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
- wplog.AlertTime = DateTime.Now;
- Random ran = new Random();
- //wplog.FailureType = "1101"+ ran.Next(0,100);
- wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
+// wplog.AlertTime = DateTime.Now;
+// Random ran = new Random();
+// //wplog.FailureType = "1101"+ ran.Next(0,100);
+// wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
- wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鏁呴殰).ToString();
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鏁呴殰).ToString();
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3007.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig)
- {
- switch(col.DbNumber+ col.Offset)
- {
- case "":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// //*/
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3007.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig)
+// {
+// switch (col.DbNumber + col.Offset)
+// {
+// case "":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP3007 = value.ToString();
+// }
+// //SystemValue.value_OP3007 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3501.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3501.cs
index 0c4ad65..efc58e1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3501.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3501.cs
@@ -1,205 +1,205 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using iWare_SCADA_Model.TableModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using iWare_SCADA_Model.TableModel;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35璇荤爜瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3501 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3501 Instance = new DataCaptureHandler_OP3501();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP35璇荤爜瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3501 : DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3501 Instance = new DataCaptureHandler_OP3501();
- public DataCaptureHandler_OP3501()
- {
- }
+// public DataCaptureHandler_OP3501()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.WorkPieceID = WorkPieceID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
- //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- return;
- }
- else
- {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
+// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
+// if (wplog.WorkPieceID.Length != 22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// return;
+// }
+// else
+// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
- //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- //{
- // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// //{
+// // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- //}
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+// //}
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
- return;
- }
+// return;
+// }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- threadStatusMonitor.Remarks= $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- SystemValue.lbl_Alert_OP3501 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3501.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// if (plcService == null || !plcService.IsConnected)
+// {
+// threadStatusMonitor.Remarks= $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// SystemValue.lbl_Alert_OP3501 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3501.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
- threadStatusMonitor.Threadstatue = 1;
+// threadStatusMonitor.Threadstatue = 1;
- }
- SystemValue.value_OP3501 = value.ToString();
+// }
+// SystemValue.value_OP3501 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3501 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- threadStatusMonitor.ThreadFrequency = 5000;
- Thread.Sleep(5000);
- }
- else
- {
- threadStatusMonitor.ThreadFrequency = _dataCaptureConfig.DataCaptureFrequency.Value;
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// }
+// SystemValue.lbl_Alert_OP3501 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// threadStatusMonitor.ThreadFrequency = 5000;
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// threadStatusMonitor.ThreadFrequency = _dataCaptureConfig.DataCaptureFrequency.Value;
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3501 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3501 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3501 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3501 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3503.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3503.cs
index 84254b4..d221708 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3503.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3503.cs
@@ -1,185 +1,185 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35 NOOK鎺ㄥ嚭鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3503: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3503 Instance = new DataCaptureHandler_OP3503();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP35 NOOK鎺ㄥ嚭鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3503: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3503 Instance = new DataCaptureHandler_OP3503();
- public DataCaptureHandler_OP3503()
- {
- }
+// public DataCaptureHandler_OP3503()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3503 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3503.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶NOOK鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶NOOK鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3503 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3503.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶NOOK鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶NOOK鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- }
- SystemValue.value_OP3503 = value.ToString();
+// }
+// SystemValue.value_OP3503 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3503 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3503 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3503 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶NOOK鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3504.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3504.cs
index 7da9c26..685393c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3504.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3504.cs
@@ -1,189 +1,189 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35 SPC鎺ㄥ嚭鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3504: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3504 Instance = new DataCaptureHandler_OP3504();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP35 SPC鎺ㄥ嚭鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3504: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3504 Instance = new DataCaptureHandler_OP3504();
- public DataCaptureHandler_OP3504()
- {
- }
+// public DataCaptureHandler_OP3504()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3504 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3504.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶spc鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶spc鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3504 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3504.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶spc鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶spc鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- SystemValue.value_OP3504 = value.ToString();
+// }
+// SystemValue.value_OP3504 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3504 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3504 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3504 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶spc鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
index 4425913..97596c1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
@@ -1,193 +1,193 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35 宸ュ簭瀹屾垚
- /// </summary>
- public class DataCaptureHandler_OP3505: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3505 Instance = new DataCaptureHandler_OP3505();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP35 宸ュ簭瀹屾垚
+// /// </summary>
+// public class DataCaptureHandler_OP3505: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3505 Instance = new DataCaptureHandler_OP3505();
- public DataCaptureHandler_OP3505()
- {
- }
+// public DataCaptureHandler_OP3505()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+
+
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3505 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{DataCapturePointCode}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟DataCapturePointCode}鐨凱LC璁惧";
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅");
+
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch(Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id},璧嬪�煎垪鍚峓{col.DataCaptureColumnTabelName ?? "绌哄瓧绗︿覆"}]", setex);
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3505 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{DataCapturePointCode}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟DataCapturePointCode}鐨凱LC璁惧";
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅");
-
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
-
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch(Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id},璧嬪�煎垪鍚峓{col.DataCaptureColumnTabelName ?? "绌哄瓧绗︿覆"}]", setex);
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
-
-
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- SystemValue.value_OP3505 = value.ToString();
+// }
+// SystemValue.value_OP3505 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3505 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3505 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3506.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3506.cs
index e5d6abb..77527c7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3506.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3506.cs
@@ -1,175 +1,175 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35 璁惧淇℃伅閲囬泦
- /// </summary>
- public class DataCaptureHandler_OP3506 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3506 Instance = new DataCaptureHandler_OP3506();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP35 璁惧淇℃伅閲囬泦
+// /// </summary>
+// public class DataCaptureHandler_OP3506 : DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3506 Instance = new DataCaptureHandler_OP3506();
- public DataCaptureHandler_OP3506()
- {
- }
+// public DataCaptureHandler_OP3506()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3506 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3506 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
- }
- SystemValue.lbl_Alert_OP3506 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// threadStatusMonitor.Threadstatue = 1;
+// }
+// SystemValue.lbl_Alert_OP3506 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3506 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3507.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3507.cs
index 5365834..6c10e27 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3507.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3507.cs
@@ -1,163 +1,163 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35 鍛婅鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP3507 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3507 Instance = new DataCaptureHandler_OP3507();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP35 鍛婅鐩戞帶
+// /// </summary>
+// public class DataCaptureHandler_OP3507 : DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3507 Instance = new DataCaptureHandler_OP3507();
- public DataCaptureHandler_OP3507()
- {
- }
+// public DataCaptureHandler_OP3507()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3507 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP3507.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //if (wplog.FailureType.Length > 0)
- //{
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
- //}
+// public override void DataCaptureStart()
+// {
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP3507 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP3507.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //if (wplog.FailureType.Length > 0)
+// //{
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
+// //}
- }
- SystemValue.value_OP3507 = value.ToString();
+// }
+// SystemValue.value_OP3507 = value.ToString();
- }
- SystemValue.lbl_Alert_OP3507 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP3507 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP3507 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7001.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7001.cs
index f7e5bb6..933a6d7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7001.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7001.cs
@@ -1,201 +1,201 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP70璇荤爜瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP7001: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP7001 Instance = new DataCaptureHandler_OP7001();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP70璇荤爜瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP7001: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP7001 Instance = new DataCaptureHandler_OP7001();
- public DataCaptureHandler_OP7001()
- {
- }
+// public DataCaptureHandler_OP7001()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.WorkPieceID = WorkPieceID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
- //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- return;
- }
- else
- {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
+// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
+// if (wplog.WorkPieceID.Length != 22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// return;
+// }
+// else
+// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
- //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- //{
- // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// //{
+// // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- //}
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+// //}
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
- return;
- }
+// return;
+// }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP7001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP7001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP7001.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP7001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP7001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP7001.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
- threadStatusMonitor.Threadstatue = 1;
+// threadStatusMonitor.Threadstatue = 1;
- }
- SystemValue.value_OP7001 = value.ToString();
+// }
+// SystemValue.value_OP7001 = value.ToString();
- }
- SystemValue.lbl_Alert_OP7001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// }
+// SystemValue.lbl_Alert_OP7001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP7001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP7001 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP7001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP7001 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7005.cs
index e84af66..fcdd6d6 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7005.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7005.cs
@@ -1,199 +1,199 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP70 宸ュ簭瀹屾垚
- /// </summary>
- public class DataCaptureHandler_OP7005 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP7005 Instance = new DataCaptureHandler_OP7005();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP70 宸ュ簭瀹屾垚
+// /// </summary>
+// public class DataCaptureHandler_OP7005 : DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP7005 Instance = new DataCaptureHandler_OP7005();
- public DataCaptureHandler_OP7005()
- {
- }
+// public DataCaptureHandler_OP7005()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP7005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{DataCapturePointCode}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- SystemValue.lbl_Alert_OP7005 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟DataCapturePointCode}鐨凱LC璁惧";
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP7005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{DataCapturePointCode}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// SystemValue.lbl_Alert_OP7005 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟DataCapturePointCode}鐨凱LC璁惧";
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP7005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅");
+// if (SystemValue.value_OP7005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅");
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id},璧嬪�煎垪鍚峓{col.DataCaptureColumnTabelName ?? "绌哄瓧绗︿覆"}]", setex);
- }
- }
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹椂寮傚父锛�");
- continue;
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id},璧嬪�煎垪鍚峓{col.DataCaptureColumnTabelName ?? "绌哄瓧绗︿覆"}]", setex);
+// }
+// }
+// if (wplog.WorkPieceID.Length != 22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹椂寮傚父锛�");
+// continue;
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// threadStatusMonitor.Threadstatue = 1;
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- SystemValue.value_OP7005 = value.ToString();
+// }
+// SystemValue.value_OP7005 = value.ToString();
- }
- SystemValue.lbl_Alert_OP7005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP7005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP7005 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7006.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7006.cs
index 412b74d..0fd980f 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7006.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7006.cs
@@ -1,175 +1,175 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP70 璁惧淇℃伅閲囬泦
- /// </summary>
- public class DataCaptureHandler_OP7006: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP7006 Instance = new DataCaptureHandler_OP7006();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP70 璁惧淇℃伅閲囬泦
+// /// </summary>
+// public class DataCaptureHandler_OP7006: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP7006 Instance = new DataCaptureHandler_OP7006();
- public DataCaptureHandler_OP7006()
- {
- }
+// public DataCaptureHandler_OP7006()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP7006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP7006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
- }
- SystemValue.lbl_Alert_OP7006 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// threadStatusMonitor.Threadstatue = 1;
+// }
+// SystemValue.lbl_Alert_OP7006 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP7006 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs
index da4bd16..6714f71 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs
@@ -1,193 +1,193 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP70 鍛婅鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP7007: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP7007 Instance = new DataCaptureHandler_OP7007();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP70 鍛婅鐩戞帶
+// /// </summary>
+// public class DataCaptureHandler_OP7007: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP7007 Instance = new DataCaptureHandler_OP7007();
- public DataCaptureHandler_OP7007()
- {
- }
+// public DataCaptureHandler_OP7007()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
- wplog.AlertTime = DateTime.Now;
- Random ran = new Random();
- //wplog.FailureType = "1101"+ ran.Next(0,100);
- wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
+// wplog.AlertTime = DateTime.Now;
+// Random ran = new Random();
+// //wplog.FailureType = "1101"+ ran.Next(0,100);
+// wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
- wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鏁呴殰).ToString();
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鏁呴殰).ToString();
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP7007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP7007.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- try
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
- if (set == null)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //if(wplog.FailureType.Length>0)
- {
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
- }
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP7007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP7007.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// {
+// try
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+// if (set == null)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+// }
+// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// }
+// catch (Exception setex)
+// {
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+// }
+// }
+// //if(wplog.FailureType.Length>0)
+// {
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
+// }
- }
- SystemValue.value_OP7007 = value.ToString();
+// }
+// SystemValue.value_OP7007 = value.ToString();
- }
- SystemValue.lbl_Alert_OP7007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP7007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs
index b498030..946fc69 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs
@@ -1,234 +1,234 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80璇荤爜瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP8001: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8001 Instance = new DataCaptureHandler_OP8001();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP80璇荤爜瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP8001: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP8001 Instance = new DataCaptureHandler_OP8001();
- public DataCaptureHandler_OP8001()
- {
- }
+// public DataCaptureHandler_OP8001()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8001":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP8001":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.WorkPieceID = WorkPieceID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
- //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- return;
- }
- else
- {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
+// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig, plcService);
+// if (wplog.WorkPieceID.Length != 22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// return;
+// }
+// else
+// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
- //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- //{
- // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+// //{
+// // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- //}
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+// //}
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
- return;
- }
+// return;
+// }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP8001.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP8001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP8001.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLog wplog = new WorkPieceLog();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig,plcService);
- if(wplog.WorkPieceID.Length!=22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- continue;
- }
- else
- {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
+// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig,plcService);
+// if(wplog.WorkPieceID.Length!=22)
+// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+// continue;
+// }
+// else
+// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
- foreach (var col in colConfig.Where(o=>o.DataCapturePointCode== DataCapturePointCode))
- {
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset,col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+// foreach (var col in colConfig.Where(o=>o.DataCapturePointCode== DataCapturePointCode))
+// {
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset,col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- }
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
+// }
+// }
+// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
- //#region 鍙嶉PLC
+// //#region 鍙嶉PLC
- //bool checkQualityInfoCompleteFlag = false;
- //bool plcFlag = true;//鍙嶉缁橮LC鐨勬爣璁�
- //string message = "";
- //checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// //bool checkQualityInfoCompleteFlag = false;
+// //bool plcFlag = true;//鍙嶉缁橮LC鐨勬爣璁�
+// //string message = "";
+// //checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
- //{
- // plcFlag = false;
- // message = !checkQualityInfoCompleteFlag ? "璺冲簭锛�" : "";
- //message += info.QualityState != (int)QualityState.OK ? "璐ㄩ噺涓嶇鍚�" : "";
- //}
- ////鍙嶉缁橮LC锛岋紙鍐欏叆鐐瑰緟瀹氾級
- //MessageModel fr = null;
- //fr = plcService.WriteValuePoint("", "", plcFlag, PLCManger.GetTypeForString("bool"));
- //if (fr.result)
- //{
- // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 鎴愬姛锛� 鍑虹幇 {message}");
- //}
- //else
- //{
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 澶辫触锛� 鍑虹幇 {message} 锛屽け璐ュ師鍥狅細{fr.resMsg}");
- //}
- //#endregion
+// //if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
+// //{
+// // plcFlag = false;
+// // message = !checkQualityInfoCompleteFlag ? "璺冲簭锛�" : "";
+// //message += info.QualityState != (int)QualityState.OK ? "璐ㄩ噺涓嶇鍚�" : "";
+// //}
+// ////鍙嶉缁橮LC锛岋紙鍐欏叆鐐瑰緟瀹氾級
+// //MessageModel fr = null;
+// //fr = plcService.WriteValuePoint("", "", plcFlag, PLCManger.GetTypeForString("bool"));
+// //if (fr.result)
+// //{
+// // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 鎴愬姛锛� 鍑虹幇 {message}");
+// //}
+// //else
+// //{
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" 宸ヤ欢{wplog.WorkPieceID} {WorkingProcedure}宸ュ簭鍙嶉缁橮LC 澶辫触锛� 鍑虹幇 {message} 锛屽け璐ュ師鍥狅細{fr.resMsg}");
+// //}
+// //#endregion
- }
- SystemValue.value_OP8001 = value.ToString();
+// }
+// SystemValue.value_OP8001 = value.ToString();
- }
- SystemValue.lbl_Alert_OP8001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// }
+// SystemValue.lbl_Alert_OP8001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- //catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- //{
- // SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// //catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// //{
+// // SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs
index 6ba3afd..aefa8e7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs
@@ -1,184 +1,184 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80 NOOK鎺ㄥ嚭鏍囪
- /// </summary>
- public class DataCaptureHandler_OP8003: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8003 Instance = new DataCaptureHandler_OP8003();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP80 NOOK鎺ㄥ嚭鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP8003: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP8003 Instance = new DataCaptureHandler_OP8003();
- public DataCaptureHandler_OP8003()
- {
- }
+// public DataCaptureHandler_OP8003()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8003":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP8003":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8003 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- //if (SystemValue.value_OP8003.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- //foreach (var col in colConfig)
- //{
- // switch(col.DbNumber+ col.Offset)
- // {
- // case "":
- var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
- wplog.WorkPieceID = valuecol.ToString();
- // break;
- // }
- //}
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP8003 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// //if (SystemValue.value_OP8003.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// //foreach (var col in colConfig)
+// //{
+// // switch(col.DbNumber+ col.Offset)
+// // {
+// // case "":
+// var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
+// wplog.WorkPieceID = valuecol.ToString();
+// // break;
+// // }
+// //}
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- }
- //SystemValue.value_OP8003 = value.ToString();
+// }
+// //SystemValue.value_OP8003 = value.ToString();
- }
- SystemValue.lbl_Alert_OP8003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP8003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs
index d920826..cec32ae 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs
@@ -1,188 +1,188 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80 娴嬮噺瀹屾垚鍚庤鐮佸畬鎴�
- /// </summary>
- public class DataCaptureHandler_OP8004: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8004 Instance = new DataCaptureHandler_OP8004();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP80 娴嬮噺瀹屾垚鍚庤鐮佸畬鎴�
+// /// </summary>
+// public class DataCaptureHandler_OP8004: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP8004 Instance = new DataCaptureHandler_OP8004();
- public DataCaptureHandler_OP8004()
- {
- }
+// public DataCaptureHandler_OP8004()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8004":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP8004":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8004 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP8004.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig)
- {
- switch(col.DbNumber+ col.Offset)
- {
- case "":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP8004 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP8004.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig)
+// {
+// switch(col.DbNumber+ col.Offset)
+// {
+// case "":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP8004 = value.ToString();
+// }
+// //SystemValue.value_OP8004 = value.ToString();
- }
- SystemValue.lbl_Alert_OP8004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP8004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs
index 3e0da6e..d44717d 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs
@@ -1,189 +1,189 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80 宸ュ簭瀹屾垚
- /// </summary>
- public class DataCaptureHandler_OP8005: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8005 Instance = new DataCaptureHandler_OP8005();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP80 宸ュ簭瀹屾垚
+// /// </summary>
+// public class DataCaptureHandler_OP8005: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP8005 Instance = new DataCaptureHandler_OP8005();
- public DataCaptureHandler_OP8005()
- {
- }
+// public DataCaptureHandler_OP8005()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8005":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP8005":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP8005.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig)
- {
- switch(col.DbNumber+ col.Offset)
- {
- case "":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP8005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP8005.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig)
+// {
+// switch(col.DbNumber+ col.Offset)
+// {
+// case "":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP8005 = value.ToString();
+// }
+// //SystemValue.value_OP8005 = value.ToString();
- }
- SystemValue.lbl_Alert_OP8005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP8005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
index 84dc2f6..57a0685 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
@@ -1,195 +1,195 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80 鍛婅鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP8007: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8007 Instance = new DataCaptureHandler_OP8007();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP80 鍛婅鐩戞帶
+// /// </summary>
+// public class DataCaptureHandler_OP8007: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP8007 Instance = new DataCaptureHandler_OP8007();
- public DataCaptureHandler_OP8007()
- {
- }
+// public DataCaptureHandler_OP8007()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8007":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP8007":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
- wplog.AlertTime = DateTime.Now;
- Random ran = new Random();
- //wplog.FailureType = "1101"+ ran.Next(0,100);
- wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
+// wplog.AlertTime = DateTime.Now;
+// Random ran = new Random();
+// //wplog.FailureType = "1101"+ ran.Next(0,100);
+// wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
- wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鐢熶骇).ToString();
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鐢熶骇).ToString();
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP8007.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig)
- {
- switch(col.DbNumber+ col.Offset)
- {
- case "":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP8007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP8007.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig)
+// {
+// switch(col.DbNumber+ col.Offset)
+// {
+// case "":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP8007 = value.ToString();
+// }
+// //SystemValue.value_OP8007 = value.ToString();
- }
- SystemValue.lbl_Alert_OP8007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP8007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
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 7de6746..c1f4a6f 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
@@ -145,8 +145,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();
@@ -179,7 +180,8 @@
//鐗规畩澶勭悊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);
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 3866743..481e4fd 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -214,8 +214,9 @@
logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ;
logMiddle.Remarks = WorkingProcedure;
logMiddle.MonitoringPoint = DataCapturePointCode;
+ //logMiddle.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, DataCapturePointCode, DataCapturePointCname);
logMiddle.CreatedTime = DateTimeHelper.GetDateTime();
- logMiddle.CreatedUserName = DataCapturePointCode;
logMiddle.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
logMiddle.UpdatedTime = DateTimeHelper.GetDateTime();
logMiddle.IsDeleted = false;
@@ -500,7 +501,8 @@
SystemValue.OP20_Side_Value = sideValue;
}
logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
- logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ //logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢logMiddle.WorkPieceID},宸ヤ綅{gongweiStr}锛屾牎楠岄�氳繃锛岃鍙朞p60_Place_Flag:true");
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs
index 8efda46..ce93629 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_03.cs
@@ -15,7 +15,7 @@
/// <summary>
/// NOOK鎺ㄥ嚭鏍囪
/// </summary>
- public class DataCaptureHandler_03: DataCaptureHandler
+ public class DataCaptureHandler_03 : DataCaptureHandler
{
public static readonly DataCaptureHandler_03 Instance = new DataCaptureHandler_03();
@@ -53,8 +53,9 @@
wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.IsDeleted = false;
@@ -119,11 +120,13 @@
wplog.WorkingProcedure = WorkingProcedure;
wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
wplog.Remarks = WorkingProcedure;
+
+ //wplog.WorkPieceID = "123456";
wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+ wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
@@ -144,7 +147,7 @@
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶NOOK鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
}
}
- if(_dataCaptureConfig.WorkingProcedure.Equals("OP20")
+ if (_dataCaptureConfig.WorkingProcedure.Equals("OP20")
//||_dataCaptureConfig.WorkingProcedure.Equals("OP60")
)
{//op20浼氬悓鏃舵帹鍑哄浠讹紝鎵�浠ョ壒娈婂鐞�
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_04.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_04.cs
index a633781..5e0f18d 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_04.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_04.cs
@@ -14,7 +14,7 @@
/// <summary>
/// SPC鎺ㄥ嚭鏍囪
/// </summary>
- public class DataCaptureHandler_04: DataCaptureHandler
+ public class DataCaptureHandler_04 : DataCaptureHandler
{
public static readonly DataCaptureHandler_04 Instance = new DataCaptureHandler_04();
@@ -52,8 +52,9 @@
wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.IsDeleted = false;
@@ -118,11 +119,14 @@
wplog.WorkingProcedure = WorkingProcedure;
wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
wplog.Remarks = WorkingProcedure;
+
+ //wplog.WorkPieceID = "123456";
+
wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+ wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
@@ -144,7 +148,7 @@
}
}
- if (_dataCaptureConfig.WorkingProcedure.Equals("OP20")|| _dataCaptureConfig.WorkingProcedure.Equals("OP60")
+ if (_dataCaptureConfig.WorkingProcedure.Equals("OP20") || _dataCaptureConfig.WorkingProcedure.Equals("OP60")
)
{//op20,op50,op60 浼氬悓鏃舵帹鍑哄浠讹紝鎵�浠ョ壒娈婂鐞�
wplog.WorkPieceID = wplog.WorkPieceIDA;
@@ -156,7 +160,7 @@
wplog.WorkPieceID = wplog.WorkPieceIDC;
wplog.Remarks = "SPC鎺ㄥ嚭宸ヤ欢C";
WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- if(_dataCaptureConfig.WorkingProcedure.Equals("OP60"))
+ if (_dataCaptureConfig.WorkingProcedure.Equals("OP60"))
{
wplog.WorkPieceID = wplog.WorkPieceIDD;
wplog.Remarks = "SPC鎺ㄥ嚭宸ヤ欢D";
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
index f0ab5cc..c9b4d37 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
@@ -48,6 +48,7 @@
{
if (SystemValue.isStartedImitateModel)
{
+ /*
var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -67,6 +68,7 @@
wplog.UpdatedUserName = DataCapturePointCode;
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ /**/
return;
}
@@ -126,8 +128,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.IsDeleted = false;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs
index ba60c26..9fe30f2 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_06.cs
@@ -54,8 +54,9 @@
wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.IsDeleted = false;
@@ -122,12 +123,13 @@
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;;
+ 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;
@@ -158,7 +160,7 @@
//{//璇存槑鍛婅淇℃伅鏁版嵁鍙戠敓鍙樻洿
// wplog.ischeckMessageStatus = true;
//}
- if(wplog.WorkingProcedure.Equals("OP05"))
+ if (wplog.WorkingProcedure.Equals("OP05"))
{
if (fullBeatMonitorflag != wplog.FullMaterial)
{//鍫垫枡蹇冭烦鍙樺寲
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501.cs
index 48c6346..1f0516a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501.cs
@@ -266,8 +266,9 @@
//wplog.EquipmentID = WorkingProcedure;
wplog.Remarks = "cs";
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.IsDeleted = false;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs
index 62fc0f9..16631df 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs
@@ -98,8 +98,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.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
@@ -116,30 +117,35 @@
if (valuecola.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002AA";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.52.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else if (valuecolb.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002BB";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.76.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else if (valuecolc.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002CC";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.100.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else if (valuecold.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002DD";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.124.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else
{
wplog.CreatedUserName = "OP6002EE";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
}
wplog.WorkPieceID = code;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
index 04da666..4d4fd44 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -175,8 +175,9 @@
logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ;
logMiddle.Remarks = logMiddle.WorkingProcedure;
logMiddle.MonitoringPoint = _DataCapturePointCode;
+ //logMiddle.CreatedUserName = _DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, DataCapturePointCode, DataCapturePointCname);
logMiddle.CreatedTime = DateTimeHelper.GetDateTime();
- logMiddle.CreatedUserName = _DataCapturePointCode;
logMiddle.UpdatedTime = DateTimeHelper.GetDateTime();
logMiddle.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
logMiddle.IsDeleted = false;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
index 11923e3..ff75d06 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
@@ -104,8 +104,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();
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
index be5f480..18763cd 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
@@ -104,8 +104,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();
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 b69fde6..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();
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 f9557ad..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
@@ -110,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();
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
index 25095eb..87ff0d4 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
@@ -13,6 +13,41 @@
/// </summary>
public class SystemBussinessHelper
{
+ /// <summary>
+ /// 璁剧疆WorkPieceLog 鐨勫垱寤轰汉
+ /// </summary>
+ /// <param name="workPieceLog"></param>
+ /// <param name="_DataCapturePointCode"></param>
+ /// <param name="_DataCapturePointName"></param>
+ public static void SetWorkPieceLogMiddleForCreatedUserName(ref WorkPieceLogMiddle workPieceLog, string _DataCapturePointCode, string _DataCapturePointName)
+ {
+ workPieceLog.CreatedUserName = _DataCapturePointCode;
+ workPieceLog.DataCapturePointCname = _DataCapturePointName;
+ }
+ /// <summary>
+ /// 璁剧疆WorkPieceLog 鐨勫垱寤轰汉
+ /// </summary>
+ /// <param name="workPieceLog"></param>
+ /// <param name="_DataCapturePointCode"></param>
+ /// <param name="_DataCapturePointName"></param>
+ public static void SetWorkPieceLogMiddleForCreatedUserName(ref WorkPieceLog workPieceLog, string _DataCapturePointCode, string _DataCapturePointName)
+ {
+ workPieceLog.CreatedUserName = _DataCapturePointCode;
+ workPieceLog.DataCapturePointCname = _DataCapturePointName;
+ }
+
+ /// <summary>
+ /// 璁剧疆WorkPieceLog 鐨勬洿鏂颁汉
+ /// </summary>
+ /// <param name="workPieceLog"></param>
+ /// <param name="_DataCapturePointCode"></param>
+ /// <param name="_DataCapturePointName"></param>
+ public static void SetWorkPieceLogMiddleForUpdatedUserName(ref WorkPieceLogMiddle workPieceLog, string _DataCapturePointCode, string _DataCapturePointName)
+ {
+ workPieceLog.UpdatedUserName = _DataCapturePointCode;
+ workPieceLog.UpdateDataCapturePointCname = _DataCapturePointName;
+ }
+
/// <summary>
/// 鏄惁鍏佽淇敼WorkPieceState 涓篧IP
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index b6e683c..f2d3302 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -912,22 +912,22 @@
private void button9_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3001.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3001.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button11_Click(object sender, EventArgs e)
@@ -955,85 +955,85 @@
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3003.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3003.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button15_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3007.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3007.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button13_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3004.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3004.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button14_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3005.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3005.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button16_Click(object sender, EventArgs e)
@@ -1124,22 +1124,22 @@
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8001.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8001.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button21_Click(object sender, EventArgs e)
@@ -1168,88 +1168,88 @@
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8003.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8003.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button19_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8004.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8004.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button18_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8005.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8005.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button17_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8007.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8007.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
/// <summary>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceInfo.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceInfo.cs
index dec8c15..d7ac550 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceInfo.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceInfo.cs
@@ -138,5 +138,12 @@
[StringLength(255)]
public string OP80NewCode { get; set; }
+
+
+ [StringLength(50)]
+ public string DataCapturePointCname { get; set; }
+
+ [StringLength(50)]
+ public string UpdateDataCapturePointCname { get; set; }
}
}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
index 571bdfa..3c63552 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
@@ -39,8 +39,7 @@
[StringLength(32)]
public string WorkingProcedure { get; set; }
- [StringLength(32)]
- public string MonitoringPoint { get; set; }
+
public int? QualityState { get; set; }
@@ -124,9 +123,26 @@
public long? CreatedUserId { get; set; }
+ /// <summary>
+ /// 工序创建人,值等于 CreatedUserName
+ /// </summary>
+ [StringLength(32)]
+ public string MonitoringPoint { get; set; }
+
+
+ /// <summary>
+ /// 工序创建人，值等于MonitoringPoint
+ /// </summary>
[StringLength(50)]
public string CreatedUserName { get; set; }
+
+ [StringLength(50)]
+ public string DataCapturePointCname { get; set; }
+
+ [StringLength(50)]
+ public string UpdateDataCapturePointCname { get; set; }
+
public long? UpdatedUserId { get; set; }
[StringLength(50)]
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
index 95a72e4..e42c88f 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
@@ -82,5 +82,12 @@
/// 获取QC数据标记描述 【Editby shaocx,2024-06-15】
/// </summary>
public string GetQcDataFlag_Remark { get; set; }
+
+
+ [StringLength(50)]
+ public string DataCapturePointCname { get; set; }
+
+ [StringLength(50)]
+ public string UpdateDataCapturePointCname { get; set; }
}
}
--
Gitblit v1.9.3