From 8a9ca879c839467051db1e5d3e7986537ac5afce Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 9月 2024 13:54:55 +0800
Subject: [PATCH] 测量岛数据展示
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP3002.cs | 484 ++++++++++++++++++++++++++--------------------------
1 files changed, 242 insertions(+), 242 deletions(-)
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}宸ュ簭鐩戞帶娴嬮噺鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
--
Gitblit v1.9.3