DF22001YiQi.git

			@@ -1,4 +1,5 @@
			using iWare_SCADA_BusinessLogical.BLL;
			using iWare_SCADA_BusinessLogical.BLL.Important;
			using iWare_SCADA_BusinessLogical.Utils;
			using iWare_SCADA_Model;
			using System;
			@@ -89,25 +90,23 @@
			var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
			stopwatch.Stop();
			Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序测标记读取{DateTime.Now}***01{stopwatch.ElapsedMilliseconds}*{value.ToString().ToUpper()}");
			if(value.ToString().ToUpper().Equals("TRUE"))
			{

			}
			if (SystemValue.value_OP1003.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
			{//当上一标记位0，当前获取标记为1时，
			//触发操作, 并给静态变量赋值为1
			//业务代码
			WorkPieceLogMiddle wplog = null;
			var value_bool = value.ToString().ToUpper().Equals("TRUE");
			if (value_bool)
			{
			threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
			WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
			wplog = new WorkPieceLogMiddle();
			wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			wplog.WorkingProcedure = WorkingProcedure;
			wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
			wplog.Remarks = WorkingProcedure;
			wplog.MonitoringPoint = DataCapturePointCode;
			//wplog.CreatedUserName = DataCapturePointCode;
			SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
			wplog.CreatedTime = DateTimeHelper.GetDateTime();
			wplog.CreatedUserName = DataCapturePointCode;
			wplog.UpdatedTime = DateTimeHelper.GetDateTime();
			wplog.UpdatedUserName = Environment.MachineName+"自动" + Thread.CurrentThread.ManagedThreadId.ToString();
			wplog.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString();
			wplog.OnlineTime = DateTimeHelper.GetDateTime();
			wplog.IsDeleted = false;

			@@ -122,7 +121,7 @@
			{
			Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控读码标记 {col.DataCaptureColumnTabelName}读取工件码动态由于字段名没找到，赋值【{WorkingProcedure ?? "空字符串"}】失败{wplog.Id}");
			}
			if(col.DataCaptureColumnTabelName.Contains("Quality"))
			if (col.DataCaptureColumnTabelName.Contains("Quality"))
			{//字段名包含Quality是认为是质量数据，都是转换成string
			set.SetValue(wplog, valuecol.ToString());//给动态字段赋值
			}
			@@ -136,6 +135,22 @@
			Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控读码标记 {col.DataCaptureColumnTabelName}读取工件码动态赋值【{WorkingProcedure ?? "空字符串"}】异常{wplog.Id}", setex);
			}
			}

			//监控上线
			MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
			}
			//if (wplog != null)
			//{
			// var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
			// if (isRight)
			// {
			#region 业务处理

			if (SystemValue.value_OP1003.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
			{//当上一标记位0，当前获取标记为1时，
			//触发操作, 并给静态变量赋值为1
			//业务代码

			if (wplog.WorkPieceID.Length != 22)
			{//获取到的工件号异常
			Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控读码标记读取工件码数据时异常：");
			@@ -154,18 +169,22 @@

			//#endregion


			//更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表
			WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
			QualityInfoCompleteManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
			threadStatusMonitor.Threadstatue = 1;
			}
			SystemValue.value_OP1003 = value.ToString();

			#endregion
			// }
			//}

			}
			SystemValue.lbl_Alert_OP1003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
			if (!_dataCaptureConfig.DataCaptureFrequency.HasValue \|\| _dataCaptureConfig.DataCaptureFrequency < 10)
			{
			Thread.Sleep(5000);
			Thread.Sleep(700);
			}
			else
			{