From 3c7befe255dc02593018ddc7c02b00b4519629b3 Mon Sep 17 00:00:00 2001
From: ldw <11622064+ldw888@user.noreply.gitee.com>
Date: Fri, 25 Jul 2025 10:24:41 +0800
Subject: [PATCH] =?UTF-8?q?1257=20=E9=9B=86=E4=B8=AD=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=80=BB=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JinYuan.ControlCenter/ControlCenter_Total.cs | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/JinYuan.ControlCenter/ControlCenter_Total.cs b/JinYuan.ControlCenter/ControlCenter_Total.cs
index bb24ba3..21d5248 100644
--- a/JinYuan.ControlCenter/ControlCenter_Total.cs
+++ b/JinYuan.ControlCenter/ControlCenter_Total.cs
@@ -196,10 +196,9 @@ namespace JinYuan.ControlCenters
                     //CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "铜极耳剪切不良", DataCount = 0 });
                     //CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "铝极耳剪切不良", DataCount = 0 });
                     
-                        CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "CCD1-9", DataCount = 0 });
-                    CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "CCD10-14" , DataCount = 0 });
-                    CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "CCD15-21" , DataCount = 0 });
-                    CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "CCD22-27", DataCount = 0 });
+                        CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "扫码不良", DataCount = 0 });
+                    CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "MES不良", DataCount = 0 });
+                    CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "其他不良" , DataCount = 0 });
 
                 }
                 else //读取PLC数据
@@ -210,10 +209,9 @@ namespace JinYuan.ControlCenters
                         {
                             try
                             {
-                                int ProdDRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D1000");//极性检测不良
-                                int ProdDXNgQty = CommonMethods.PlcLink.ReadInt16("D1002");//称重不良
-                                int ProdGRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D1006");//铜极耳剪切不良
-                                int ProdYLZNgQty = CommonMethods.PlcLink.ReadInt16("D1004");//铝极耳剪切不良
+                                int ProdDRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D1000");//扫码不良
+                                int ProdDXNgQty = CommonMethods.PlcLink.ReadInt16("D1001");//MES不良
+                                int ProdGRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D1002");//其他不良
 
                                 ////從PLC讀取數據賦值給到NGList
                                 //CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "极性检测不良").FirstOrDefault().DataCount = ProdDRFIDNgQty;
@@ -221,10 +219,9 @@ namespace JinYuan.ControlCenters
                                 //CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "铜极耳剪切不良").FirstOrDefault().DataCount = ProdGRFIDNgQty;
                                 //CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "铝极耳剪切不良").FirstOrDefault().DataCount = ProdYLZNgQty;
                                 //從PLC讀取數據賦值給到NGList
-                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "CCD1-9").FirstOrDefault().DataCount = ProdDRFIDNgQty;
-                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "CCD10-14").FirstOrDefault().DataCount = ProdDXNgQty;
-                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "CCD15-21").FirstOrDefault().DataCount = ProdGRFIDNgQty;
-                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "CCD22-27").FirstOrDefault().DataCount = ProdYLZNgQty;
+                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "扫码不良").FirstOrDefault().DataCount = ProdDRFIDNgQty;
+                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "MES不良").FirstOrDefault().DataCount = ProdDXNgQty;
+                                CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "其他不良").FirstOrDefault().DataCount = ProdGRFIDNgQty;
                             }
                             catch (Exception ex)
                             {