From 84305a1318c6778a8a4ce304578e7e5d3b478991 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-ED1D6QN>
Date: Fri, 21 Aug 2026 18:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=AB=99=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=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.MES/MesDataProcess.cs              |  2 +-
 JinYuan.Models/BGearEntity.cs              | 14 +++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs
index 24bbecd..80c203a 100644
--- a/JinYuan.ControlCenter/ControlCenter_Plc.cs
+++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs
@@ -1696,22 +1696,22 @@ namespace JinYuan.ControlCenters
 
                                 list[i].PlcResult = MyRes[i];
                                 #region 排出 5 厚度NG电芯 6 外观NG电芯，
-                                if (list[i].PlcResult != 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不良";
-                                    }
+                                //if (list[i].PlcResult != 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不良";
+                                //    }
 
-                                }
+                                //}
                                 
                                 #endregion
 
diff --git a/JinYuan.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs
index 795704d..300db17 100644
--- a/JinYuan.MES/MesDataProcess.cs
+++ b/JinYuan.MES/MesDataProcess.cs
@@ -1218,7 +1218,7 @@ namespace JinYuan.MES
             string strFileName = System.Environment.CurrentDirectory + "\\采集项目表.csv";
 
             FileStream fileStream = new FileStream(strFileName, FileMode.Open, FileAccess.Read, FileShare.Read);
-            StreamReader streamReader = new StreamReader(fileStream);
+            StreamReader streamReader = new StreamReader(fileStream, Encoding.UTF8);
             _ = streamReader.ReadLine();
             while (!streamReader.EndOfStream)
             {
diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs
index 80dcfa3..221d5cf 100644
--- a/JinYuan.Models/BGearEntity.cs
+++ b/JinYuan.Models/BGearEntity.cs
@@ -129,20 +129,20 @@ namespace JinYuan.Models
         /// 电芯1_厚度数据1
         /// </summary>
         //public float Thickness1 { get; set; }
-       // public float Thickness2 { get; set; }
-      //  public float Thickness3 { get; set; }
+        // public float Thickness2 { get; set; }
+        //  public float Thickness3 { get; set; }
         /// <summary>
         /// 电芯1_厚度 PLC判定 OKNG   1 OK，0 NG
         /// </summary>
-      //  public int ThicknessPLCResult1 { get; set; }
-      //  public int ThicknessPLCResult2 { get; set; }
-      //  public int ThicknessPLCResult3 { get; set; }
+        //  public int ThicknessPLCResult1 { get; set; }
+        //  public int ThicknessPLCResult2 { get; set; }
+        //  public int ThicknessPLCResult3 { get; set; }
         /// <summary>
         /// 电芯1_厚度OKNG 显示OK NG
         /// </summary>
         //public string ThicknessResult1 { get; set; }
-      //  public string ThicknessResult2 { get; set; }
-      //  public string ThicknessResult3 { get; set; }
+        //  public string ThicknessResult2 { get; set; }
+        //  public string ThicknessResult3 { get; set; }
         /// <summary>
         /// 平面度设定值
         /// </summary>