DF22001YiQi.git

			@@ -41,7 +41,7 @@
			return workPiece.Id;
			}
			}


			public static WorkPieceLogMiddle GetAddWorkPieceLog(WorkPieceLogMiddle loginfo)
			{
			loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			@@ -140,15 +140,16 @@
			try
			{
			var info = db.KnifeToolEquipmentInfo.Where(o => o.EquipmentID.Equals(loginfo.EquipmentID)).ToList();
			foreach(var item in info)
			foreach (var item in info)
			{
			item.CurrentLife++;
			item.UpdatedTime= DateTime.Now;
			item.UpdatedTime = DateTime.Now;
			}

			}catch(Exception ex)
			}
			catch (Exception ex)
			{
			loginfo.Remarks = (loginfo.Remarks ?? "") + $"{loginfo.WorkPieceID ?? "空"}刀具寿命更新数据异常{ex.Message}";
			loginfo.Remarks = (loginfo.Remarks ?? "") + $"{loginfo.WorkPieceID ?? "空"}刀具寿命更新数据异常{ex.Message}";

			}
			}
			@@ -157,7 +158,7 @@
			/// 读取二维码时逻辑
			/// 校验工件是否跳序，质量是否合格
			/// </summary>
			public static void ReadQRcode(WorkPieceLog loginfo, LogType type,PLCService plcService, int? IsFeedback)
			public static void ReadQRcode(WorkPieceLog loginfo, LogType type, PLCService plcService, int? IsFeedback)
			{//此处同时插入了WorkPieceLog，WorkPieceInfoLog表，并新增或修改WorkPieceInfo表
			using (DbModel db = new DbModel())
			{
			@@ -193,7 +194,7 @@
			}
			else
			{
			if(info.WorkingProcedureCurrent.Equals("OP05"))
			if (info.WorkingProcedureCurrent.Equals("OP05"))
			{
			loginfo.Remarks = (loginfo.Remarks ?? "") + $"读取二维码{loginfo.WorkPieceID ?? "空"} OP05工序重复读取了";
			return;
			@@ -211,9 +212,9 @@
			info.WorkPieceCurrentPosition = loginfo.WorkingProcedure;
			info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
			info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
			info.Remarks = info.Remarks??""+$"{info.WorkingProcedureCurrent}工件上线";
			info.Remarks = info.Remarks ?? "" + $"{info.WorkingProcedureCurrent}工件上线";

			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID &&!o.OperationType.Equals("SPC")&& (o.EndTime==null\|\| o.EndTime<=DateTime.MinValue)).OrderByDescending(o => o.StartTime).FirstOrDefault();
			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && !o.OperationType.Equals("SPC") && (o.EndTime == null \|\| o.EndTime <= DateTime.MinValue)).OrderByDescending(o => o.StartTime).FirstOrDefault();
			if (pro != null && pro.WorkPieceID.Length > 1)
			{
			pro.EndTime = DateTimeHelper.GetDateTime();
			@@ -318,14 +319,14 @@
			{//没有工件信息，不做更新
			Log4NetHelper.WriteErrorLog(type, $"设备{loginfo.EquipmentID} 告警监控{loginfo.WorkingProcedure} 没有获取到设备监控信息，现新增");
			equinfo = EntityPropHelper.Mapper<EquipmentCurrentMonitor, WorkPieceLog>(loginfo);
			equinfo.OnlineTime=DateTime.Now;
			equinfo.OnlineTime = DateTime.Now;
			isAddEquipmentCurrentMonitor = true;
			}
			else
			{//更新工件
			equinfo.WorkPieceID = loginfo.WorkPieceID;
			equinfo.UpdatedUserName = loginfo.MonitoringPoint;
			equinfo.UpdatedTime = DateTime.Now;
			equinfo.UpdatedTime = DateTime.Now;
			equinfo.OnlineTime = DateTime.Now;
			}
			if (isAddEquipmentCurrentMonitor)
			@@ -345,7 +346,7 @@

			}
			}
			catch(Exception e)
			catch (Exception e)
			{
			loginfo.Remarks = (loginfo.Remarks ?? "") + $"读取二维码{loginfo.WorkPieceID ?? "空"}更新数据异常{e.Message}";
			}
			@@ -393,7 +394,7 @@
			{
			return loginfo;
			}
			loginfo.QualityOP40To1 = ((StandardValue + oldvalue*1.0/ cofOP40.DecimalPlaces).ToString());
			loginfo.QualityOP40To1 = ((StandardValue + oldvalue * 1.0 / cofOP40.DecimalPlaces).ToString());
			//+(string.IsNullOrEmpty(cofOP40.Unit) ? "" : cofOP40.Unit)
			}
			break;
			@@ -409,7 +410,7 @@
			{
			return loginfo;
			}
			loginfo.QualityOP20To1 = ((StandardValue + oldvalue * 1.0 / cofOP20.DecimalPlaces).ToString());
			loginfo.QualityOP20To1 = ((StandardValue + oldvalue * 1.0 / cofOP20.DecimalPlaces).ToString());
			}
			break;
			case "OP60":
			@@ -445,7 +446,7 @@

			}
			}
			catch(Exception ex)
			catch (Exception ex)
			{

			}
			@@ -477,7 +478,7 @@
			info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
			if (info == null \|\| info.WorkPieceID.Length < 1)
			{//没有工件信息，不做更新
			if (loginfo.MonitoringPoint.Equals("OP1002") \|\| loginfo.MonitoringPoint.Equals("OP1003")\|\| loginfo.MonitoringPoint.Contains("OP2002"))
			if (loginfo.MonitoringPoint.Equals("OP1002") \|\| loginfo.MonitoringPoint.Equals("OP1003") \|\| loginfo.MonitoringPoint.Contains("OP2002"))
			{//OP10 没有上线扫码枪，约定用测量完成信号当上线标记
			info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLogMiddle>(loginfo);
			//EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
			@@ -505,7 +506,7 @@
			}
			else
			{
			loginfo2.Remarks = loginfo2.Remarks??""+$"\|工件{loginfo.WorkPieceID} 质量检测完成工序{loginfo.MonitoringPoint} 没有获取到工件信息不做更新";
			loginfo2.Remarks = loginfo2.Remarks ?? "" + $"\|工件{loginfo.WorkPieceID} 质量检测完成工序{loginfo.MonitoringPoint} 没有获取到工件信息不做更新";
			Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 质量检测完成工序{loginfo.MonitoringPoint} 没有获取到工件信息不做更新");
			return;
			}
			@@ -532,7 +533,7 @@
			if (equinfo == null \|\| equinfo.Id < 1)
			{//没有工件信息，不做更新
			Log4NetHelper.WriteErrorLog(type, $"设备{loginfo.EquipmentID} 告警监控{loginfo.WorkingProcedure} 没有获取到设备监控信息，现新增");
			equinfo = EntityPropHelper.Mapper<EquipmentCurrentMonitor, WorkPieceLog>(loginfo);
			equinfo = EntityPropHelper.Mapper<EquipmentCurrentMonitor, WorkPieceLog>(loginfo);
			equinfo.OnlineTime = DateTime.Now;
			isAddEquipmentCurrentMonitor = true;
			}
			@@ -556,7 +557,7 @@
			info.QualityStateUpdateUser = loginfo.UpdatedUserName;
			info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime;
			info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
			info.Remarks = info.Remarks??"" + $"{loginfo.WorkingProcedure}质量检测完成修改";
			info.Remarks = info.Remarks ?? "" + $"{loginfo.WorkingProcedure}质量检测完成修改";
			info.UpdatedUserName = loginfo.MonitoringPoint;
			info.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
			@@ -576,12 +577,12 @@
			loginfo.QualityState = info.QualityState;
			if (isAddWorkPieceInfo)
			{
			db.WorkPieceInfo.Add(info);
			db.WorkPieceInfo.Add(info);
			}

			#region 根据标准值更新最新质量数据（OP10/OP40/OP20/OP60）
			var qcofig = db.EquipmentQualityConfig.Where(o => o.WorkingProcedure.Equals(loginfo.WorkingProcedure) && o.ParamType!=1 && o.IsDeleted == false).ToList();
			if(qcofig.Count > 0)
			var qcofig = db.EquipmentQualityConfig.Where(o => o.WorkingProcedure.Equals(loginfo.WorkingProcedure) && o.ParamType != 1 && o.IsDeleted == false).ToList();
			if (qcofig.Count > 0)
			{
			QualityDataHand(loginfo, qcofig);
			}
			@@ -595,15 +596,15 @@
			db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData));
			}
			//修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的
			EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(loginfo, qualityData, GetQualityDataInfoUpdate(loginfo.WorkingProcedure,loginfo.MonitoringPoint));//指定修改字段
			EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(loginfo, qualityData, GetQualityDataInfoUpdate(loginfo.WorkingProcedure, loginfo.MonitoringPoint));//指定修改字段

			qualityData.QualityStateUpdateUser = info.UpdatedUserName;
			qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
			qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
			if (loginfo.WorkingProcedure.Equals("OP10"))
			{
			qualityData.OP10QualityState = loginfo.QualityState.HasValue? loginfo.QualityState.Value.ToString():"3";
			qualityData.OP10QualityReceiveTime= DateTimeHelper.GetDateTime();
			qualityData.OP10QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3";
			qualityData.OP10QualityReceiveTime = DateTimeHelper.GetDateTime();
			}
			else if (loginfo.WorkingProcedure.Equals("OP20"))
			{
			@@ -620,7 +621,7 @@
			case "OP3002CH3":
			qualityData.OP30QualityFilePathCH3 = loginfo.OP30QualityFilePathCH3;
			qualityData.OP30QualityStateCH3 = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3";
			qualityData.OP30QualityReceiveTimeCH3= DateTimeHelper.GetDateTime();
			qualityData.OP30QualityReceiveTimeCH3 = DateTimeHelper.GetDateTime();
			break;
			case "OP3002CH4":
			qualityData.OP30QualityFilePathCH4 = loginfo.OP30QualityFilePathCH4;
			@@ -667,7 +668,7 @@
			}

			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == info.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
			if (pro == null \|\| pro.WorkPieceID.Length < 1\|\|loginfo.MonitoringPoint.Equals("OP1002") \|\| loginfo.MonitoringPoint.Equals("OP1003") \|\| loginfo.MonitoringPoint.Contains("OP2002"))
			if (pro == null \|\| pro.WorkPieceID.Length < 1 \|\| loginfo.MonitoringPoint.Equals("OP1002") \|\| loginfo.MonitoringPoint.Equals("OP1003") \|\| loginfo.MonitoringPoint.Contains("OP2002"))
			{// OP10 没有上线扫码枪，约定用测量完成信号当上线标记，所以上线需要修改的字段放这里
			//上线是每次都插入

			@@ -691,9 +692,16 @@
			pro.UpdatedUserName = loginfo.MonitoringPoint;
			pro.UpdatedTime = DateTimeHelper.GetDateTime();
			pro.QualityState = info.QualityState.HasValue ? info.QualityState.Value : 9;

			//TODO:判断如果是60工序，那么就要更新pro表的创建人为loginfo.MonitoringPoint 【Editby shaocx,2024-06-05】
			if (loginfo.WorkingProcedure == "OP60")
			{
			pro.CreatedUserName = loginfo.MonitoringPoint;

			}
			}

			if (loginfo.QualityType!=null&& loginfo.QualityType.Equals(QualityType.SPC.ToString()))
			if (loginfo.QualityType != null && loginfo.QualityType.Equals(QualityType.SPC.ToString()))
			{//SPC反馈，
			if (loginfo.QualityState != (int)QualityState.OK)
			{
			@@ -703,7 +711,7 @@
			//时间段结束时间：抽检工件质量结果出现后的时间
			//抽检工件工序扫描枪外入口处的第一个工件也把质量状态置为疑似
			//（每一工序SPC抽检是设置的固定的，比如200抽4，状态置为疑似时若工件还在设备内，会继续生产完毕后排出）

			//目前这块逻辑放到了 WebAPI中了

			}

			@@ -718,7 +726,7 @@

			}
			}
			catch(Exception ex)
			catch (Exception ex)
			{
			loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量检测完成{loginfo.WorkPieceID ?? "空"}更新数据异常{ex.Message}++{ex.StackTrace}";
			Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}工序监控读码标记读取工件码数据[{loginfo.WorkPieceID ?? "空"}]时异常：");
			@@ -779,9 +787,9 @@
			info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//已完成工序
			info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
			}
			if(loginfo.WorkingProcedure.Equals("OP35"))
			if (loginfo.WorkingProcedure.Equals("OP35"))
			{//为了解决OP35的采集到的质量信息是OK还NOOK的情况，OP35 NOOK时更新质量信息
			loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"OP35NOOK原质量信息{(info.QualityState.HasValue? info.QualityState.Value.ToString():"空")}";
			loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"OP35NOOK原质量信息{(info.QualityState.HasValue ? info.QualityState.Value.ToString() : "空")}";
			info.QualityState = (int)QualityState.NG;
			if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
			{
			@@ -824,7 +832,7 @@
			{
			loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"读取二维码{loginfo.WorkPieceID ?? "空"}更新数据异常{e.Message}";
			}



			db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo2));//插入工件采集日志表
			db.SaveChanges();
			@@ -843,8 +851,9 @@
			{
			WorkPieceLog loginfo2 = new WorkPieceLog();
			loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(loginfo);
			try {
			if ((loginfo.WorkPieceID != null && loginfo.WorkPieceID.Trim('\0').Length == 22)
			try
			{
			if ((loginfo.WorkPieceID != null && loginfo.WorkPieceID.Trim('\0').Length == 22)
			//\|\| !((loginfo.WorkingProcedure.Equals("OP10") \|\| loginfo.WorkingProcedure.Equals("OP40")) && loginfo.Remarks.Length > 0)
			)
			{
			@@ -858,7 +867,7 @@
			}
			else
			{//更新表WorkPieceInfo
			if(loginfo.WorkingProcedure.Equals("OP10"))
			if (loginfo.WorkingProcedure.Equals("OP10"))
			{
			info.WorkPieceCurrentPosition = info.WorkingProcedureCurrent + "SPC";
			//var WorkingProcedure = (loginfo.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40");
			@@ -886,8 +895,8 @@
			info.Remarks = "工件SPC抽检推出";

			//更新上一工序的结束时间
			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o=>o.StartTime).FirstOrDefault();
			if (pro != null && pro.WorkPieceID.Length >0)
			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
			if (pro != null && pro.WorkPieceID.Length > 0)
			{
			pro.EndTime = DateTimeHelper.GetDateTime();
			pro.Remarks = (pro.Remarks ?? "") + "SPC抽检结束";
			@@ -905,7 +914,7 @@
			process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			process.UpdatedUserName = loginfo.MonitoringPoint;
			process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			process.Remarks = "工件SPC抽检推出";
			process.Remarks = "工件SPC抽检推出";
			db.WorkPieceProcess.Add(process);


			@@ -926,7 +935,7 @@
			db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo2));//插入工件采集日志表
			db.SaveChanges();
			}


			}
			}
			/// <summary>
			@@ -991,7 +1000,7 @@
			{//若一直没有工序开始时间，则赋值当前时间
			info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
			}
			info.WorkingProcedureEndTime= DateTimeHelper.GetDateTime();
			info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime();
			info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
			info.Remarks = $"{loginfo.WorkingProcedure}工序完成";
			long op80id = 0;
			@@ -1035,7 +1044,7 @@
			info.QualityErrorInfo = "";
			}
			}
			else if(loginfo.WorkingProcedure.Equals("OP30"))
			else if (loginfo.WorkingProcedure.Equals("OP30"))
			{

			info.QualityState = (int)((loginfo.QualityStateStr.Equals("OK") \|\| loginfo.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
			@@ -1074,7 +1083,7 @@
			}
			}

			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == info.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o=>o.StartTime).FirstOrDefault();
			var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == info.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
			if (pro == null \|\| pro.WorkPieceID.Length < 1)
			{
			WorkPieceProcess process = new WorkPieceProcess();
			@@ -1089,7 +1098,7 @@
			process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			process.OperationType = OperationType.生产.ToString();
			process.Remarks = "";
			if(op80id>0)
			if (op80id > 0)
			{
			process.QualityDataInfoID = op80id;
			}
			@@ -1142,25 +1151,26 @@
			using (DbModel db = new DbModel())
			{
			bool isAddAlert = false;
			try {
			try
			{

			var equipmentlist = db.EquipmentBaseInfo.Where(o=>o.IsDeleted==false).ToList();
			var equipmentlist = db.EquipmentBaseInfo.Where(o => o.IsDeleted == false).ToList();
			var alertlist = db.v_get_equipment_alert.Where(o => o.IsDeleted == false).ToList();
			var knifetoolbase = db.KnifeToolBaseInfo.Where(o => o.IsDeleted == false).ToList();
			var knifetoolinfo= db.KnifeToolEquipmentInfo.Where(o => o.IsDeleted == false).ToList();
			var knifetoolinfo = db.KnifeToolEquipmentInfo.Where(o => o.IsDeleted == false).ToList();
			//var knifelist = db.KnifeToolEquipmentInfo.GroupJoin(db.KnifeToolBaseInfo.Where(o => o.IsDeleted == false).ToList(), a => a.EquipmentID, b => b.EquipmentID, (a, b) => new { a,b})
			//.SelectMany(ab => ab.b.DefaultIfEmpty(), (ab, b) => new { ab.a, b.KnifeToolChangeAlertThreshold,b.KnifeToolLife })
			//.Where(o => o.a.IsDeleted == false)
			//.ToList();
			//.SelectMany(ab => ab.b.DefaultIfEmpty(), (ab, b) => new { ab.a, b.KnifeToolChangeAlertThreshold,b.KnifeToolLife })
			//.Where(o => o.a.IsDeleted == false)
			//.ToList();
			foreach (var item in equipmentlist)
			{
			try
			{
			var alert = alertlist.Where(o => o.EquipmentId.Equals(item.EquipmentId)).FirstOrDefault();
			if (alert==null\|\|alert.Id<1)
			if (alert == null \|\| alert.Id < 1)
			{
			alert = EntityPropHelper.Mapper<v_get_equipment_alert, EquipmentBaseInfo>(item);
			isAddAlert=true;
			isAddAlert = true;
			}
			//if(item.WorkingProcedure.Equals("OP70"))
			{
			@@ -1189,7 +1199,7 @@
			}
			//if (!item.WorkingProcedure.Equals("OP05")&& !item.WorkingProcedure.Equals("OP30") && !item.WorkingProcedure.Equals("OP70") && !item.WorkingProcedure.Equals("OP80"))
			{
			if(item.CuttingFluidChangeTime.HasValue)
			if (item.CuttingFluidChangeTime.HasValue)
			{
			if (item.CuttingFluidChangeTime.Value.AddDays(item.CuttingFluidChangeAlertThreshold).Date <= DateTime.Now.Date)
			{//切削液告警
			@@ -1212,10 +1222,10 @@
			}
			bool flag = false;
			string desc = $"设备【{item.EquipmentName}】";
			foreach (var knife in knifetoolinfo.Where(o=>o.EquipmentID.Equals(item.EquipmentId)))
			foreach (var knife in knifetoolinfo.Where(o => o.EquipmentID.Equals(item.EquipmentId)))
			{
			var list = knifetoolbase.Where(o => o.KnifeToolID.Equals(knife.KnifeToolID)).FirstOrDefault();
			if(list!=null)
			if (list != null)
			{
			if ((knife.CurrentLife + list.KnifeToolChangeAlertThreshold) >= list.KnifeToolLife)
			{//刀具告警
			@@ -1226,7 +1236,7 @@
			}
			}
			}
			if(!flag)
			if (!flag)
			{//没有刀具告警
			alert.IsAlertKnifeTool = false;
			alert.KnifeToolDesc = "";
			@@ -1245,7 +1255,7 @@
			}
			else
			{
			if(string.IsNullOrEmpty(info.Alertmsg))
			if (string.IsNullOrEmpty(info.Alertmsg))
			{
			alert.IsAlert = false;
			alert.AlertDesc = "";
			@@ -1260,7 +1270,8 @@
			{
			db.v_get_equipment_alert.Add(alert);
			}
			}catch(Exception ex)
			}
			catch (Exception ex)
			{

			Log4NetHelper.WriteErrorLog(type, $" {item.EquipmentName}设备计算告警时异常：");
			@@ -1271,8 +1282,8 @@
			{
			Log4NetHelper.WriteErrorLog(type, $" 设备告警监控（清洗液，切削液，刀具告警等）计算时异常：{e.Message} {e.StackTrace}");
			}





			//db.WorkPieceLog.Add(loginfo2);//插入设备采集日志表
			db.SaveChanges();
			@@ -1333,9 +1344,9 @@
			string faultmsg = "";
			int i = 1;
			foreach (var failues in Failueslist)
			{
			{
			faultall += (failues + "\r\n");
			EquipmentFailureCode codeinfo = codelist.Where(o => o.Code == failues.ToString()).FirstOrDefault();
			EquipmentFailureCode codeinfo = codelist.Where(o => o.Code == failues.ToString()).FirstOrDefault();
			if (codeinfo != null && codeinfo.Code.Length > 0)
			{
			faultmsg += (i.ToString() + "." + (codeinfo.CodeDesc ?? codeinfo.Code) + "\r\n");
			@@ -1375,13 +1386,13 @@
			string alertall = "";
			string warnmsg = "";
			i = 1;
			foreach(var alert in Alertlist)
			foreach (var alert in Alertlist)
			{
			alertall+=(alert+"\r\n");
			var codeinfo=codelist.Where(o => o.Code == alert.ToString()).FirstOrDefault();
			if(codeinfo!=null&&codeinfo.Code.Length>0)
			alertall += (alert + "\r\n");
			var codeinfo = codelist.Where(o => o.Code == alert.ToString()).FirstOrDefault();
			if (codeinfo != null && codeinfo.Code.Length > 0)
			{
			warnmsg += (i.ToString()+"."+(codeinfo.CodeDesc ?? codeinfo.Code) + "\r\n");
			warnmsg += (i.ToString() + "." + (codeinfo.CodeDesc ?? codeinfo.Code) + "\r\n");
			}
			else
			{
			@@ -1454,7 +1465,7 @@
			info.Warnmsg = warnmsg;//这个需要代码对应字典维护信息才知道
			info.WarnType = alertall;
			}
			if (info.EquipmentCurrentState==null\|\|(!info.EquipmentCurrentState.Equals(((int)EnumEquipmentCurrentStateDisplay.离线).ToString())))
			if (info.EquipmentCurrentState == null \|\| (!info.EquipmentCurrentState.Equals(((int)EnumEquipmentCurrentStateDisplay.离线).ToString())))
			{//如果设备状态为离线，则此处不需要判断任何信息
			if (loginfo.IsNormalProduction && !loginfo.LackMaterial && !loginfo.FullMaterial)
			{//自动运行状态+不缺料+不堵料
			@@ -1502,7 +1513,7 @@
			infolog.Remarks = "告警信息出现变更3";
			infolog.UpdateDesc = (infolog.UpdateDesc ?? "") + $"设备状态变更为{((EnumEquipmentCurrentStateDisplay)int.Parse(State)).ToString()}\r\n";
			isAddEquipmentWorkingLog = true;
			isStatechange=true;
			isStatechange = true;
			}
			#endregion

			@@ -1536,7 +1547,7 @@

			//查找是否有未结束的告警
			var equlogalert = db.EquipmentWorkingLog.Where(o => o.EquipmentID == loginfo.EquipmentID
			&& o.WarnStartTime != null && o.WarnStartTime != DateTime.MinValue && (o.WarnEndTime == null\|\| o.WarnEndTime == DateTime.MinValue))
			&& o.WarnStartTime != null && o.WarnStartTime != DateTime.MinValue && (o.WarnEndTime == null \|\| o.WarnEndTime == DateTime.MinValue))
			.OrderByDescending(o => o.WarnStartTime).FirstOrDefault();
			if (loginfo.IsMessage)
			{//若有告警，如果有设备状态变更，肯定插入，此处只修改即可
			@@ -1720,13 +1731,13 @@
			info.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			db.EquipmentCurrentMonitor.Add(info);
			}
			if(isAddEquipmentWorkingLog)
			if (isAddEquipmentWorkingLog)
			{
			db.EquipmentWorkingLog.Add(infolog);
			}
			}
			catch (Exception e)
			{
			{
			loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"{loginfo2.MonitoringPoint}设备监控更新数据异常{e.Message}.{e.StackTrace}";
			Log4NetHelper.WriteErrorLog(type, $"{loginfo2.MonitoringPoint}设备监控更新数据异常{e.Message}.{e.StackTrace}");
			}
			@@ -1775,13 +1786,13 @@
			info.UpdatedUserName = loginfo.MonitoringPoint;
			info.UpdatedTime = DateTime.Now;
			info.Alertmsg = "设备离线";
			info.AlertTime= DateTimeHelper.GetDateTime();
			info.AlertTime = DateTimeHelper.GetDateTime();
			info.FailureType = "";

			//若没有离线的信息，则新增一条
			var equlog = db.EquipmentWorkingLog.Where(o => o.EquipmentID == loginfo.EquipmentID
			&& o.EquipmentStateStartTime != null && o.EquipmentStateStartTime != DateTime.MinValue &&(o.EquipmentStateEndTime==null\|\|o.EquipmentStateEndTime==DateTime.MinValue)
			&&o.EquipmentState.Equals(state)
			&& o.EquipmentStateStartTime != null && o.EquipmentStateStartTime != DateTime.MinValue && (o.EquipmentStateEndTime == null \|\| o.EquipmentStateEndTime == DateTime.MinValue)
			&& o.EquipmentState.Equals(state)
			).OrderByDescending(o => o.EquipmentStateStartTime).FirstOrDefault();

			if (equlog == null)
			@@ -1808,7 +1819,7 @@
			}
			else
			{//最新状态为开机
			if(((int)EnumEquipmentCurrentStateDisplay.离线).ToString() == info.EquipmentCurrentState)
			if (((int)EnumEquipmentCurrentStateDisplay.离线).ToString() == info.EquipmentCurrentState)
			{//只有离线状态，才能变成开机
			state = ((int)EnumEquipmentCurrentStateDisplay.待机).ToString();
			info.EquipmentCurrentState = state;
			@@ -1819,7 +1830,7 @@

			//有离线的数据，则更新
			var equlog = db.EquipmentWorkingLog.Where(o => o.EquipmentID == loginfo.EquipmentID
			&& o.EquipmentStateStartTime != null && o.EquipmentStateStartTime != DateTime.MinValue&& (o.EquipmentStateEndTime == null \|\| o.EquipmentStateEndTime == DateTime.MinValue)
			&& o.EquipmentStateStartTime != null && o.EquipmentStateStartTime != DateTime.MinValue && (o.EquipmentStateEndTime == null \|\| o.EquipmentStateEndTime == DateTime.MinValue)
			&& o.EquipmentState.Equals(((int)EnumEquipmentCurrentStateDisplay.离线).ToString())
			).OrderByDescending(o => o.EquipmentStateStartTime).FirstOrDefault();
			if (equlog != null)
			@@ -1872,13 +1883,13 @@
			using (DbModel db = new DbModel())
			{
			var info = db.ThreadStatusMonitor.Where(o => o.Threadcode == threadinfo.Threadcode).FirstOrDefault();
			if (info == null \|\| info.Id==0)
			if (info == null \|\| info.Id == 0)
			{//没有工件信息，不做更新
			threadinfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			threadinfo.CreatedTime= DateTimeHelper.GetDateTime();
			threadinfo.CreatedTime = DateTimeHelper.GetDateTime();
			threadinfo.CreatedUserName = threadinfo.Threadcode;
			db.ThreadStatusMonitor.Add(threadinfo);


			}
			else
			{//更新表WorkPieceInfo
			@@ -1899,7 +1910,7 @@
			}

			}
			catch(Exception ex)
			catch (Exception ex)
			{

			}
			@@ -1912,7 +1923,7 @@
			/// </summary>
			/// <param name="WorkingProcedure"></param>
			/// <returns></returns>
			public static Dictionary<string, string> GetQualityDataInfoUpdate(string WorkingProcedure="",string MonitoringPoint="")
			public static Dictionary<string, string> GetQualityDataInfoUpdate(string WorkingProcedure = "", string MonitoringPoint = "")
			{
			Dictionary<string, string> dict = new Dictionary<string, string>();

			@@ -2051,13 +2062,13 @@
			}
			/// <summary>
			/// 解析二维码


			/// </summary>
			/// <param name="loginfo"></param>
			/// <returns></returns>
			public static WorkPieceInfo ParseQRCode(WorkPieceInfo loginfo)
			{
			if(string.IsNullOrEmpty(loginfo.WorkPieceID)\|\| loginfo.WorkPieceID.Length!=22)
			if (string.IsNullOrEmpty(loginfo.WorkPieceID) \|\| loginfo.WorkPieceID.Length != 22)
			{
			return loginfo;
			}