From 350e1111aa34534fa6074072142deaf319f8d6b4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 26 8月 2024 15:13:09 +0800
Subject: [PATCH] 我的疑问是 为啥 不合格，没有不合格原因？
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs | 266 ++++----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP3002.cs | 484 +++++++-------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs | 348 +++++-----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3502.cs | 349 +++++-----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs | 13
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 43 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs | 1
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 373 ++++++-----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs | 11
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 7
10 files changed, 977 insertions(+), 918 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
index 02e6fd5..5183090 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -469,6 +469,9 @@
/// <param name="type"></param>
public static void QualityInfoComplete(WorkPieceLogMiddle logMiddle, LogType type)
{
+ //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
+ WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
+
//姝ゅ鍚屾椂鎻掑叆浜哤orkPieceLog锛學orkPieceInfoLog琛紝骞舵柊澧炴垨淇敼WorkPieceInfo琛�
//鎻掑叆璐ㄩ噺鐩稿叧琛≦ualityDataInfo
@@ -1023,14 +1026,7 @@
var set_WorkingProcedureCurrent = "";
if (cur_db_info.WorkingProcedureCurrent != "OP10" && cur_db_info.WorkingProcedureCurrent != "OP40")
{
- if (cur_db_info.WorkingProcedureCurrent == "OP05")
- {
- set_WorkingProcedureCurrent = "OP10";
- }
- else if (cur_db_info.WorkingProcedureCurrent == "OP35")
- {
- set_WorkingProcedureCurrent = "OP40";
- }
+ SetWorkingProcedureCurrentForOP10(cur_db_info, ref set_WorkingProcedureCurrent);
}
else
{
@@ -1105,6 +1101,37 @@
}
}
+
+
+ public static void SetWorkingProcedureCurrentForOP10(WorkPieceInfo cur_db_info, ref string set_WorkingProcedureCurrent)
+ {
+ //鎴柇瀛楃涓�
+ if (cur_db_info.WorkingProcedureCurrent.Length == 4)
+ {
+ try
+ {
+ var bb = cur_db_info.WorkingProcedureCurrent.Substring(2, 2);
+ int ii = Convert.ToInt32(bb);
+ if (ii <= 10)
+ {
+ set_WorkingProcedureCurrent = "OP10";
+ }
+ else
+ {
+ set_WorkingProcedureCurrent = "OP40";
+ }
+ }
+ catch (Exception)
+ {
+ set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
+ }
+ }
+ else
+ {
+ set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
+ }
+ }
+
/// <summary>
/// 宸ュ簭瀹屾垚
/// </summary>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs
index 43d5307..9b987c1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs
@@ -1,153 +1,153 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP20娴嬭瘯瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP2002: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP2002 Instance = new DataCaptureHandler_OP2002();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP20娴嬭瘯瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP2002: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP2002 Instance = new DataCaptureHandler_OP2002();
- public DataCaptureHandler_OP2002()
- {
- }
+// public DataCaptureHandler_OP2002()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP2001":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// 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);
- //}
- }
+// // }
+// // }
+// //}
+// //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
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.WorkingProcedure = "OP20";
- wplog.EquipmentID = "OP20";
- wplog.Remarks = "OP20";
- wplog.MonitoringPoint = "OP2002";
- 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;
- }
- }
+// 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
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.WorkingProcedure = "OP20";
+// wplog.EquipmentID = "OP20";
+// wplog.Remarks = "OP20";
+// wplog.MonitoringPoint = "OP2002";
+// 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;
+// }
+// }
- #region 宸ユ帶鏈鸿鍙栬川閲忎俊鎭�
+// #region 宸ユ帶鏈鸿鍙栬川閲忎俊鎭�
- //鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
- var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
- foreach (System.IO.FileInfo file in newFiles)
- {
- var datatable = CSVHelper.ReadCSV(file.FullName);
- }
+// //鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
+// var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
+// foreach (System.IO.FileInfo file in newFiles)
+// {
+// var datatable = CSVHelper.ReadCSV(file.FullName);
+// }
- #endregion
+// #endregion
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(wplog, LogType.PLCOP20);
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.QualityInfoComplete(wplog, LogType.PLCOP20);
- }
- SystemValue.value_OP2001 = value.ToString();
+// }
+// SystemValue.value_OP2001 = value.ToString();
- }
- SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// 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宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// 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_OP3502.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3502.cs
index 0fa2945..63acd4e 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3502.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3502.cs
@@ -1,195 +1,198 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP35娴嬮噺瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3502: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3502 Instance = new DataCaptureHandler_OP3502();
+//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 DataCaptureHandler_OP3502()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedImitateModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- wplog.QualityType = QualityType.Online.ToString();
+// 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.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";
+// 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));
+// //鏇存柊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();
+// 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;
+// 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.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);
- }
+// }
+// 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}宸ュ簭鐩戞帶娴嬮噺鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// 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_OP8002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs
index c16664a..c2f9f08 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8002.cs
@@ -1,194 +1,196 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80娴嬮噺瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP8002: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8002 Instance = new DataCaptureHandler_OP8002();
+//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 DataCaptureHandler_OP8002()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8002":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// 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);
- //}
- }
+// // }
+// // }
+// //}
+// //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();
+// 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.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";
+// 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));
+// //鏇存柊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));
+// 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.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);
- }
+// }
+// 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}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// 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/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 5dfed4b..9b0a460 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -57,6 +57,8 @@
{
if (SystemValue.isStartedImitateModel)
{
+ //妯℃嫙浠ｇ爜娉ㄩ噴
+ /*
var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -90,6 +92,7 @@
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ //*/
return;
}
@@ -610,9 +613,7 @@
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}娴嬮噺瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
}
- //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
- WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
-
+
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP3002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP3002.cs
index d0260a8..0b5590b 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP3002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP3002.cs
@@ -1,268 +1,268 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using iWare_SCADA_Model.MiddleModel;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using iWare_SCADA_Model.MiddleModel;
+//using System;
+//using System.Collections.Generic;
+//using System.IO;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using System.Web.UI.WebControls;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// 娴嬮噺瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP3002: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP3002 Instance = new DataCaptureHandler_OP3002();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// 娴嬮噺瀹屾垚鏍囪
+// /// </summary>
+// public class DataCaptureHandler_OP3002: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP3002 Instance = new DataCaptureHandler_OP3002();
- public DataCaptureHandler_OP3002()
- {
- }
+// public DataCaptureHandler_OP3002()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// }
- public override void DataCaptureStart()
- {
- ThreadStatusMonitorMiddle threadStatusMonitor = new ThreadStatusMonitorMiddle();
- if (IsCaptureflag)
- {
- //var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- var plcService = SystemValue.GetPLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- threadStatusMonitor.ErrorMsg = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- SystemValue.PLCServiceReconnect(plcService);
- //plcService.Close();
- //plcService.OpenService();
- }
- string Station = "03";
- string value_02 = "";
- string path = ConfigHelper.GetConfigString("OP30QualityDataForStation");//鎵撶爜鏈烘墦鐮佷簩缁寸爜璺緞
- if(string.IsNullOrEmpty(path))
- {
- path = @"Z:\";
- }
- if(DataCapturePointCode.Contains("CH3"))
- {//宸ヤ綅3 娑ㄦ柇鍔涚煩
- path = path + "kistler_crack";
- }
- else if (DataCapturePointCode.Contains("CH4"))
- {//宸ヤ綅4 棰勬嫥绱у姏鐭�
+// public override void DataCaptureStart()
+// {
+// ThreadStatusMonitorMiddle threadStatusMonitor = new ThreadStatusMonitorMiddle();
+// if (IsCaptureflag)
+// {
+// //var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// var plcService = SystemValue.GetPLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// threadStatusMonitor.ErrorMsg = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// SystemValue.PLCServiceReconnect(plcService);
+// //plcService.Close();
+// //plcService.OpenService();
+// }
+// string Station = "03";
+// string value_02 = "";
+// string path = ConfigHelper.GetConfigString("OP30QualityDataForStation");//鎵撶爜鏈烘墦鐮佷簩缁寸爜璺緞
+// if(string.IsNullOrEmpty(path))
+// {
+// path = @"Z:\";
+// }
+// if(DataCapturePointCode.Contains("CH3"))
+// {//宸ヤ綅3 娑ㄦ柇鍔涚煩
+// path = path + "kistler_crack";
+// }
+// else if (DataCapturePointCode.Contains("CH4"))
+// {//宸ヤ綅4 棰勬嫥绱у姏鐭�
- path = path + "Bosch_Rexroth";
- }
- else if (DataCapturePointCode.Contains("CH5"))
- {//宸ヤ綅5 鎷х揣鍔涚煩
+// path = path + "Bosch_Rexroth";
+// }
+// else if (DataCapturePointCode.Contains("CH5"))
+// {//宸ヤ綅5 鎷х揣鍔涚煩
- path = path + "Bosch_Rexroth";
- }
- else if (DataCapturePointCode.Contains("CH6"))
- {//宸ヤ綅6 琛鍘嬭鍔涚煩
+// path = path + "Bosch_Rexroth";
+// }
+// else if (DataCapturePointCode.Contains("CH6"))
+// {//宸ヤ綅6 琛鍘嬭鍔涚煩
- path = path + "kistler_bush";
- }
-// 璐ㄩ噺淇℃伅锛氭定鏂姏鐭�... 棰勬嫥绱у姏鐭� 棰勬嫥绱ц搴� 缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
-//kistler_crack 娑ㄦ柇鍔涚煩 宸ヤ綅3 娑ㄦ柇鍔涚煩锛圷 - Maximum锛� 璐ㄩ噺缁撴灉锛圧esult锛�
-//kistler_bush 鍘嬭鍔涚煩 宸ヤ綅6 琛鍘嬭鍔涚煩锛圷 - Maximum锛� 琛鍘嬭浣嶇Щ锛圔lock X锛� 璐ㄩ噺缁撴灉锛圧esult锛�
-//Bosch_Rexroth /锛圕h_0_1.csv / Ch_0_2.csv 涓ら�氶亾 鍚屾椂鍙栨渶鏂扮殑锛堟垨鑰卛d瀵瑰簲锛燂級锛� 棰勬嫥绱у姏鐭╁伐浣�4 棰勬嫥绱у姏鐭╋紙T + Nm锛� 璐ㄩ噺缁撴灉锛堢粨鏋滐級 鐩墠鏂囦欢涓嶈兘鑷姩鐢熸垚 鍗氫笘 鍔涘＋涔愭嫥绱х郴缁�
-//Bosch_Rexroth /锛圕h_0_3.csv / Ch_0_4.csv 涓ら�氶亾 鍚屾椂鍙栨渶鏂扮殑锛堟垨鑰卛d瀵瑰簲锛燂級锛� 缁堟嫥绱у伐浣�5 鎷х揣鍔涚煩锛圱 + Nm锛� 缁堟嫥绱ц搴�
- while (true)
- {
- threadStatusMonitor.ErrorMsg = "";
- 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)
- {
- threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- SystemValue.PLCServiceReconnect(plcService);
- //plcService.Close();
- //plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (value_02.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- 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.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
- wplog.QualityType = QualityType.Online.ToString();
+// path = path + "kistler_bush";
+// }
+//// 璐ㄩ噺淇℃伅锛氭定鏂姏鐭�... 棰勬嫥绱у姏鐭� 棰勬嫥绱ц搴� 缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
+////kistler_crack 娑ㄦ柇鍔涚煩 宸ヤ綅3 娑ㄦ柇鍔涚煩锛圷 - Maximum锛� 璐ㄩ噺缁撴灉锛圧esult锛�
+////kistler_bush 鍘嬭鍔涚煩 宸ヤ綅6 琛鍘嬭鍔涚煩锛圷 - Maximum锛� 琛鍘嬭浣嶇Щ锛圔lock X锛� 璐ㄩ噺缁撴灉锛圧esult锛�
+////Bosch_Rexroth /锛圕h_0_1.csv / Ch_0_2.csv 涓ら�氶亾 鍚屾椂鍙栨渶鏂扮殑锛堟垨鑰卛d瀵瑰簲锛燂級锛� 棰勬嫥绱у姏鐭╁伐浣�4 棰勬嫥绱у姏鐭╋紙T + Nm锛� 璐ㄩ噺缁撴灉锛堢粨鏋滐級 鐩墠鏂囦欢涓嶈兘鑷姩鐢熸垚 鍗氫笘 鍔涘＋涔愭嫥绱х郴缁�
+////Bosch_Rexroth /锛圕h_0_3.csv / Ch_0_4.csv 涓ら�氶亾 鍚屾椂鍙栨渶鏂扮殑锛堟垨鑰卛d瀵瑰簲锛燂級锛� 缁堟嫥绱у伐浣�5 鎷х揣鍔涚煩锛圱 + Nm锛� 缁堟嫥绱ц搴�
+// while (true)
+// {
+// threadStatusMonitor.ErrorMsg = "";
+// 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)
+// {
+// threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// SystemValue.PLCServiceReconnect(plcService);
+// //plcService.Close();
+// //plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (value_02.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// 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.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.IsDeleted = false;
+// wplog.QualityType = QualityType.Online.ToString();
- ////鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖 涓�鑸妭鎷嶅湪15绉掑乏鍙筹紙鍙互纭涓�涓嬶級
- ////鎵弿淇敼鏃堕棿鍦ㄤ笂娆℃壂鎻忔椂闂翠箣鍓�10绉掑埌褰撳墠鏃堕棿鐨勪箣闂寸殑鏂囦欢
- //var startTime = CommonManager.Instance.CheackPath(Environment.CurrentDirectory + $"\\LastModifyTime\\OP30Station{Station}-LastScapTime.txt", 6, -10);
- //var endTime = DateTimeHelper.GetDateTime();
- //var newFiles = FileHelper.DetectNewFilesCSV(path, 10, Convert.ToDateTime(startTime), endTime);
+// ////鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖 涓�鑸妭鎷嶅湪15绉掑乏鍙筹紙鍙互纭涓�涓嬶級
+// ////鎵弿淇敼鏃堕棿鍦ㄤ笂娆℃壂鎻忔椂闂翠箣鍓�10绉掑埌褰撳墠鏃堕棿鐨勪箣闂寸殑鏂囦欢
+// //var startTime = CommonManager.Instance.CheackPath(Environment.CurrentDirectory + $"\\LastModifyTime\\OP30Station{Station}-LastScapTime.txt", 6, -10);
+// //var endTime = DateTimeHelper.GetDateTime();
+// //var newFiles = FileHelper.DetectNewFilesCSV(path, 10, Convert.ToDateTime(startTime), endTime);
- //foreach (System.IO.FileInfo file in newFiles)
- //{
+// //foreach (System.IO.FileInfo file in newFiles)
+// //{
- //}
+// //}
- 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);
- }
- }
+// 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);
+// }
+// }
- try
- {
- if (WorkingProcedure.Equals("OP80"))
- {
- //OP80 闇�瑕佹壂鎻忔枃浠惰鍙栬川閲忎俊鎭�
- //鎵弿淇敼鏃堕棿鍦ㄤ笂娆℃壂鎻忔椂闂翠箣鍓�60绉掑埌褰撳墠鏃堕棿鐨勪箣闂寸殑鏂囦欢
- List<FileInfo> files = new List<FileInfo>();
- var newFiles = FileHelper.DetectNewFilesCSV(path, 60, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime().AddHours(1));
- foreach (var file in newFiles)
- {
- files.Add((FileInfo)file);
- }
- files = files.OrderByDescending(o => o.LastAccessTime).ToList();
- foreach (var file in files)
- {//鍙栧�掑簭鍖归厤鐨勬枃浠跺悕涓哄伐浠跺彿鐨勬枃浠�
- if (file.Name.Contains(wplog.WorkPieceID))
- {
- var datatable = CSVHelper.ReadCSVList(file.FullName);
- List<string> rowFirst = new List<string>();
- List<string> rowSecond = new List<string>();
- if (datatable.Count == 2)
- {
- rowFirst = datatable[0].Split(',').ToList();
- rowSecond = datatable[1].Split(',').ToList();
- //缁欑浉搴旇川閲忔暟鎹祴鍊�
- wplog.OP80NewCode = rowSecond[1];
- wplog.QualityOP80To1 = rowFirst[13];
- }
- else
- {
- wplog.Remarks = (wplog.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
- }
- }
- else
- {
+// try
+// {
+// if (WorkingProcedure.Equals("OP80"))
+// {
+// //OP80 闇�瑕佹壂鎻忔枃浠惰鍙栬川閲忎俊鎭�
+// //鎵弿淇敼鏃堕棿鍦ㄤ笂娆℃壂鎻忔椂闂翠箣鍓�60绉掑埌褰撳墠鏃堕棿鐨勪箣闂寸殑鏂囦欢
+// List<FileInfo> files = new List<FileInfo>();
+// var newFiles = FileHelper.DetectNewFilesCSV(path, 60, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime().AddHours(1));
+// foreach (var file in newFiles)
+// {
+// files.Add((FileInfo)file);
+// }
+// files = files.OrderByDescending(o => o.LastAccessTime).ToList();
+// foreach (var file in files)
+// {//鍙栧�掑簭鍖归厤鐨勬枃浠跺悕涓哄伐浠跺彿鐨勬枃浠�
+// if (file.Name.Contains(wplog.WorkPieceID))
+// {
+// var datatable = CSVHelper.ReadCSVList(file.FullName);
+// List<string> rowFirst = new List<string>();
+// List<string> rowSecond = new List<string>();
+// if (datatable.Count == 2)
+// {
+// rowFirst = datatable[0].Split(',').ToList();
+// rowSecond = datatable[1].Split(',').ToList();
+// //缁欑浉搴旇川閲忔暟鎹祴鍊�
+// wplog.OP80NewCode = rowSecond[1];
+// wplog.QualityOP80To1 = rowFirst[13];
+// }
+// else
+// {
+// wplog.Remarks = (wplog.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
+// }
+// }
+// else
+// {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}涓嶆槸鎸囧畾宸ヤ欢{wplog.WorkPieceID}");
- }
- }
- }
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}涓嶆槸鎸囧畾宸ヤ欢{wplog.WorkPieceID}");
+// }
+// }
+// }
- }
- catch (Exception ex)
- {
- threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+// }
+// catch (Exception ex)
+// {
+// threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// threadStatusMonitor.Threadstatue = 1;
- }
- value_02 = value.ToString();
+// }
+// value_02 = value.ToString();
- }
- threadStatusMonitor.Remarks = $"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);
- }
+// }
+// threadStatusMonitor.Remarks = $"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)
- {
- threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- threadStatusMonitor.ErrorMsg = "";
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
- threadStatusMonitor.Remarks = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (Exception ex)
+// {
+// threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// finally
+// {
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// }
+// }
+// }
+// else
+// {
+// threadStatusMonitor.ErrorMsg = "";
+// threadStatusMonitor.Threadcode = DataCapturePointCode;
+// threadStatusMonitor.Threadcname = DataCapturePointCname;
+// threadStatusMonitor.Threadendtime = DateTime.Now;
+// threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+// threadStatusMonitor.Threadstatue = 0;
+// threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+// threadStatusMonitor.Remarks = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶娴嬮噺鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
index 7cc8712..11923e3 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
@@ -16,7 +16,7 @@
/// <summary>
/// OP10娴嬭瘯瀹屾垚鏍囪 锛圤P10锛�
/// </summary>
- public class DataCaptureHandler_OP1002: DataCaptureHandler
+ public class DataCaptureHandler_OP1002 : DataCaptureHandler
{
public static readonly DataCaptureHandler_OP1002 Instance = new DataCaptureHandler_OP1002();
@@ -95,7 +95,7 @@
{//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
//瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
//涓氬姟浠ｇ爜
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***1****");
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***1****");
threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
@@ -107,7 +107,7 @@
wplog.CreatedTime = DateTimeHelper.GetDateTime();
wplog.CreatedUserName = DataCapturePointCode;
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+ wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.OnlineTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
wplog.QualityType = QualityType.Online.ToString();
@@ -123,8 +123,8 @@
{
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
}
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***2****{col.DataCaptureColumnTabelName} 鍊� {valuecol.ToString()??""}");
-
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***2****{col.DataCaptureColumnTabelName} 鍊� {valuecol.ToString() ?? ""}");
+
if (col.DataCaptureColumnTabelName.Contains("Quality"))
{//瀛楁鍚嶅寘鍚玅uality鏄涓烘槸璐ㄩ噺鏁版嵁锛岄兘鏄浆鎹㈡垚string
set.SetValue(wplog, valuecol.ToString());//缁欏姩鎬佸瓧娈佃祴鍊�
@@ -152,6 +152,7 @@
//#endregion
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***3****");
+
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
index 2942fa1..be5f480 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
@@ -154,6 +154,7 @@
//#endregion
+
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index 76e4829..b6e683c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -737,150 +737,156 @@
/// <param name="e"></param>
private void button8_Click(object sender, EventArgs e)
{
- try
- {
- DataCaptureHandler.RefreshDataCommonStatic();
- button8.Text = "妯℃嫙宸插惎鍔�";
- button8.BackColor = Color.Green;
- SystemValue.isStartedImitateModel = true;
- #region 鏁版嵁閲囬泦椤圭‘瀹�
- var dataCaptureConfigslist = DataCaptureConfigManager.GetDataCaptureConfigs();
- var columnList = DataCaptureConfigManager.GetDataCaptureColumnConfig();
- _dataCaptureHandler.Clear();
- foreach (var config in dataCaptureConfigslist)
- {
+ //try
+ //{
+ // DataCaptureHandler.RefreshDataCommonStatic();
+ // button8.Text = "妯℃嫙宸插惎鍔�";
+ // button8.BackColor = Color.Green;
+ // SystemValue.isStartedImitateModel = true;
+ // #region 鏁版嵁閲囬泦椤圭‘瀹�
+ // var dataCaptureConfigslist = DataCaptureConfigManager.GetDataCaptureConfigs();
+ // var columnList = DataCaptureConfigManager.GetDataCaptureColumnConfig();
+ // _dataCaptureHandler.Clear();
+ // foreach (var config in dataCaptureConfigslist)
+ // {
- switch (config.DataCapturePointCode)
- {
- #region HMI04
- case "RHMIOP104001":
- case "RHMIOP2001":
- case "RHMIOP303501":
- case "RHMIOP5001":
- case "RHMIOP6001":
- HMI_WorkpieceReading.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(HMI_WorkpieceReading.Instance);
- break;
- case "WHMIOP104002":
- case "WHMIOP2002":
- case "WHMIOP303502":
- case "WHMIOP5002":
- case "WHMIOP6002":
- HMI_WorkpieceWrite.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(HMI_WorkpieceWrite.Instance);
- break;
- #endregion
- case "OP0501":
- DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance);
- break;
- case "OP2001":
- DataCaptureHandler_OP2001.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP2001.Instance);
- break;
- #region OP30
- case "OP3001":
- DataCaptureHandler_OP3001.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3001.Instance);
- break;
- case "OP3002":
- DataCaptureHandler_OP3002.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3002.Instance);
- break;
- case "OP3003":
- DataCaptureHandler_OP3003.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3003.Instance);
- break;
- case "OP3004":
- DataCaptureHandler_OP3004.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3004.Instance);
- break;
- case "OP3005":
- DataCaptureHandler_OP3005.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3005.Instance);
- break;
- case "OP3006":
- DataCaptureHandler_OP3006.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3006.Instance);
- break;
- case "OP3007":
- DataCaptureHandler_OP3007.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3007.Instance);
- break;
- #endregion
+ // switch (config.DataCapturePointCode)
+ // {
+ // #region HMI04
+ // case "RHMIOP104001":
+ // case "RHMIOP2001":
+ // case "RHMIOP303501":
+ // case "RHMIOP5001":
+ // case "RHMIOP6001":
+ // HMI_WorkpieceReading.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(HMI_WorkpieceReading.Instance);
+ // break;
+ // case "WHMIOP104002":
+ // case "WHMIOP2002":
+ // case "WHMIOP303502":
+ // case "WHMIOP5002":
+ // case "WHMIOP6002":
+ // HMI_WorkpieceWrite.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(HMI_WorkpieceWrite.Instance);
+ // break;
+ // #endregion
+ // case "OP0501":
+ // DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance);
+ // break;
+ // case "OP2001":
+ // DataCaptureHandler_OP2001.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP2001.Instance);
+ // break;
+ // #region OP30
+ // case "OP3001":
+ // DataCaptureHandler_OP3001.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3001.Instance);
+ // break;
+ // case "OP3002":
+ // DataCaptureHandler_OP3002.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3002.Instance);
+ // break;
+ // case "OP3003":
+ // DataCaptureHandler_OP3003.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3003.Instance);
+ // break;
+ // case "OP3004":
+ // DataCaptureHandler_OP3004.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3004.Instance);
+ // break;
+ // case "OP3005":
+ // DataCaptureHandler_OP3005.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3005.Instance);
+ // break;
+ // case "OP3006":
+ // DataCaptureHandler_OP3006.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3006.Instance);
+ // break;
+ // case "OP3007":
+ // DataCaptureHandler_OP3007.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3007.Instance);
+ // break;
+ // #endregion
- #region OP35
- case "OP3501":
- DataCaptureHandler_OP3501.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3501.Instance);
- break;
- case "OP3502":
- DataCaptureHandler_OP3502.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3502.Instance);
- break;
- case "OP3503":
- DataCaptureHandler_OP3503.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3503.Instance);
- break;
- case "OP3504":
- DataCaptureHandler_OP3504.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3504.Instance);
- break;
- case "OP3505":
- DataCaptureHandler_OP3505.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3505.Instance);
- break;
- case "OP3506":
- DataCaptureHandler_OP3506.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3506.Instance);
- break;
- case "OP3507":
- DataCaptureHandler_OP3507.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP3507.Instance);
- break;
- #endregion
+ // #region OP35
+ // case "OP3501":
+ // DataCaptureHandler_OP3501.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3501.Instance);
+ // break;
+ // case "OP3502":
+ // /*
+ // DataCaptureHandler_OP3502.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3502.Instance);
+ // //*/
+ // break;
+ // case "OP3503":
+ // DataCaptureHandler_OP3503.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3503.Instance);
+ // break;
+ // case "OP3504":
+ // DataCaptureHandler_OP3504.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3504.Instance);
+ // break;
+ // case "OP3505":
+ // DataCaptureHandler_OP3505.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3505.Instance);
+ // break;
+ // case "OP3506":
+ // DataCaptureHandler_OP3506.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3506.Instance);
+ // break;
+ // case "OP3507":
+ // DataCaptureHandler_OP3507.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP3507.Instance);
+ // break;
+ // #endregion
- #region OP80
- case "OP8001":
- DataCaptureHandler_OP8001.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8001.Instance);
- break;
- case "OP8002":
- DataCaptureHandler_OP8002.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8002.Instance);
- break;
- case "OP8003":
- DataCaptureHandler_OP8003.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8003.Instance);
- break;
- case "OP8004":
- DataCaptureHandler_OP8004.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8004.Instance);
- break;
- case "OP8005":
- DataCaptureHandler_OP8005.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8005.Instance);
- break;
- case "OP8006":
- DataCaptureHandler_OP8006.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8006.Instance);
- break;
- case "OP8007":
- DataCaptureHandler_OP8007.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP8007.Instance);
- break;
- #endregion
+ // #region OP80
+ // case "OP8001":
+ // DataCaptureHandler_OP8001.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8001.Instance);
+ // break;
+ // case "OP8002":
+ // /*
+ // DataCaptureHandler_OP8002.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8002.Instance);
+ // //*/
+ // break;
+ // case "OP8003":
+ // DataCaptureHandler_OP8003.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8003.Instance);
+ // break;
+ // case "OP8004":
+ // DataCaptureHandler_OP8004.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8004.Instance);
+ // break;
+ // case "OP8005":
+ // DataCaptureHandler_OP8005.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8005.Instance);
+ // break;
+ // case "OP8006":
+ // DataCaptureHandler_OP8006.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8006.Instance);
+ // break;
+ // case "OP8007":
+ // DataCaptureHandler_OP8007.Instance._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(DataCaptureHandler_OP8007.Instance);
+ // break;
+ // #endregion
- }
- }
- #endregion
+ // }
+ // }
+ // #endregion
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "鍚姩绾跨▼鏃�----btn_StartUpAllThread_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "鍚姩绾跨▼鏃�----btn_StartUpAllThread_Click all鎶ラ敊锛�", ex);
+ //}
+
+ //**/
}
private void button10_Click(object sender, EventArgs e)
@@ -934,8 +940,8 @@
MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
return;
}
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3002.Instance.DataCaptureStart();
+ //DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ //DataCaptureHandler_OP3002.Instance.DataCaptureStart();
}
catch (Exception ex)
@@ -1140,22 +1146,22 @@
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8002.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8002.Instance.DataCaptureStart();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
- Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
- }
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}");
+ // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex);
+ //}
}
private void button20_Click(object sender, EventArgs e)
@@ -1353,6 +1359,11 @@
}
+ /// <summary>
+ /// 姝ｅ紡鐜锛屼娇鐢ㄨ鎸夐挳鍚姩绾跨▼锛侊紒锛侊紒
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void button24_Click(object sender, EventArgs e)
{
@@ -1658,24 +1669,24 @@
try
{
- var WorkingProcedure = "OP35";
- var EquipmentID = "EOP35";
- var DataCapturePointCode = "OP3502A";
- //var DataCapturePointCode = "OP3002CH3";
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = EquipmentID; ;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "DZ045L2309080100181A1A";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
- wplog.QualityOP10To1 = "-500";
- WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ //var WorkingProcedure = "OP35";
+ //var EquipmentID = "EOP35";
+ //var DataCapturePointCode = "OP3502A";
+ ////var DataCapturePointCode = "OP3002CH3";
+ //WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+ //wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ //wplog.WorkingProcedure = WorkingProcedure;
+ //wplog.EquipmentID = EquipmentID; ;
+ //wplog.Remarks = WorkingProcedure;
+ //wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.WorkPieceID = "DZ045L2309080100181A1A";
+ //wplog.CreatedTime = DateTimeHelper.GetDateTime();
+ //wplog.CreatedUserName = DataCapturePointCode;
+ //wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+ //wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+ //wplog.IsDeleted = false;
+ //wplog.QualityOP10To1 = "-500";
+ //WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
//string path = ConfigHelper.GetConfigString("OP30QualityDataForStation");//鎵撶爜鏈烘墦鐮佷簩缁寸爜璺緞
//if (string.IsNullOrEmpty(path))
@@ -1861,14 +1872,14 @@
DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config;
_dataCaptureHandler.Add(DataCaptureHandler_OP7009.Instance);
break;
- //case "OP3002CH3":
- // //case "OP3002CH4":
- // //case "OP3002CH5":
- // //case "OP3002CH6":
- // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
- // dc02._dataCaptureConfig = config;
- // _dataCaptureHandler.Add(dc02);
- // break;
+ //case "OP3002CH3":
+ // //case "OP3002CH4":
+ // //case "OP3002CH5":
+ // //case "OP3002CH6":
+ // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
+ // dc02._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(dc02);
+ // break;
//case "OP2002A":
// //case "OP2002B":
// //case "OP2002C":
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
index f2d1235..a3c55fb 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
@@ -13,6 +13,19 @@
[TestClass]
public class UnitTest1
{
+
+
+ [TestMethod]
+ public void TestMetho22()
+ {
+ var aa = "";
+ WorkPieceInfo cur_db_info = new WorkPieceInfo()
+ {
+ WorkingProcedureCurrent = "OP05"
+ };
+ WorkPieceInfoManager.SetWorkingProcedureCurrentForOP10(cur_db_info, ref aa);
+ }
+
[TestMethod]
public void TestMethod1()
{
--
Gitblit v1.9.3