DF22001YiQi.git

			@@ -933,6 +933,8 @@
			info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//已完成工序
			info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
			}
			QualityDataInfo qualityData = null;
			qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
			if (loginfo.WorkingProcedure.Equals("OP35"))
			{//为了解决OP35的采集到的质量信息是OK还NOOK的情况，OP35 NOOK时更新质量信息
			loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"OP35NOOK原质量信息{(info.QualityState.HasValue ? info.QualityState.Value.ToString() : "空")}";
			@@ -947,7 +949,7 @@
			}
			loginfo.QualityState = info.QualityState;

			var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();

			if (qualityData != null)
			{
			qualityData.OP35QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3";
			@@ -965,7 +967,7 @@
			pro.UpdatedTime = DateTimeHelper.GetDateTime();
			}

			QualityStateHelper.SetQualityStateForNoOk(ref info, ref pro);
			QualityStateHelper.SetQualityStateForNoOk(ref info, ref pro, ref qualityData);

			db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(info));

			@@ -19,7 +19,7 @@
			/// </summary>
			/// <param name="value"></param>
			/// <returns></returns>
			public static void SetQualityStateForNoOk(ref WorkPieceInfo info, ref WorkPieceProcess pro)
			public static void SetQualityStateForNoOk(ref WorkPieceInfo info, ref WorkPieceProcess pro, ref QualityDataInfo qualityData)
			{
			try
			{
			@@ -46,6 +46,11 @@
			info.QualityNoOkReason = qualityNoOkEnum.ToString();
			}
			}

			if (qualityData != null)
			{
			qualityData.QualityState = (int)QualityState.NG;
			}
			}
			catch (Exception ex)
			{

	DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史