DF22001YiQi.git

			@@ -15,7 +15,7 @@
			/// <summary>
			/// NOOK推出标记
			/// </summary>
			public class DataCaptureHandler_03: DataCaptureHandler
			public class DataCaptureHandler_03 : DataCaptureHandler
			{
			public static readonly DataCaptureHandler_03 Instance = new DataCaptureHandler_03();

			@@ -53,8 +53,9 @@
			wplog.EquipmentID = WorkingProcedure;
			wplog.Remarks = WorkingProcedure;
			wplog.MonitoringPoint = DataCapturePointCode;
			//wplog.CreatedUserName = DataCapturePointCode;
			SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
			wplog.CreatedTime = DateTimeHelper.GetDateTime();
			wplog.CreatedUserName = DataCapturePointCode;
			wplog.IsDeleted = false;


			@@ -119,11 +120,13 @@
			wplog.WorkingProcedure = WorkingProcedure;
			wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
			wplog.Remarks = WorkingProcedure;

			//wplog.WorkPieceID = "123456";
			wplog.MonitoringPoint = DataCapturePointCode;
			wplog.WorkPieceID = "123456";
			//wplog.CreatedUserName = DataCapturePointCode;
			SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
			wplog.CreatedTime = DateTimeHelper.GetDateTime();
			wplog.CreatedUserName = DataCapturePointCode;
			wplog.UpdatedUserName = Environment.MachineName+"自动" + Thread.CurrentThread.ManagedThreadId.ToString();
			wplog.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString();
			wplog.UpdatedTime = DateTimeHelper.GetDateTime();
			wplog.IsDeleted = false;
			foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
			@@ -144,7 +147,7 @@
			Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}工序监控NOOK标记读取工件码动态赋值【{WorkingProcedure ?? "空字符串"}】异常{wplog.Id}", setex);
			}
			}
			if(_dataCaptureConfig.WorkingProcedure.Equals("OP20")
			if (_dataCaptureConfig.WorkingProcedure.Equals("OP20")
			//\|\|_dataCaptureConfig.WorkingProcedure.Equals("OP60")
			)
			{//op20会同时推出多件，所以特殊处理