diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 81f6818..e448edf 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -1480,19 +1480,19 @@ namespace JinYuan.ControlCenters //m.CCD19 = m.CCD_Data[i, 18]; //m.CCD20 = m.CCD_Data[i, 19]; - m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 0 ? "NG" : "缺图"); - m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图"); - m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图"); - m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 0 ? "NG" : "缺图"); - m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 0 ? "NG" : "缺图"); - m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 0 ? "NG" : "缺图"); - m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 0 ? "NG" : "缺图"); - m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 0 ? "NG" : "缺图"); - m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 0 ? "NG" : "缺图"); - m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 0 ? "NG" : "缺图"); - m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 0 ? "NG" : "缺图"); - m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 0 ? "NG" : "缺图"); - m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 0 ? "NG" : "缺图"); + m.CCDResult1 = ConstValue.JudgeResult(m.CCD_Data[i, 0]); + m.CCDResult2 = ConstValue.JudgeResult(m.CCD_Data[i, 1]); + m.CCDResult3 = ConstValue.JudgeResult(m.CCD_Data[i, 2]); + m.CCDResult4 = ConstValue.JudgeResult(m.CCD_Data[i, 3]); + m.CCDResult5 = ConstValue.JudgeResult(m.CCD_Data[i, 4]); + m.CCDResult6 = ConstValue.JudgeResult(m.CCD_Data[i, 5]); + m.CCDResult7 = ConstValue.JudgeResult(m.CCD_Data[i, 6]); + m.CCDResult8 = ConstValue.JudgeResult(m.CCD_Data[i, 7]); + m.CCDResult9 = ConstValue.JudgeResult(m.CCD_Data[i, 8]); + m.CCDResult10 = ConstValue.JudgeResult(m.CCD_Data[i, 9]); + m.CCDResult11 = ConstValue.JudgeResult(m.CCD_Data[i, 10]); + m.CCDResult12 = ConstValue.JudgeResult(m.CCD_Data[i, 11]); + m.CCDResult13 = ConstValue.JudgeResult(m.CCD_Data[i, 12]); //m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图"); //m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图"); //m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图"); diff --git a/JinYuan.Models/ConstValue.cs b/JinYuan.Models/ConstValue.cs index ad2ad25..16770fd 100644 --- a/JinYuan.Models/ConstValue.cs +++ b/JinYuan.Models/ConstValue.cs @@ -48,7 +48,7 @@ namespace JinYuan.Models { resultStr = "OK"; } - else if (result == 0) + else if (result == 2) { resultStr = "NG"; } diff --git a/采集项目表.csv b/采集项目表.csv index aa0d81c..ca2882f 100644 --- a/采集项目表.csv +++ b/采集项目表.csv @@ -1,9 +1,9 @@ -APPEARANCE_STANDARD,appearance_standard,外观标准(设定值) +APPEARANCE_STANDARD,appearance_standard,外观标准(设定值) TOP_COVER_CODE_WGJC,BarCode,进站电芯条码 OUT_BATTERY_BARCODE,BarCode,出站电芯条码 BARCODE_MATCH_RESULT,barcode_match_result,进出站条码匹配结果 FLATNESS_WGJC02,CCD_FLATNESS,测厚(平面度) -FLATNESS_RESULTS_WGJC02,CCD_FLATNESS_RESULT,测厚(平面度)结果 +FLATNESS_RESULTS_WGJC02,CCDFLATNESSResult,测厚(平面度)结果 NEGATIVE_TERMINAL_NG_CODE,CCD16NgCode,负极柱检测NG代码 EXPLOSION_VALVE_NG_CODE,CCD17NgCode,防爆阀检测NG代码 QR_CODE_NG_CODE,CCD18NgCode,二维码检测NG代码