From 7e86339a0ae4793627696008d3c08c8b655e03cf Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 15:14:55 +0800
Subject: [PATCH] 删除不用的文件
---
/dev/null | 175 -------------------------------------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 18 ----
2 files changed, 0 insertions(+), 193 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2004.cs
deleted file mode 100644
index a192491..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2004.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-锘�//using iWare_SCADA_BusinessLogical.BLL;
-//using iWare_SCADA_BusinessLogical.BLL.Important;
-//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>
-// /// OP20SPC鎺ㄥ嚭鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP2004 : DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP2004 Instance = new DataCaptureHandler_OP2004();
-
-// public DataCaptureHandler_OP2004()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// //try
-// //{
-// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
-// // {
-// // switch (dataCaptureColumnDict.DataCapturePointCode)
-// // {
-// // case "OP2001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue._lbl_Alert_OP2001 = $"{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_OP2001 = $" {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_OP2001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLog wplog = new WorkPieceLog();
-// wplog.WorkingProcedure = "OP20";
-// wplog.EquipmentID = "OP20";
-// wplog.Remarks = "OP20";
-// wplog.MonitoringPoint = "OP2004";
-// 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琛�
-// ReadQRcodeManager.ReadQRcode(wplog, LogType.PLCOP20, plcService, _dataCaptureConfig.IsFeedback);
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP2001 = value.ToString();
-
-
-// }
-// SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, "璇籓P05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2005.cs
deleted file mode 100644
index 3050a66..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2005.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-锘�//using iWare_SCADA_BusinessLogical.BLL;
-//using iWare_SCADA_BusinessLogical.BLL.Important;
-//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>
-// /// OP20宸ュ簭瀹屾垚鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP2005: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP2005 Instance = new DataCaptureHandler_OP2005();
-
-// public DataCaptureHandler_OP2005()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// //try
-// //{
-// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
-// // {
-// // switch (dataCaptureColumnDict.DataCapturePointCode)
-// // {
-// // case "OP2001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue._lbl_Alert_OP2001 = $"{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_OP2001 = $" {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_OP2001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLog wplog = new WorkPieceLog();
-// wplog.WorkingProcedure = "OP20";
-// wplog.EquipmentID = "OP20";
-// wplog.Remarks = "OP20";
-// wplog.MonitoringPoint = "OP2005";
-// 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琛�
-// ReadQRcodeManager.ReadQRcode(wplog, LogType.PLCOP20, plcService, _dataCaptureConfig.IsFeedback);
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP2001 = value.ToString();
-
-
-// }
-// SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, "璇籓P05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2006.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2006.cs
deleted file mode 100644
index 9588a88..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2006.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-锘�//using iWare_SCADA_BusinessLogical.BLL;
-//using iWare_SCADA_BusinessLogical.BLL.Important;
-//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>
-// /// OP20鍛婅鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP2006: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP2006 Instance = new DataCaptureHandler_OP2006();
-
-// public DataCaptureHandler_OP2006()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// //try
-// //{
-// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
-// // {
-// // switch (dataCaptureColumnDict.DataCapturePointCode)
-// // {
-// // case "OP2001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue._lbl_Alert_OP2001 = $"{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_OP2001 = $" {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_OP2001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLog wplog = new WorkPieceLog();
-// wplog.WorkingProcedure = "OP20";
-// wplog.EquipmentID = "OP20";
-// wplog.Remarks = "OP20";
-// 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琛�
-// ReadQRcodeManager.ReadQRcode(wplog, LogType.PLCOP20, plcService, _dataCaptureConfig.IsFeedback);
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP2001 = value.ToString();
-
-
-// }
-// SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, "璇籓P05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
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
deleted file mode 100644
index 3dd882a..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3001.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3001()
-// {
-// }
-
-// 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 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);
-// //}
-// }
-
-// 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));
-
-// 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
-// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
-
-// //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);
-
-
-// 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));
-
-// //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);//缁欏姩鎬佸瓧娈佃祴鍊�
-
-// }
-// }
-// //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
-// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),plcService, _dataCaptureConfig.IsFeedback);
-
-// //#region 鍙嶉PLC
-
-// //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
-
-// }
-// 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);
-// }
-
-
-// }
-// //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_OP3002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3002.cs
deleted file mode 100644
index 55201c3..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3002.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-锘縰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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30娴嬮噺瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3002: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3002 Instance = new DataCaptureHandler_OP3002();
-
- public DataCaptureHandler_OP3002()
- {
- }
-
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP3002":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
-
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP3002 = $" {RandomHelper.GenerateRandomCode(4)} OP30宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP30宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
-
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedModel)
- {
- 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.QualityType = QualityType.Online.ToString();
-
-
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
- wplog.QualityState = (int)QualityState.NG;
- wplog.QualityStateUpdateUser = WorkingProcedure;
- wplog.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
-
- wplog.QualityOP30To1 = "QualityOP30To1";
- wplog.QualityOP30To2 = "QualityOP30To2";
- wplog.QualityOP30To3 = "QualityOP30To3";
- wplog.QualityOP30To4 = "QualityOP30To4";
- wplog.QualityOP30To5 = "QualityOP30To5";
- wplog.QualityOP30To6 = "QualityOP30To6";
- wplog.QualityOP30To7 = "QualityOP30To7";
-
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3002 = $"{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_OP3002 = $" {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_OP3002.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;
- wplog.QualityType = QualityType.Online.ToString();
- //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.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-
-
-
- }
- SystemValue.value_OP3002 = value.ToString();
-
-
- }
- SystemValue.lbl_Alert_OP3002 = $"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_OP3002 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3002 = $" {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
deleted file mode 100644
index 31f6850..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3003.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3003()
-// {
-// }
-
-// 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 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);
-// //}
-// }
-
-// 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));
-
-// 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.lbl_Alert_OP3003 = $"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_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
deleted file mode 100644
index a74e9e8..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3004.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3004()
-// {
-// }
-
-// 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 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);
-// //}
-// }
-
-// 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));
-
-// 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锛屽啓鍏�
-
-
-// }
-// //SystemValue.value_OP3004 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3004 = $"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_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
deleted file mode 100644
index ea6cbfe..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3005.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3005()
-// {
-// }
-
-// 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 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);
-// //}
-// }
-
-// 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_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));
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP3005 = value.ToString().ToUpper();
-
-
-// }
-// SystemValue.lbl_Alert_OP3005 = $"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_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
deleted file mode 100644
index b7aec56..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3007.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3007()
-// {
-// }
-
-// 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 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);
-// //}
-// }
-
-// 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.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));
-
-// //*/
-// 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锛屽啓鍏�
-
-
-// }
-// //SystemValue.value_OP3007 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3007 = $"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_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
deleted file mode 100644
index efc58e1..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3501.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3501()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> 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));
-
-// 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
-// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
-
-// //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);
-
-
-// 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;
-
-// 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;
-
-// }
-// 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);
-// }
-
-
-// }
-// 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_OP3502.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3502.cs
deleted file mode 100644
index 63acd4e..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3502.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-锘�//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_OP3502 : DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP3502 Instance = new DataCaptureHandler_OP3502();
-
-// public DataCaptureHandler_OP3502()
-// {
-// }
-
-// 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 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;
-// wplog.QualityType = QualityType.Online.ToString();
-
-
-// wplog.WorkPieceID = WorkPieceID;
-// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = DataCapturePointCode;
-// wplog.QualityState = (int)QualityState.NG;
-// wplog.QualityStateUpdateUser = WorkingProcedure;
-// wplog.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
-
-// wplog.QualityOP35To1 = "QualityOP35To1";
-// wplog.QualityOP35To2 = "QualityOP35To2";
-// //wplog.QualityOP35To3 = "QualityOP35To3";
-// //wplog.QualityOP35To4 = "QualityOP35To4";
-// //wplog.QualityOP35To5 = "QualityOP35To5";
-// //wplog.QualityOP35To6 = "QualityOP35To6";
-// //wplog.QualityOP35To7 = "QualityOP35To7";
-
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-// //*/
-
-// return;
-// }
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP3502 = $"{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_OP3502 = $" {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_OP3502.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;
-// wplog.QualityType = QualityType.Online.ToString();
-
-// 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.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-
-
-
-
-// }
-// SystemValue.value_OP3502 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3502 = $"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_OP3502 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP3502 = $" {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
deleted file mode 100644
index d221708..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3503.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3503()
-// {
-// }
-
-// 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 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;
-
-
-// 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;
-
-
-
-
-// }
-// SystemValue.value_OP3503 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3503 = $"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_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
deleted file mode 100644
index 685393c..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3504.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3504()
-// {
-// }
-
-// 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 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;
-
-
-// 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;
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP3504 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3504 = $"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_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
deleted file mode 100644
index 97596c1..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3505()
-// {
-// }
-
-// 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 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;
-
-
-// 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锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP3505 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3505 = $"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_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
deleted file mode 100644
index 77527c7..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3506.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3506()
-// {
-// }
-
-// 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 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;
-
-
-// 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;
-
-// 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)}";
-
-// 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}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
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
deleted file mode 100644
index 6c10e27..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3507.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP3507()
-// {
-// }
-
-// 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 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;
-// //}
-
-
-
-
-// }
-// SystemValue.value_OP3507 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP3507 = $"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_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
deleted file mode 100644
index 933a6d7..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7001.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP7001()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> 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));
-
-// 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
-// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
-
-// //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);
-
-
-// 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;
-
-// 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;
-
-// }
-// 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);
-// }
-
-
-// }
-// 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
deleted file mode 100644
index fcdd6d6..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7005.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP7005()
-// {
-// }
-
-// 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 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;
-
-
-// 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));
-
-// 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
-// {
-
-// 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;
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP7005 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP7005 = $"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_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
deleted file mode 100644
index 0fd980f..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7006.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-锘�//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();
-
-// public DataCaptureHandler_OP7006()
-// {
-// }
-
-// 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 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;
-
-
-// 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;
-
-// 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)}";
-
-// 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}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
index a001515..9bbba35 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -108,29 +108,11 @@
<Compile Include="DataCaptureHandlerV2\AlertMonitor.cs" />
<Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP6002.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3501.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3503.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3504.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP7007.cs" />
<Compile Include="DataCaptureHandlerV2\HMIBeartBeatMonitor.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3006.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3007.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3005.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3004.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3003.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3001.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP2006.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP2005.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP2004.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3502.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3505.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3506.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3507.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP7001.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP8001.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP7005.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP8002.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP7006.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP8003.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP8004.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP8005.cs" />
--
Gitblit v1.9.3