15项采集项

JinYuan.Models/BGearEntity.cs

@@ -82,6 +82,18 @@ namespace JinYuan.Models
         //public int CCD27 { get; set; }
         #endregion
 
+        #region CCD的单独地址
+        /// <summary>
+        /// 测厚(平面度)
+        /// </summary>
+        public float CCD_FLATNESS { get; set; }
+
+        /// <summary>
+        /// 测厚(平面度)结果
+        /// </summary>
+        public string CCD_FLATNESS_Result { get; set; }
+        #endregion
+
         public string CCD1NgCode { get; set; }
         public string CCD2NgCode { get; set; }
         public string CCD3NgCode { get; set; }

JinYuan.Models/ConstValue.cs

@@ -11,32 +11,53 @@ namespace JinYuan.Models
         /// <summary>
         /// CCD采集项数
         /// </summary>
-        public const int COUNT_CCD = 20;
+        public const int COUNT_CCD = 13;
 
         /// <summary>
         /// CCD采集项名称列表
         /// </summary>
-        public static string[] CCDNameArr = new string[20] {
-            "正面(2D/3D)",
-            "反面(2D/3D)",
-            "左侧面(2D/3D)",
-            "右侧面(2D/3D)",
-            "顶面(2D/3D)",
-            "底面(2D/3D)",
-            "底DE1",
-            "底DE2",
-            "底DE3",
-            "底DE4",
-            "中ME1",
-            "中ME2",
-            "中ME3",
-            "中ME4",
-            "正极柱(POS)",
-            "负极柱(NEG)",
-            "防爆阀(PRO)",
-            "二维码检测结果",
-            "厚度结果",
-            "平面度结果"
+        public static string[] CCDNameArr = new string[COUNT_CCD] {
+            "大面A",
+            "底部棱边1",
+            "四个侧棱边",
+            "电芯二侧面",
+            "大面B",
+            "防爆阀",
+            "二维码",
+            "二个底部长棱",
+            "底部棱边2",
+            "正负极极柱-1",
+            "正负极极柱-2",
+            "正负塑胶圈",
+            "顶底部检测"
         };
+
+        /// <summary>
+        /// CCD采集项(单独地址)列表
+        /// </summary>
+        public static Dictionary<string, string> CCDSpecialDic = new Dictionary<string, string> {
+            { "CCD_FLATNESS", "测厚(平面度)" },
+            { "CCD_FLATNESS_RESULT", "测厚(平面度)结果" }
+        };
+
+        public static string JudgeResult(int result)
+        {
+            string resultStr = string.Empty;
+
+            if (result == 1)
+            {
+                resultStr = "OK";
+            }
+            else if (result == 0)
+            {
+                resultStr = "NG";
+            }
+            else
+            {
+                resultStr = "缺图";
+            }
+
+            return resultStr;
+        }
     }
 }