From 793fa351a57d6180510155417dc4c463cc00e581 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 15:16:30 +0800
Subject: [PATCH] 1
---
/dev/null | 409 ----------------------------------------------------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 9 -
2 files changed, 0 insertions(+), 418 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3006.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3006.cs
deleted file mode 100644
index bcca7d3..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3006.cs
+++ /dev/null
@@ -1,126 +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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP30 蹇冭烦鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP3006: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3006 Instance = new DataCaptureHandler_OP3006();
-
- public DataCaptureHandler_OP3006()
- {
- }
-
- 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)
- {
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP3006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- DateTime PLCHeartBeatMonitorTime = DateTime.Now;
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP3006 = $" {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_OP3006.Equals(value.ToString()))
- {//蹇冭烦鐩戞帶
- PLCHeartBeatMonitorTime = DateTime.Now;
- }
- if((DateTime.Now- PLCHeartBeatMonitorTime).TotalSeconds> heartBeatAlertInterval)
- {
- SystemValue.lbl_Alert_OP3006 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴蹇冭烦寮傚父!";
- }
- SystemValue.value_OP3006 = value.ToString();
-
- //鍐欏叆蹇冭烦
-
-
-
- }
- SystemValue.lbl_Alert_OP3006 = $"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_OP3006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP3006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP3006 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.cs
deleted file mode 100644
index 6714f71..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP7007.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>
-// /// OP70 鍛婅鐩戞帶
-// /// </summary>
-// public class DataCaptureHandler_OP7007: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP7007 Instance = new DataCaptureHandler_OP7007();
-
-// public DataCaptureHandler_OP7007()
-// {
-// }
-
-// 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;
-
-// 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_OP7007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// while (true)
-// {
-// ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
-// threadStatusMonitor.Threadcode = DataCapturePointCode;
-// threadStatusMonitor.Threadcname = DataCapturePointCname;
-// threadStatusMonitor.Threadendtime = DateTime.Now;
-// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
-// threadStatusMonitor.Threadstatue = 0;
-// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
-// try
-// {
-// //_dataCaptureConfig
-// if (plcService == null || !plcService.IsConnected)
-// {
-// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// if (SystemValue.value_OP7007.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
-// {
-// try
-// {
-// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
-// //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
-// if (set == null)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-// }
-// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// }
-// catch (Exception setex)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
-// }
-// }
-// //if(wplog.FailureType.Length>0)
-// {
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-// }
-
-
-
-
-// }
-// SystemValue.value_OP7007 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP7007 = $"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_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP7007 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.cs
deleted file mode 100644
index 946fc69..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8001.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>
-// /// OP80璇荤爜瀹屾垚鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP8001: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP8001 Instance = new DataCaptureHandler_OP8001();
-
-// public DataCaptureHandler_OP8001()
-// {
-// }
-
-// 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 "OP8001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (SystemValue.isStartedImitateModel)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-
-
-// 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_OP8001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// while (true)
-// {
-// try
-// {
-// if (plcService == null || !plcService.IsConnected)
-// {
-// SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// if (SystemValue.value_OP8001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLog wplog = new WorkPieceLog();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// //var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
-
-// //var valueid = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// wplog.WorkPieceID = PLCManger.GetWorkPieceIDForPLC(_dataCaptureConfig,plcService);
-// if(wplog.WorkPieceID.Length!=22)
-// {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
-// continue;
-// }
-// else
-// {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
-
-// 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_OP8001 = value.ToString();
-
-// }
-// SystemValue.lbl_Alert_OP8001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
-// {
-// Thread.Sleep(5000);
-// }
-// else
-// {
-// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
-// }
-
-
-// }
-// //catch (System.Data.Entity.Validation.DbEntityValidationException ex)
-// //{
-// // SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP8001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs
deleted file mode 100644
index c2f9f08..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs
+++ /dev/null
@@ -1,196 +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>
-// /// OP80娴嬮噺瀹屾垚鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP8002 : DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP8002 Instance = new DataCaptureHandler_OP8002();
-
-// public DataCaptureHandler_OP8002()
-// {
-// }
-
-// 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 "OP8002":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP8002 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (SystemValue.isStartedImitateModel)
-// {
-// //妯℃嫙浠ｇ爜娉ㄩ噴
-// /*
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.WorkPieceID = "123456";
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// 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.QualityOP80To1 = "QualityOP80To1";
-// wplog.QualityOP80To2 = "QualityOP80To2";
-// wplog.QualityOP80To3 = "QualityOP80To3";
-// wplog.QualityOP80To4 = "QualityOP80To4";
-// wplog.QualityOP80To5 = "QualityOP80To5";
-// wplog.QualityOP80To6 = "QualityOP80To6";
-// wplog.QualityOP80To7 = "QualityOP80To7";
-
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// //*/
-
-// return;
-// }
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP8002 = $"{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_OP8002 = $" {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_OP8002.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_OP8002 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP8002 = $"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_OP8002 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP8002 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.cs
deleted file mode 100644
index aefa8e7..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8003.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>
-// /// OP80 NOOK鎺ㄥ嚭鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP8003: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP8003 Instance = new DataCaptureHandler_OP8003();
-
-// public DataCaptureHandler_OP8003()
-// {
-// }
-
-// 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 "OP8003":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (SystemValue.isStartedImitateModel)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-
-
-// wplog.WorkPieceID = WorkPieceID;
-// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = DataCapturePointCode;
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-// return;
-// }
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP8003 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// while (true)
-// {
-// try
-// {
-// //_dataCaptureConfig
-// if (plcService == null || !plcService.IsConnected)
-// {
-// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// //var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// //if (SystemValue.value_OP8003.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.WorkPieceID = "123456";
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// //foreach (var col in colConfig)
-// //{
-// // switch(col.DbNumber+ col.Offset)
-// // {
-// // case "":
-// var valuecol = plcService.ReadValuePoint("2050", "28", 25, typeof(string));
-// wplog.WorkPieceID = valuecol.ToString();
-// // break;
-// // }
-// //}
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-
-
-
-// }
-// //SystemValue.value_OP8003 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP8003 = $"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_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP8003 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.cs
deleted file mode 100644
index cec32ae..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8004.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>
-// /// OP80 娴嬮噺瀹屾垚鍚庤鐮佸畬鎴�
-// /// </summary>
-// public class DataCaptureHandler_OP8004: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP8004 Instance = new DataCaptureHandler_OP8004();
-
-// public DataCaptureHandler_OP8004()
-// {
-// }
-
-// 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 "OP8004":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (SystemValue.isStartedImitateModel)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-
-
-// wplog.WorkPieceID = WorkPieceID;
-// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = DataCapturePointCode;
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-// return;
-// }
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP8004 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// while (true)
-// {
-// try
-// {
-// //_dataCaptureConfig
-// if (plcService == null || !plcService.IsConnected)
-// {
-// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// if (SystemValue.value_OP8004.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.WorkPieceID = "123456";
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// foreach (var col in colConfig)
-// {
-// switch(col.DbNumber+ col.Offset)
-// {
-// case "":
-// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
-// wplog.WorkPieceID = valuecol.ToString();
-// break;
-// }
-// }
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// //SystemValue.value_OP8004 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP8004 = $"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_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP8004 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.cs
deleted file mode 100644
index d44717d..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8005.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>
-// /// OP80 宸ュ簭瀹屾垚
-// /// </summary>
-// public class DataCaptureHandler_OP8005: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP8005 Instance = new DataCaptureHandler_OP8005();
-
-// public DataCaptureHandler_OP8005()
-// {
-// }
-
-// 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 "OP8005":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (SystemValue.isStartedImitateModel)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.WorkPieceID = "123456";
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-
-
-// wplog.WorkPieceID = WorkPieceID;
-// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = DataCapturePointCode;
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-// return;
-// }
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP8005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// while (true)
-// {
-// try
-// {
-// //_dataCaptureConfig
-// if (plcService == null || !plcService.IsConnected)
-// {
-// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// if (SystemValue.value_OP8005.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.WorkPieceID = "123456";
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// foreach (var col in colConfig)
-// {
-// switch(col.DbNumber+ col.Offset)
-// {
-// case "":
-// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
-// wplog.WorkPieceID = valuecol.ToString();
-// break;
-// }
-// }
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// //SystemValue.value_OP8005 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP8005 = $"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_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP8005 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8006.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8006.cs
deleted file mode 100644
index 51bca26..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8006.cs
+++ /dev/null
@@ -1,126 +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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80 蹇冭烦鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP8006: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8006 Instance = new DataCaptureHandler_OP8006();
-
- public DataCaptureHandler_OP8006()
- {
- }
-
- 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)
- {
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- DateTime PLCHeartBeatMonitorTime = DateTime.Now;
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8006 = $" {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_OP8006.Equals(value.ToString()))
- {//蹇冭烦鐩戞帶
- PLCHeartBeatMonitorTime = DateTime.Now;
- }
- if((DateTime.Now- PLCHeartBeatMonitorTime).TotalSeconds> heartBeatAlertInterval)
- {
- SystemValue.lbl_Alert_OP8006 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴蹇冭烦寮傚父!";
- }
- SystemValue.value_OP8006 = value.ToString();
-
- //鍐欏叆蹇冭烦
-
-
-
- }
- SystemValue.lbl_Alert_OP8006 = $"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_OP8006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8006 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
deleted file mode 100644
index 57a0685..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
+++ /dev/null
@@ -1,195 +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>
-// /// OP80 鍛婅鐩戞帶
-// /// </summary>
-// public class DataCaptureHandler_OP8007: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP8007 Instance = new DataCaptureHandler_OP8007();
-
-// public DataCaptureHandler_OP8007()
-// {
-// }
-
-// 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 "OP8007":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (SystemValue.isStartedImitateModel)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-
-
-// 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_OP8007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// while (true)
-// {
-// try
-// {
-// //_dataCaptureConfig
-// if (plcService == null || !plcService.IsConnected)
-// {
-// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-// if (SystemValue.value_OP8007.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.Remarks = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.WorkPieceID = "123456";
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-// foreach (var col in colConfig)
-// {
-// switch(col.DbNumber+ col.Offset)
-// {
-// case "":
-// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
-// wplog.WorkPieceID = valuecol.ToString();
-// break;
-// }
-// }
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// //SystemValue.value_OP8007 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP8007 = $"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_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMIBeartBeatMonitor.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMIBeartBeatMonitor.cs
deleted file mode 100644
index 8d24284..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMIBeartBeatMonitor.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity.Core.Common.CommandTrees;
-using System.Data.Entity.Validation;
-using System.Data.SqlTypes;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// HMI蹇冭烦鐩戞帶
- /// </summary>
- public class HMIBeartBeatMonitor: DataCaptureHandler
- {
- public static readonly HMIBeartBeatMonitor Instance = new HMIBeartBeatMonitor();
-
- public HMIBeartBeatMonitor()
- {
- }
-
- 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_HMIBeartBeatMonitor = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- Dictionary<bool, DateTime> beartBeatDic = new Dictionary<bool, DateTime>();
- bool BeartBeatMonitorflag = true;
- 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(DataCapturePointCode.Equals("OP1008"))
- {
-
- }
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_HMIBeartBeatMonitor = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- try
- {//鑾峰彇璁惧plc鐨勫績璺�
-
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-
- if (BeartBeatMonitorflag != (bool)value)
- {//PLC蹇冭烦鍙樺寲
-
- if(beartBeatDic.ContainsKey((bool)value))
- {
- beartBeatDic[(bool)value]=DateTime.Now;
- }
- else
- {
- beartBeatDic.Add((bool)value, DateTime.Now);
- }
-
-
- }
-
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.Remarks = "HMI";
- wplog.MonitoringPoint = DataCapturePointCode;
- var max = beartBeatDic.Max(kvp => kvp.Value);
- if(max==null||(DateTime.Now-max).TotalSeconds>10)
- {//蹇冭烦10绉掓病鏈夋洿鏂拌涓鸿澶囨柇绾夸簡
- wplog.IsConnect = false;
- }
- else
- {
- wplog.IsConnect = true;
- }
- //鏇存柊璁惧褰撳墠杩炴帴鎯呭喌
- WorkPieceInfoManager.EquipmentBeartBeatMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- BeartBeatMonitorflag = (bool)value;
- threadStatusMonitor.Threadstatue = 1;
- }
- catch (DbEntityValidationException ex1)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{WorkingProcedure}蹇冭烦璇诲彇寮傚父1锛�", ex1);
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{WorkingProcedure}蹇冭烦璇诲彇寮傚父锛�", ex);
- }
-
- try
- {//鍙嶅啓蹇冭烦
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode && o.IsFeedback == 1))
- {//鑾峰彇閰嶇疆璇︽儏琛ㄤ腑闇�鍐欏叆蹇冭烦淇℃伅 pc
- bool flag = true;
- var colflag = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if ((bool)colflag)
- {
- flag = false;
- }
- else
- {
- flag = true;
- }
- var write= plcService.WriteValuePointNew(col.DbNumber, col.Offset, flag);
- if(!write.result)
- {
-
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{WorkingProcedure}鏁伴噰蹇冭烦鍐欏叆寮傚父锛歿write.resMsg}");
- }
-
- }
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{WorkingProcedure}鏁伴噰蹇冭烦鍐欏叆寮傚父锛�", ex);
- }
-
-
- }
- SystemValue.lbl_Alert_HMIBeartBeatMonitor = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_HMIBeartBeatMonitor = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭蹇冭烦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭蹇冭烦寮傚父锛�", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_HMIBeartBeatMonitor = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭蹇冭烦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭蹇冭烦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMI_WorkpieceReading.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMI_WorkpieceReading.cs
deleted file mode 100644
index bb96698..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMI_WorkpieceReading.cs
+++ /dev/null
@@ -1,358 +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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// HML璇诲彇
- /// </summary>
- public class HMI_WorkpieceReading : DataCaptureHandler
- {
- public static readonly HMI_WorkpieceReading Instance = new HMI_WorkpieceReading();
-
- /// <summary>
- ///
- /// </summary>
- public HMI_WorkpieceReading()
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
-
- /// <summary>
- /// 鍒锋柊鏁版嵁鍒楄〃
- /// </summary>
- /// <param name="dataCaptureConfig"></param>
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
-
- }
-
- /// <summary>
- /// 鏁版嵁閲囬泦寮�濮�
- /// </summary>
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "RHMIOP104001":
- SystemValue.lbl_Alert_HMIOP104001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "RHMIOP2001":
- SystemValue.lbl_Alert_HMIOP2001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "RHMIOP303501":
- SystemValue.lbl_Alert_HMIOP303501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "RHMIOP5001":
- SystemValue.lbl_Alert_HMIOP5001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "RHMIOP6001":
- SystemValue.lbl_Alert_HMIOP6001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- default:
- break;
- }
-
-
-
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-
- //switch (_dataCaptureConfig.DataCapturePointCode)
- //{
- // case "RHMIOP104001":
- // SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- // break;
- // case "RHMIOP2001":
- // SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- // break;
- // case "RHMIOP303501":
- // SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- // break;
- // case "RHMIOP5001":
- // SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- // break;
- // case "RHMIOP6001":
- // SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- // break;
- // default:
- // break;
- //}
-
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)}";
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)}";
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)}";
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)}";
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)}";
-
- object value1 = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, "88", 2, PLCManger.GetTypeForString("int"));
-
- string value2 = value1 == null ? "" : value1.ToString();
- if ("21" .Equals(value2))
- {
- //10锛氭暟閲囪鍙栧け璐�
- //11 :鏁伴噰璇诲彇鎴愬姛
- //21锛氭壂鐮佹垚鍔熸爣璁�
- plcService.WriteValuePointNew(_dataCaptureConfig.DbNumber, "88", 11);
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, _dataCaptureConfig.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-
- if (value != null)
- {
- string WorkPieceID = value.ToString().Trim();
-
- if (WorkPieceID.Length == 22)
- {
- // 鏍规嵁宸ヤ欢鍙疯幏鍙栧伐浠朵俊鎭�
- WorkPieceInfo info = null;
- using (DbModel db = new DbModel())
- {
- info = new WorkPieceInfo();
- info = db.WorkPieceInfo.Where(o => o.WorkPieceID == WorkPieceID&&o.IsDeleted==false).FirstOrDefault();
- }
-
- if (info != null && info.Id > 0)
- {
- // 鎶婂搴旂殑宸ヤ欢淇℃伅鍐欏叆PLC瀵瑰簲鍦板潃
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "WorkPieceID":
- //plcService.WriteValuePointNew(col.DbNumber, col.Offset, info.WorkPieceID);
- break;
- case "WorkingProcedureCurrent":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, info.WorkingProcedureCurrent);
- break;
- case "WorkPieceState":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, info.WorkPieceState);
- break;
- case "QualityState":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, info.QualityState);
- break;
- case "ReaderEndState":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, 11);
- break;
- default:
- break;
- }
- }
- }
- else
- {
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "ReaderEndState":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, 10);
- break;
- default:
- break;
- }
- }
-
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "RHMIOP104001":
- SystemValue.lbl_Alert_HMIOP104001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戝湪鏁版嵁搴撲腑涓嶅瓨鍦�";
- break;
- case "RHMIOP2001":
- SystemValue.lbl_Alert_HMIOP2001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戝湪鏁版嵁搴撲腑涓嶅瓨鍦�";
- break;
- case "RHMIOP303501":
- SystemValue.lbl_Alert_HMIOP303501 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戝湪鏁版嵁搴撲腑涓嶅瓨鍦�";
- break;
- case "RHMIOP5001":
- SystemValue.lbl_Alert_HMIOP5001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戝湪鏁版嵁搴撲腑涓嶅瓨鍦�";
- break;
- case "RHMIOP6001":
- SystemValue.lbl_Alert_HMIOP6001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戝湪鏁版嵁搴撲腑涓嶅瓨鍦�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戝湪鏁版嵁搴撲腑涓嶅瓨鍦�");
- }
- }
- else
- {
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "ReaderEndState":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, 10);
- break;
- default:
- break;
- }
- }
-
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "RHMIOP104001":
- SystemValue.lbl_Alert_HMIOP104001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- break;
- case "RHMIOP2001":
- SystemValue.lbl_Alert_HMIOP2001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- break;
- case "RHMIOP303501":
- SystemValue.lbl_Alert_HMIOP303501 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- break;
- case "RHMIOP5001":
- SystemValue.lbl_Alert_HMIOP5001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- break;
- case "RHMIOP6001":
- SystemValue.lbl_Alert_HMIOP6001 = $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"HMI璇诲彇鐩戞帶 浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�");
- }
- }
- else
- {
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "ReaderEndState":
- plcService.WriteValuePointNew(col.DbNumber, col.Offset, 10);
- break;
- default:
- break;
- }
- }
- }
- }
-
-
- }
-
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(1000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
-
-
- }
- catch (Exception ex)
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "RHMIOP104001":
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "RHMIOP2001":
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "RHMIOP303501":
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "RHMIOP5001":
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "RHMIOP6001":
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "RHMIOP104001":
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "RHMIOP2001":
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "RHMIOP303501":
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "RHMIOP5001":
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "RHMIOP6001":
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMI_WorkpieceWrite.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMI_WorkpieceWrite.cs
deleted file mode 100644
index 64e9965..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/HMI_WorkpieceWrite.cs
+++ /dev/null
@@ -1,409 +0,0 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity.Migrations;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// HMI鍐欏叆
- /// </summary>
- public class HMI_WorkpieceWrite : DataCaptureHandler
- {
- public static readonly HMI_WorkpieceWrite Instance = new HMI_WorkpieceWrite();
-
- /// <summary>
- ///
- /// </summary>
- public HMI_WorkpieceWrite()
- {
-
- }
-
- /// <summary>
- ///
- /// </summary>
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
-
- /// <summary>
- /// 鍒锋柊鏁版嵁鍒楄〃
- /// </summary>
- /// <param name="dataCaptureConfig"></param>
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
-
- }
-
- /// <summary>
- /// 鏁版嵁閲囬泦寮�濮�
- /// </summary>
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "WHMIOP104002":
- SystemValue.lbl_Alert_HMIOP104001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "WHMIOP2002":
- SystemValue.lbl_Alert_HMIOP2001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "WHMIOP303502":
- SystemValue.lbl_Alert_HMIOP303501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "WHMIOP5002":
- SystemValue.lbl_Alert_HMIOP5001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- case "WHMIOP6002":
- SystemValue.lbl_Alert_HMIOP6001 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- break;
- default:
- break;
- }
-
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- if (plcService == null && !plcService.IsConnected)
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "WHMIOP104002":
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- break;
- case "WHMIOP2002":
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- break;
- case "WHMIOP303502":
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- break;
- case "WHMIOP5002":
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- break;
- case "WHMIOP6002":
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- break;
- default:
- break;
- }
-
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- Object WorkPieceID = null;
- Object QualityState = null;
- Object CheckUpdate = null;
- Object QualityErrorInfo = null;
-
- int UpdateIsOK = 0;
-
- // 鎶婂搴旂殑宸ヤ欢淇℃伅鍐欏叆PLC瀵瑰簲鍦板潃
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "WorkPieceID":
- WorkPieceID = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- break;
- case "QualityState":
- QualityState = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- break;
- case "CheckUpdate":
- CheckUpdate = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- //plcService.WriteValuePoint(col.DbNumber, col.Offset, 0, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- break;
- case "QualityErrorInfo":
- QualityErrorInfo = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- break;
- case "UpdateIsOK":
- UpdateIsOK = col.IsFeedback;
- break;
-
- default:
- break;
- }
- }
-
- if ((bool)CheckUpdate)
- {
- // 璇诲彇鍐呭妫�鏌�
- StringBuilder builder = new StringBuilder();
- if (WorkPieceID != null)
- {
- if (WorkPieceID.ToString().Length != 22)
- {
- builder.AppendLine("宸ヤ欢浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�!");
- }
-
- if (QualityState == null)
- {
- builder.AppendLine("宸ヤ欢浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戣川閲忕姸鎬佷笉鑳戒负绌�");
- }
- else
- {
- if ((int)QualityState != 1 && (int)QualityState != 2 && (int)QualityState != 3)
- {
- builder.AppendLine("宸ヤ欢浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戣川閲忕姸鎬併��" + QualityState + "銆戦敊璇紝鍙兘涓�1锛氬悎鏍� 2锛氫笉鍚堟牸 3锛氱枒浼�");
- }
- else if ((int)QualityState == 2 || (int)QualityState == 3)
- {
- if (QualityErrorInfo == null|| string.IsNullOrEmpty(QualityErrorInfo.ToString()))
- {
- builder.AppendLine("宸ヤ欢浜岀淮鐮佸�硷細銆�" + WorkPieceID + "銆戣川閲忎笉鍚堟牸鍘熷洜涓嶈兘涓虹┖");
- }
- }
- }
-
- }
-
- if (!string.IsNullOrEmpty(builder.ToString()))
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "WHMIOP104002":
- SystemValue.lbl_Alert_HMIOP104001 = $"{WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString();
- break;
- case "WHMIOP2002":
- SystemValue.lbl_Alert_HMIOP2001 = $"{WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString();
- break;
- case "WHMIOP303502":
- SystemValue.lbl_Alert_HMIOP303501 = $"{WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString();
- break;
- case "WHMIOP5002":
- SystemValue.lbl_Alert_HMIOP5001 = $"{WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString();
- break;
- case "WHMIOP6002":
- SystemValue.lbl_Alert_HMIOP6001 = $"{WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString();
- break;
- default:
- break;
- }
-
- // 鎶婂搴旂殑宸ヤ欢淇℃伅鍐欏叆PLC瀵瑰簲鍦板潃
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "UpdateIsOK":
- var aa = plcService.WriteValuePointNew(col.DbNumber, col.Offset, false);
- break;
-
- default:
- //plcService.WriteValuePoint(col.DbNumber, col.Offset, "", PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- break;
- }
- }
-
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString());
- continue;
- }
-
-
- // 宸ヤ欢淇℃伅
- WorkPieceInfo info = null;
- // 宸ヤ欢鎺ユ敹淇℃伅灞ュ巻
- WorkPieceLog wplog = new WorkPieceLog();
- using (DbModel db = new DbModel())
- {
- info = new WorkPieceInfo();
- info = db.WorkPieceInfo.Where(o => o.WorkPieceID == WorkPieceID.ToString()&&o.IsDeleted==false).FirstOrDefault();
-
- if (info == null)
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "WHMIOP104002":
- SystemValue.lbl_Alert_HMIOP104001 = $"宸ヤ欢{WorkPieceID}锛寋WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶鏃讹紝宸ヤ欢淇℃伅琛ㄤ腑涓嶅瓨鍦�";
- break;
- case "WHMIOP2002":
- SystemValue.lbl_Alert_HMIOP2001 = $"宸ヤ欢{WorkPieceID}锛寋WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶鏃讹紝宸ヤ欢淇℃伅琛ㄤ腑涓嶅瓨鍦�";
- break;
- case "WHMIOP303502":
- SystemValue.lbl_Alert_HMIOP303501 = $"宸ヤ欢{WorkPieceID}锛寋WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶鏃讹紝宸ヤ欢淇℃伅琛ㄤ腑涓嶅瓨鍦�";
- break;
- case "WHMIOP5002":
- SystemValue.lbl_Alert_HMIOP5001 = $"宸ヤ欢{WorkPieceID}锛寋WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶鏃讹紝宸ヤ欢淇℃伅琛ㄤ腑涓嶅瓨鍦�";
- break;
- case "WHMIOP6002":
- SystemValue.lbl_Alert_HMIOP6001 = $"宸ヤ欢{WorkPieceID}锛寋WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶鏃讹紝宸ヤ欢淇℃伅琛ㄤ腑涓嶅瓨鍦�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹繑鍥炴牸寮忓紓甯革細" + builder.ToString());
- continue;
- }
-
-
- info.QualityState = Convert.ToInt32(QualityState);
- info.QualityStateUpdateUser = "HMI";
- info.QualityStateUpdateTime = DateTime.Now;
- info.QualityStateUpdateMode = "鑷姩";
- info.QualityErrorInfo = QualityErrorInfo.ToString();
-
-
- // 鍐欏叆宸ヤ欢鎺ユ敹淇℃伅灞ュ巻
- //wplog = CommonManager.Instance.GetWorkPieceID(wplog, LogType.PLCHMI04);
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkPieceID = info.WorkPieceID;
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.QualityState = Convert.ToInt32(QualityState);
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
-
- db.WorkPieceLog.Add(wplog);
- db.SaveChanges();
- }
-
-
-
- if (UpdateIsOK == 1)
- {
- // 鎶婂搴旂殑宸ヤ欢淇℃伅鍐欏叆PLC瀵瑰簲鍦板潃
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "UpdateIsOK":
- var aa = plcService.WriteValuePointNew(col.DbNumber, col.Offset, true);
- break;
- //case "WorkPieceID":
- // plcService.WriteValuePointNew(col.DbNumber, col.Offset, "");
- // break;
-
- default:
- //plcService.WriteValuePoint(col.DbNumber, col.Offset, "", PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- break;
- }
- }
- }
- }
-
- }
-
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
-
-
- }
- catch (Exception ex)
- {
-
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "UpdateIsOK":
- var aa = plcService.WriteValuePointNew(col.DbNumber, col.Offset, true);
- break;
- default:
- break;
- }
- }
-
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "WHMIOP104002":
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "WHMIOP2002":
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "WHMIOP303502":
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "WHMIOP5002":
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- case "WHMIOP6002":
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭HMI璇诲彇浜岀淮鐮佺洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛屾暟鎹椂寮傚父锛�", ex);
- }
- }
- }
- else
- {
- switch (_dataCaptureConfig.DataCapturePointCode)
- {
- case "WHMIOP104002":
- SystemValue.lbl_Alert_HMIOP104001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "WHMIOP2002":
- SystemValue.lbl_Alert_HMIOP2001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "WHMIOP303502":
- SystemValue.lbl_Alert_HMIOP303501 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "WHMIOP5002":
- SystemValue.lbl_Alert_HMIOP5001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- case "WHMIOP6002":
- SystemValue.lbl_Alert_HMIOP6001 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭HML璇诲彇浜岀淮鐮佺洃鎺� 涓嶅仛鏁版嵁閲囬泦锛岃纭閰嶇疆淇℃伅锛�";
- break;
- default:
- break;
- }
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄WorkingProcedure}宸ュ簭HML鍐欏叆鐩戞帶锛� 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
- }
-}
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 9bbba35..693a7b9 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,16 +108,7 @@
<Compile Include="DataCaptureHandlerV2\AlertMonitor.cs" />
<Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP6002.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP7007.cs" />
<Compile Include="DataCaptureHandlerV2\HMIBeartBeatMonitor.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP3006.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8001.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8002.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8003.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8004.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8005.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8006.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP8007.cs" />
<Compile Include="DataCaptureHandler\DBDataCapture\AlarmLogManager.cs" />
<Compile Include="DataCaptureHandlerV2\HMI_WorkpieceReading.cs" />
<Compile Include="DataCaptureHandlerV2\HMI_WorkpieceWrite.cs" />
--
Gitblit v1.9.3