diff --git a/Analysis/CenterControl.cs b/Analysis/CenterControl.cs index 1c7f1bb..e81dd97 100644 --- a/Analysis/CenterControl.cs +++ b/Analysis/CenterControl.cs @@ -560,7 +560,8 @@ namespace NSAnalysis if (aryLineContent[2].ToLower().Contains("inv")) { - aryLineContent[4] = "UNCLASSIFIED"; + aryLineContent[2]= ""; + aryLineContent[4] = "ng2"; } else { @@ -576,7 +577,7 @@ namespace NSAnalysis else if (dMeasureValue >= dExceptionTUpper || dMeasureValue <= dExcepitonTLower) { aryLineContent[4] = "ng3"; - aryLineContent[2] = "inv"; + aryLineContent[2] = ""; } else { @@ -587,12 +588,12 @@ namespace NSAnalysis //测量数据存储到table里 dtCSVContent.Rows.Add(strCarID, "EH3", aryLineContent[0], aryLineContent[1], dNormalValue.ToString("F1"), dLowerValue.ToString("F1"), dUpperValue.ToString("F1"), aryLineContent[2], aryLineContent[4], DateTime.Now, ""); string strMeasureResult = aryLineContent[4].ToLower(); - if (strMeasureResult.Contains("good") || strMeasureResult.Contains("best")) + if (strMeasureResult.Contains("good") || strMeasureResult.Contains("best") || strMeasureResult.Contains("ng1")) { OKCount++; aryLineContent[4] = "OK"; } - else if (strMeasureResult.Contains("ng1") || strMeasureResult.Contains("ng2")) + else if ( strMeasureResult.Contains("ng2")) { OutCount++; aryLineContent[4] = "NG"; @@ -1064,7 +1065,8 @@ namespace NSAnalysis if (aryLineContent[2].ToLower().Contains("inv")) { - aryLineContent[4] = "UNCLASSIFIED"; + aryLineContent[2] = ""; + aryLineContent[4] = "ng2"; } else { @@ -1080,7 +1082,7 @@ namespace NSAnalysis else if (dMeasureValue >= dExceptionTUpper || dMeasureValue <= dExcepitonTLower) { aryLineContent[4] = "ng3"; - aryLineContent[2] = "inv"; + aryLineContent[2] = ""; } else { @@ -1091,12 +1093,12 @@ namespace NSAnalysis //测量数据存储到table里 dtCSVContent.Rows.Add(strCarID, "EHY", aryLineContent[0], aryLineContent[1], dNormalValue.ToString("F1"), dLowerValue.ToString("F1"), dUpperValue.ToString("F1"), aryLineContent[2], aryLineContent[4], DateTime.Now, ""); string strMeasureResult = aryLineContent[4].ToLower(); - if (strMeasureResult.Contains("good") || strMeasureResult.Contains("best")) + if (strMeasureResult.Contains("good") || strMeasureResult.Contains("best") || strMeasureResult.Contains("ng1")) { OKCount++; aryLineContent[4] = "OK"; } - else if (strMeasureResult.Contains("ng1") || strMeasureResult.Contains("ng2")) + else if ( strMeasureResult.Contains("ng2")) { OutCount++; aryLineContent[4] = "NG"; @@ -1472,14 +1474,14 @@ namespace NSAnalysis string strMeasureValue = tmdal.SelectOneMeasureValueByCondition(strVIN, strArrRangePoint[j].Substring(0, 4)); if (strMeasureValue.ToLower().Contains("inv")) { - strRangeValue = "inv"; + strRangeValue = ""; strRangeResult = "NG"; MyBase.TraceWriteLine(strArrRangePoint[j] + " G 查询的测量值为inv"); break; } else if (strMeasureValue.ToLower().Contains("nofind")) { - strRangeValue = "inv"; + strRangeValue = ""; strRangeResult = "NG"; MyBase.TraceWriteLine(strArrRangePoint[j] + " G 查询的测量值为no find"); break; @@ -1689,7 +1691,8 @@ namespace NSAnalysis if (aryLineContent[2].ToLower().Contains("inv")) { - aryLineContent[10] = "NG"; + aryLineContent[2] = ""; //当为inv ,内容为空 + aryLineContent[10] = "NG"; } string strMeasPointName = ""; if (aryLineContent[0].ToUpper().Contains("L"))