From 622a00054ba078a2444db7bace7374fd578b301c Mon Sep 17 00:00:00 2001
From: ldw <11622064+ldw888@user.noreply.gitee.com>
Date: Thu, 25 Sep 2025 14:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=AB=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JinYuan.ControlCenter/ControlCenter_Plc.cs | 30 ++++++++++------------
 JinYuan.Models/BGearEntity.cs              | 18 +++----------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs
index 3ea2018..ef047aa 100644
--- a/JinYuan.ControlCenter/ControlCenter_Plc.cs
+++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs
@@ -2078,26 +2078,24 @@ namespace JinYuan.ControlCenters
                                 //发送产品结果参数给MES
                                 bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage);
                                 list[i].PlcResult = MyRes[i];
-                                #region 排出 3 外观NG电芯，4 厚度NG电芯
-                                for (int i = 0; i < list.Count; i++)
+                                #region 排出 5 厚度NG电芯 6 外观NG电芯，
+                                if (list[i].PlcResult != 1)
                                 {
-                                    if (list[i].PlcResult != 1)
+                                    //厚度不良分档  5 测厚不良 6 外观不良
+                                    if (list[i].CCD19 != 1)
                                     {
-                                        //厚度不良分档  5 测厚不良 6 外观不良
-                                        if (list[i].CCD19 != 1)
-                                        {
-                                            m.Result = MyRes[i] = 5;
-                                            list[i].Remark += $",测厚度NG";
-                                        }
-                                        else
-                                        {
-                                            //外观不良分档
-                                            m.Result = MyRes[i] = 6;
-                                            list[i].Remark += $",外观检NG不良";
-                                        }
-
+                                        m.Result = MyRes[i] = 5;
+                                        list[i].Remark += $",测厚度NG";
                                     }
+                                    else
+                                    {
+                                        //外观不良分档
+                                        m.Result = MyRes[i] = 6;
+                                        list[i].Remark += $",外观检NG不良";
+                                    }
+
                                 }
+                                
                                 #endregion
 
                                 if (m.Flag == 1)
diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs
index 53cbd06..75962a8 100644
--- a/JinYuan.Models/BGearEntity.cs
+++ b/JinYuan.Models/BGearEntity.cs
@@ -38,6 +38,8 @@ namespace JinYuan.Models
         /// 上传状态
         /// </summary>
         public string UpState { get; set; }
+        public string RFID { get; set; }
+        public string ScanBarRes { get; set; }
         /// <summary>
         /// 反馈结果
         /// </summary>
@@ -69,13 +71,7 @@ namespace JinYuan.Models
         public int CCD18 { get; set; }
         public int CCD19 { get; set; }
         public int CCD20 { get; set; }
-        public int CCD21 { get; set; }
-        public int CCD22 { get; set; }
-        public int CCD23 { get; set; }
-        public int CCD24 { get; set; }
-        public int CCD25 { get; set; }
-        public int CCD26 { get; set; }
-        public int CCD27 { get; set; }
+      
         /// <summary>
         /// 电芯1_厚度数据1
         /// </summary>
@@ -125,13 +121,7 @@ namespace JinYuan.Models
         public string CCDResult18 { get; set; }
         public string CCDResult19 { get; set; }
         public string CCDResult20 { get; set; }
-        public string CCDResult21 { get; set; }
-        public string CCDResult22 { get; set; }
-        public string CCDResult23 { get; set; }
-        public string CCDResult24 { get; set; }
-        public string CCDResult25 { get; set; }
-        public string CCDResult26 { get; set; }
-        public string CCDResult27 { get; set; }
+     
 
         /// <summary>
         /// 芯包条码