diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs
index 80c203a..d883884 100644
--- a/JinYuan.ControlCenter/ControlCenter_Plc.cs
+++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs
@@ -1372,9 +1372,9 @@ namespace JinYuan.ControlCenters
m.CCD_FLATNESS = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB);
short fatResult = ShortLib.GetShortFromByteArray(bArrays.Content, 600 + i * 30 * 2, DataFormat.CDAB);
- m.CCD_FLATNESS_Result = ConstValue.JudgeResult(fatResult);
+ m.CCDFLATNESSResult = ConstValue.JudgeResult(fatResult);
#region 注释掉的采集数据 by clm 20260812
- //3400
+ ////3400
//m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB);
//m.ThicknessResult1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
////3500
@@ -1501,6 +1501,20 @@ namespace JinYuan.ControlCenters
//m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图");
//m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图");
+ string[] ccdArr = new string[] {
+ m.CCDResult1, m.CCDResult2, m.CCDResult3, m.CCDResult4, m.CCDResult5, m.CCDResult6, m.CCDResult7, m.CCDResult8, m.CCDResult9,
+ m.CCDResult10, m.CCDResult11, m.CCDResult11, m.CCDResult12, m.CCDResult13, m.CCDFLATNESSResult
+ };
+ int okCount = ccdArr.Count(it => it.Equals("OK"));
+ if (okCount == ccdArr.Length)
+ {
+ m.IsAllCcdOK = "OK";
+ }
+ else
+ {
+ m.IsAllCcdOK = "NG";
+ }
+
#region 注释代码
//m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图");
//m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 0 ? "NG" : "缺图");
@@ -1574,7 +1588,7 @@ namespace JinYuan.ControlCenters
MyRes[i] = 2;//扫码NG
var judementResult = JudgmentWGJResult(1, m.CCD_Data, i);
- if (m.CCD_FLATNESS_Result != "OK")
+ if (m.CCDFLATNESSResult != "OK")
{
//1OK,2扫码NG,3MES反馈NG,4其他NG
judementResult.Item1 = 4;
diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs
index 221d5cf..ae80b24 100644
--- a/JinYuan.Models/BGearEntity.cs
+++ b/JinYuan.Models/BGearEntity.cs
@@ -91,7 +91,7 @@ namespace JinYuan.Models
///
/// 测厚(平面度)结果
///
- public string CCD_FLATNESS_Result { get; set; }
+ public string CCDFLATNESSResult { get; set; }
#endregion
public string CCD1NgCode { get; set; }
@@ -260,5 +260,10 @@ namespace JinYuan.Models
///
public int Flag1 { get; set; }
+ ///
+ /// 所有CCD采集项综合结果(OK/NG)
+ ///
+ [SugarColumn(IsIgnore = true)]
+ public string IsAllCcdOK { get; set; } = "NG";
}
}
diff --git a/JinYuan.Models/ConstValue.cs b/JinYuan.Models/ConstValue.cs
index 94865c8..ad2ad25 100644
--- a/JinYuan.Models/ConstValue.cs
+++ b/JinYuan.Models/ConstValue.cs
@@ -37,7 +37,7 @@ namespace JinYuan.Models
///
public static Dictionary CCDSpecialDic = new Dictionary {
{ "CCD_FLATNESS", "测厚(平面度)" },
- { "CCD_FLATNESS_RESULT", "测厚(平面度)结果" }
+ { "CCDFLATNESSResult", "测厚(平面度)结果" }
};
public static string JudgeResult(int result)
diff --git a/数据库/20260813.sql b/数据库/20260813.sql
index 270938b..b4d0a99 100644
--- a/数据库/20260813.sql
+++ b/数据库/20260813.sql
@@ -1,2 +1,2 @@
ALTER TABLE LargeSquareOne604.dbo.BGearEntity ADD CCD_FLATNESS nvarchar(255) NULL;
-ALTER TABLE LargeSquareOne604.dbo.BGearEntity ADD CCD_FLATNESS_Result nvarchar(50) NULL;
+ALTER TABLE LargeSquareOne604.dbo.BGearEntity ADD CCDFLATNESSResult nvarchar(50) NULL;