DF22001YiQi.git

			@@ -833,19 +833,20 @@
			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));//插入日志

			if (isAdd)

			@@ -13,6 +13,16 @@
			/// </summary>
			public class SystemHelper
			{

			public static string GetStrForQualityOP70(string str)
			{
			if (string.IsNullOrEmpty(str) \|\| str == "0")
			{
			return "";
			}
			return str;
			}

			/// <summary>
			/// 字符串转换decimal类型
			/// </summary>

			@@ -1857,14 +1857,18 @@
			{
			switch (config.DataCapturePointCode)
			{
			case "OP3002CH3":
			//case "OP3002CH4":
			//case "OP3002CH5":
			//case "OP3002CH6":
			DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
			dc02._dataCaptureConfig = config;
			_dataCaptureHandler.Add(dc02);
			case "OP7009"://清洗机获取采集数据
			DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config;
			_dataCaptureHandler.Add(DataCaptureHandler_OP7009.Instance);
			break;
			//case "OP3002CH3":
			// //case "OP3002CH4":
			// //case "OP3002CH5":
			// //case "OP3002CH6":
			// DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
			// dc02._dataCaptureConfig = config;
			// _dataCaptureHandler.Add(dc02);
			// break;
			//case "OP2002A":
			// //case "OP2002B":
			// //case "OP2002C":

	DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemHelper.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史