DF22001YiQi.git

			@@ -33,8 +33,22 @@
			/// <param name="pro"></param>
			public static void SetQualityStateForOP80(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo info, ref WorkPieceProcess pro)
			{
			QualityState setQualityState = QualityState.OK;
			QualityStateEnum setQualityState = QualityStateEnum.OK;
			QualityNoOkEnum? qualityNoOkEnum = null;


			if (logMiddle.St3_Means_OK == false)
			{
			qualityNoOkEnum = QualityNoOkEnum.OP80测量不合格;
			setQualityState = QualityStateEnum.NG;
			}
			else if (logMiddle.St4_Weight_OK == false)
			{
			qualityNoOkEnum = QualityNoOkEnum.OP80称重不合格;
			setQualityState = QualityStateEnum.NG;
			}
			//去掉这个验证,为了让机床计数和数据采集计数相同【Edityby shaocx,2024-09-04】
			/*
			if (logMiddle.St5_Mark_OK == false)
			{
			qualityNoOkEnum = QualityNoOkEnum.OP80打标不合格;
			@@ -45,6 +59,7 @@
			qualityNoOkEnum = QualityNoOkEnum.OP80打标识别不合格;
			setQualityState = QualityState.NG;
			}
			//*/

			info.QualityState = (int)setQualityState;
			if (qualityNoOkEnum != null)
			@@ -73,7 +88,7 @@
			{
			try
			{
			QualityState setQualityState = QualityState.NG;
			QualityStateEnum setQualityState = QualityStateEnum.NG;
			QualityNoOkEnum? qualityNoOkEnum = null;
			info.QualityState = (int)setQualityState;

			@@ -140,7 +155,7 @@
			}
			else if (logMiddle.WorkingProcedureCurrent == "OP35")
			{
			qualityNoOkEnum = QualityNoOkEnum.OP35滚压力不合格;
			qualityNoOkEnum = QualityNoOkEnum.OP35滚压力超差;
			return;
			}
			else if (logMiddle.WorkingProcedureCurrent == "OP40")