DF22001YiQi.git

			@@ -833,18 +833,19 @@
			qualityData.QualityReceiveTime = DateTime.Now;

			//特殊处理OP70的质量数据
			if (!string.IsNullOrEmpty(logMiddle.QualityOP70To1) && !string.IsNullOrEmpty(qualityData.QualityOP70To1))
			if (string.IsNullOrEmpty(qualityData.QualityOP70To1) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To1)))
			{
			qualityData.QualityOP70To1 = logMiddle.QualityOP70To1;
			}
			if (!string.IsNullOrEmpty(logMiddle.QualityOP70To2) && !string.IsNullOrEmpty(qualityData.QualityOP70To2))
			if (string.IsNullOrEmpty(qualityData.QualityOP70To2) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To2)))
			{
			qualityData.QualityOP70To2 = logMiddle.QualityOP70To2;
			}
			if (!string.IsNullOrEmpty(logMiddle.QualityOP70To3) && !string.IsNullOrEmpty(qualityData.QualityOP70To3))
			if (string.IsNullOrEmpty(qualityData.QualityOP70To3) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To3)))
			{
			qualityData.QualityOP70To3 = logMiddle.QualityOP70To3;
			}


			db.QualityDataInfoLog.Add(GetAddQualityDataInfoLog(qualityData));//插入日志

			@@ -964,6 +965,8 @@
			pro.UpdatedTime = DateTimeHelper.GetDateTime();
			}

			QualityStateHelper.SetQualityStateForNoOk(ref info, ref pro);

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

			}