DF22001YiQi.git

			@@ -502,7 +502,7 @@
			}
			pieceInfo.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
			pieceInfo.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
			pieceInfo.CreatedUserName = logMiddle.MonitoringPoint;
			pieceInfo.CreatedUserName = ResetUpdatedUserName(logMiddle);
			pieceInfo.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();//
			pieceInfo.WorkingProcedureEndTime = null;
			@@ -547,7 +547,7 @@
			else
			{//更新工件
			equinfo.WorkPieceID = logMiddle.WorkPieceID;
			equinfo.UpdatedUserName = logMiddle.MonitoringPoint;
			equinfo.UpdatedUserName = ResetUpdatedUserName(logMiddle);
			equinfo.UpdatedTime = DateTime.Now;
			equinfo.OnlineTime = DateTime.Now;
			}
			@@ -565,7 +565,7 @@
			pieceInfo.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
			pieceInfo.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
			pieceInfo.Remarks = pieceInfo.Remarks ?? "" + $"{logMiddle.WorkingProcedure}质量检测完成修改";
			pieceInfo.UpdatedUserName = logMiddle.MonitoringPoint;
			pieceInfo.UpdatedUserName = ResetUpdatedUserName(logMiddle);
			pieceInfo.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			if (!(pieceInfo.WorkingProcedureStartTime.HasValue && pieceInfo.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
			{//工序开始时间没有则赋值
			@@ -727,9 +727,9 @@
			SetQualityNoOk_WorkPieceProcess(logMiddle, ref process);

			process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			process.CreatedUserName = logMiddle.MonitoringPoint;
			process.CreatedUserName = ResetUpdatedUserName(logMiddle);
			process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			process.UpdatedUserName = logMiddle.MonitoringPoint;
			process.UpdatedUserName = ResetUpdatedUserName(logMiddle);
			process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			process.OperationType = OperationType.生产.ToString();
			process.QualityDataInfoID = qualityData.Id;
			@@ -739,7 +739,7 @@
			else
			{//其他的都只是修改
			pro.QualityDataInfoID = qualityData.Id;
			pro.UpdatedUserName = logMiddle.MonitoringPoint;
			pro.UpdatedUserName = ResetUpdatedUserName(logMiddle);
			pro.UpdatedTime = DateTimeHelper.GetDateTime();
			pro.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : 9;
			//赋值不合格原因
			@@ -748,7 +748,7 @@
			//TODO:判断如果是60工序，那么就要更新pro表的创建人为loginfo.MonitoringPoint 【Editby shaocx,2024-06-05】
			if (logMiddle.WorkingProcedure == "OP60")
			{
			pro.CreatedUserName = logMiddle.MonitoringPoint;
			pro.CreatedUserName = ResetUpdatedUserName(logMiddle);

			}
			}
			@@ -791,6 +791,21 @@
			}
			}
			}

			/// <summary>
			/// 赋值修改人【Editby shaocx,2024-07-05】
			/// </summary>
			/// <param name="logMiddle"></param>
			/// <returns></returns>
			public static string ResetUpdatedUserName(WorkPieceLogMiddle logMiddle)
			{
			if (logMiddle.MonitoringPoint.Equals("OP1003"))
			{//因为OP10和OP40是一台机器，OP1003专门是OP40测量的。
			return "OP4003";
			}
			return logMiddle.MonitoringPoint;
			}

			/// <summary>
			/// 工件推出NOOK
			/// </summary>
			@@ -2153,15 +2168,49 @@

			public static void SetQualityNoOk_WorkPieceInfo(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo pieceInfo)
			{
			if (!IsWirteQualityNoOk(logMiddle, pieceInfo.QualityNoOk)) return;

			pieceInfo.QualityNoOk = logMiddle.QualityNoOk;
			pieceInfo.QualityNoOkReason = logMiddle.QualityNoOkReason;
			}
			public static void SetQualityNoOk_WorkPieceProcess(WorkPieceLogMiddle logMiddle, ref WorkPieceProcess pieceProcess)
			{
			if (!IsWirteQualityNoOk(logMiddle, pieceProcess.QualityNoOk)) return;

			pieceProcess.QualityNoOk = logMiddle.QualityNoOk;
			pieceProcess.QualityNoOkReason = logMiddle.QualityNoOkReason;
			}

			/// <summary>
			/// 是否需要重写 NOOK原因
			/// </summary>
			/// <param name="logMiddle"></param>
			/// <param name="pieceInfo"></param>
			/// <returns></returns>
			public static bool IsWirteQualityNoOk(WorkPieceLogMiddle logMiddle, int? qualityNoOk)
			{
			if (logMiddle.WorkingProcedure == (WorkingProcedureForHMI.OP30).ToString())
			{
			//特殊逻辑：按照OP30的顺序判断
			if (logMiddle.QualityNoOk != null && qualityNoOk != null
			&& (
			qualityNoOk == (int)QualityNoOkEnum.OP30压衬套工位力矩大
			\|\| qualityNoOk == (int)QualityNoOkEnum.OP30涨断工位力矩大
			\|\| qualityNoOk == (int)QualityNoOkEnum.OP30终拧紧工位力矩大
			\|\| qualityNoOk == (int)QualityNoOkEnum.OP30预拧紧工位力矩大
			)
			)
			{
			if ((int)logMiddle.QualityNoOk > (int)qualityNoOk)
			{//不需要重新赋值
			return false;
			}
			}
			}

			return true;
			}


			/// <summary>
			/// 判断是否跳序