清理无用代码

JinYuan.ControlCenter/ControlCenter.cs

@@ -1,9 +1,7 @@
 
 using JinYuan.CommunicationLib.Enum;
-using JinYuan.CommunicationLib.Helper;
 using JinYuan.DataConvertLib;
 using JinYuan.Helper;
-using JinYuan.MES.Enums;
 using JinYuan.MES.Models;
 using JinYuan.Models;
 using JinYuan.VirtualDataLibrary;
@@ -11,20 +9,14 @@ using Newtonsoft.Json;
 using PLCCommunication;
 using SqlSugar;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Data.SqlTypes;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Net.NetworkInformation;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
 
 
 namespace JinYuan.ControlCenters

JinYuan.ControlCenter/ControlCenter_Plc.cs

@@ -3,23 +3,14 @@ using JinYuan.CommunicationLib.Enum;
 using JinYuan.DataConvertLib;
 using JinYuan.Helper;
 using JinYuan.MES.Enums;
-using JinYuan.MES.Models;
 using JinYuan.Models;
 using JinYuan.VirtualDataLibrary;
 using PLCCommunication;
-using SqlSugar;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Data;
 using System.Diagnostics;
-using System.Diagnostics.Eventing.Reader;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
 
 namespace JinYuan.ControlCenters
 {
@@ -157,37 +148,112 @@ namespace JinYuan.ControlCenters
         //    return Result;
         //}
         /// <summary>
-        /// 判断总结果 Code_NG
+        /// 判断总结果
         /// </summary>
-        private int JudgmentResult(int Code_NG, int[,] CCD_Data,int codeIndex)
+        private int JudgmentResult(int A, int B, int C, int D, int E, int F, int G, int H, int I, int J, int K, int L, int M, int N)
         {
+            //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包铜焊印位置，
+            //芯包正面极耳撕裂H，芯包背面极耳撕裂，芯包正面极耳翻折J，芯包背面极耳翻折,测厚压力结果,
+            //焊前CCD检测结果,铝焊印位置判定结果
+
+            //目前先判断条码，芯包重量，芯包侧厚，芯包CCD极性检测，芯包正面极耳撕裂，芯包正面极耳翻折
             int Result = 0;
             OK_NG = "OK";
-            //是否有条码NG 1 = OK  2 = NG
+            if (A == 2 || B == 2 || C == 2 || D == 2 || H == 2 || J == 2)
-            if (Code_NG == 2)
             {
-                NG_Type += "无条码_";
+                //ed
-                OK_NG = "NG";
                 Result = 2;
-            }
-            //CCD 判定
-            for (int i = 0; i < 27; i++)
-            {
-                //CCD  0 = OK  1 = NG  2 缺图NG
-                if (CCD_Data[codeIndex, i] == 1)
-                {
-                    NG_Type += $"CCD{i}NG_";
                 OK_NG = "NG";
-                    Result = 2;
             }
-                if (CCD_Data[codeIndex, i] == 2)
+            else if (A == 1 && B == 1 && C == 1 && D == 1 && H == 1 && J == 1)
             {
-                    NG_Type += $"CCD{i}缺图NG_";
+                Result = 1;
-                    OK_NG = "NG";
+                OK_NG = "OK";
-                    Result = 2;
             }
+            else
+            {
+                Result = 1;
+                OK_NG = "OK";
             }
 
+            if (A == 2)
+            {
+                NG_Type += "无条码_";
+                Result = 2;
+            }
+            if (B == 2)
+            {
+                NG_Type += "芯包重量1NG_";
+                //return 2;
+                Result = 2;
+            }
+            if (C == 2)
+            {
+                NG_Type += "芯包侧厚NG_";
+                //return 2;
+                Result = 2;
+            }
+            if (D == 2)
+            {
+                NG_Type += "芯包CCD极性检测NG_";
+                //return 2;
+                Result = 2;
+            }
+
+            //if (E == 2)
+            //{
+            //    NG_Type += "电芯裁切粘连NG_";
+            //    //return 2;
+            //}
+            //if (F == 2)
+            //{ 
+            //    NG_Type += "电芯裁切毛刺NG_";
+            //    //return 2;
+            //}
+            //if (G == 2)
+            //{
+            //    NG_Type += "芯包铜焊印位置判定NG_";
+            //    //return 2;
+            //}
+            if (H == 2)
+            {
+                NG_Type += "芯包正面极耳撕裂NG_";
+                //return 2;
+            }
+            //if (I == 2)
+            //{
+            //    NG_Type += "芯包背面极耳撕裂NG_";
+            //    //return 2;
+            //}
+            if (J == 2)
+            {
+                NG_Type += "芯包正面极耳翻折NG_";
+                //return 2;
+            }
+            //if (K == 2)
+            //{
+            //    NG_Type += "芯包背面极耳翻折NG_";
+            //    //return 2;
+            //}
+            if (L == 2)
+            {
+                NG_Type += "测厚压力NG_";
+                //return 2;
+            }
+            if (M == 2)
+            {
+                NG_Type += "焊前CCD检测NG_";
+                //return 2;
+            }
+            if (N == 2)
+            {
+                NG_Type += "铝焊印位置判定NG_";
+                //return 2;
+            }
+            if (Result == 1)
+            {
+                NG_Type += "OK_";
+            }
             return Result;
         }
         #region 上料工位(数据处理)
@@ -1674,22 +1740,17 @@ namespace JinYuan.ControlCenters
                         AGearEntity TT = new AGearEntity();
                         //极限件标志
                         int ChallengeFlag = 0;
-                        //芯包信息1  D3300~D3327
+                        //芯包信息1  D3300~D3326
-                        //芯包信息2  D3330~D3357
+                        //芯包信息2  D3330~D3356
-                        //芯包信息3  D3360~D3387
+                        //芯包信息3  D3360~D3386
-                        for (int j = 0; j < 28; j++)
+                        for (int j = 0; j < 27; j++)
                         {
                             m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
                         }
-                        //电芯1缺陷代码 D3400~D3427
+                        for (int j = 0; j < 3; j++)
-                        //电芯2缺陷代码 D3430~D3457
-                        //电芯3缺陷代码 D3460~D3487
-                        for (int j = 0; j < 28; j++)
                         {
-                            m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+                            m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB);
                         }
-                        //电池厚度 D3500  D3502 D3504
-                        m.Thickness_Data[i] = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 4, DataFormat.CDAB);
 
                         //芯包扫码时间
                         //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");                       
@@ -1740,40 +1801,38 @@ namespace JinYuan.ControlCenters
 
                         //不良代码判定
                         List<string> NGcodeList = new List<string>();
-                        NGcodeList = NGWGcode(m.list_Data1,i);
+                        NGcodeList = NGcode(m.list_Data1[i, 10], m.list_Data1[i, 11], m.list_Data1[i, 12], m.list_Data1[i, 15], m.list_Data1[i, 26], m.list_Data1[i, 16]
-                            //         NGcode(m.list_Data1[i, 10], m.list_Data1[i, 11], m.list_Data1[i, 12], m.list_Data1[i, 15], m.list_Data1[i, 26], m.list_Data1[i, 16]
+                            , m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], m.list_Data1[i, 23], m.list_Data1[i, 24], m.list_Data1[i, 25], m.list_Data1[i, 27]);
-                            //, m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], m.list_Data1[i, 23], m.list_Data1[i, 24], m.list_Data1[i, 25], m.list_Data1[i, 27]);
 
                         //电芯CCD判定结果
                         #region //电芯CCD判定结果
-                        m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 0 ? "NG" : "缺图");
+                        m.CCDResult1 = m.CCD_Data[i, 0] == 0 ? "OK" : (m.CCD_Data[i, 0] == 1 ? "NG" : "缺图");
-                        m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图");
+                        m.CCDResult2 = m.CCD_Data[i, 1] == 0 ? "OK" : (m.CCD_Data[i, 1] == 1 ? "NG" : "缺图");
-                        m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图");
+                        m.CCDResult3 = m.CCD_Data[i, 2] == 0 ? "OK" : (m.CCD_Data[i, 2] == 1 ? "NG" : "缺图");
-                        m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 0 ? "NG" : "缺图");
+                        m.CCDResult4 = m.CCD_Data[i, 3] == 0 ? "OK" : (m.CCD_Data[i, 3] == 1 ? "NG" : "缺图");
-                        m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 0 ? "NG" : "缺图");
+                        m.CCDResult5 = m.CCD_Data[i, 4] == 0 ? "OK" : (m.CCD_Data[i, 4] == 1 ? "NG" : "缺图");
-                        m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 0 ? "NG" : "缺图");
+                        m.CCDResult6 = m.CCD_Data[i, 5] == 0 ? "OK" : (m.CCD_Data[i, 5] == 1 ? "NG" : "缺图");
-                        m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 0 ? "NG" : "缺图");
+                        m.CCDResult7 = m.CCD_Data[i, 6] == 0 ? "OK" : (m.CCD_Data[i, 6] == 1 ? "NG" : "缺图");
-                        m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 0 ? "NG" : "缺图");
+                        m.CCDResult8 = m.CCD_Data[i, 7] == 0 ? "OK" : (m.CCD_Data[i, 7] == 1 ? "NG" : "缺图");
-                        m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 0 ? "NG" : "缺图");
+                        m.CCDResult9 = m.CCD_Data[i, 8] == 0 ? "OK" : (m.CCD_Data[i, 8] == 1 ? "NG" : "缺图");
-                        m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 0 ? "NG" : "缺图");
+                        m.CCDResult10 = m.CCD_Data[i, 9] == 0 ? "OK" : (m.CCD_Data[i, 9] == 1 ? "NG" : "缺图");
-                        m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 0 ? "NG" : "缺图");
+                        m.CCDResult11 = m.CCD_Data[i, 10] == 0 ? "OK" : (m.CCD_Data[i, 10] == 1 ? "NG" : "缺图");
-                        m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 0 ? "NG" : "缺图");
+                        m.CCDResult12 = m.CCD_Data[i, 11] == 0 ? "OK" : (m.CCD_Data[i, 11] == 1 ? "NG" : "缺图");
-                        m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 0 ? "NG" : "缺图");
+                        m.CCDResult13 = m.CCD_Data[i, 12] == 0 ? "OK" : (m.CCD_Data[i, 12] == 1 ? "NG" : "缺图");
-                        m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图");
+                        m.CCDResult14 = m.CCD_Data[i, 13] == 0 ? "OK" : (m.CCD_Data[i, 13] == 1 ? "NG" : "缺图");
-                        m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图");
+                        m.CCDResult15 = m.CCD_Data[i, 14] == 0 ? "OK" : (m.CCD_Data[i, 14] == 1 ? "NG" : "缺图");
-                        m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图");
+                        m.CCDResult16 = m.CCD_Data[i, 15] == 0 ? "OK" : (m.CCD_Data[i, 15] == 1 ? "NG" : "缺图");
-                        m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 0 ? "NG" : "缺图");
+                        m.CCDResult17 = m.CCD_Data[i, 16] == 0 ? "OK" : (m.CCD_Data[i, 16] == 1 ? "NG" : "缺图");
-                        m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 0 ? "NG" : "缺图");
+                        m.CCDResult18 = m.CCD_Data[i, 17] == 0 ? "OK" : (m.CCD_Data[i, 17] == 1 ? "NG" : "缺图");
-                        m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图");
+                        m.CCDResult19 = m.CCD_Data[i, 18] == 0 ? "OK" : (m.CCD_Data[i, 18] == 1 ? "NG" : "缺图");
-                        m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图");
+                        m.CCDResult20 = m.CCD_Data[i, 19] == 0 ? "OK" : (m.CCD_Data[i, 19] == 1 ? "NG" : "缺图");
-                        m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图");
+                        m.CCDResult21 = m.CCD_Data[i, 20] == 0 ? "OK" : (m.CCD_Data[i, 20] == 1 ? "NG" : "缺图");
-                        m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 0 ? "NG" : "缺图");
+                        m.CCDResult22 = m.CCD_Data[i, 21] == 0 ? "OK" : (m.CCD_Data[i, 21] == 1 ? "NG" : "缺图");
-                        m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 0 ? "NG" : "缺图");
+                        m.CCDResult23 = m.CCD_Data[i, 22] == 0 ? "OK" : (m.CCD_Data[i, 22] == 1 ? "NG" : "缺图");
-                        m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 0 ? "NG" : "缺图");
+                        m.CCDResult24 = m.CCD_Data[i, 23] == 0 ? "OK" : (m.CCD_Data[i, 23] == 1 ? "NG" : "缺图");
-                        m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 0 ? "NG" : "缺图");
+                        m.CCDResult25 = m.CCD_Data[i, 24] == 0 ? "OK" : (m.CCD_Data[i, 24] == 1 ? "NG" : "缺图");
-                        m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 0 ? "NG" : "缺图");
+                        m.CCDResult26 = m.CCD_Data[i, 25] == 0 ? "OK" : (m.CCD_Data[i, 25] == 1 ? "NG" : "缺图");
-                        m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 0 ? "NG" : "缺图");
+                        m.CCDResult27 = m.CCD_Data[i, 26] == 0 ? "OK" : (m.CCD_Data[i, 26] == 1 ? "NG" : "缺图");
-                        m.CCDResult28 = m.CCD_Data[i, 27] == 1 ? "OK" : (m.CCD_Data[i, 27] == 0 ? "NG" : "缺图");
                         #endregion
 
                         m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1782,14 +1841,27 @@ namespace JinYuan.ControlCenters
                         m.CSBYHINSTATIONTIME = m.ScanTime[0];
                         m.CSBYHOUTSTATIONTIME = m.ScanTime[1];
 
-                        //电芯1厚度数据1,2,3  改为 电芯1厚度 ；3字段只需1字段
+                        m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]);
-                        m.Thickness1 = SaveTwoNum(m.Thickness_Data[i]);
+                        m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]);
-                        m.Thickness2 = SaveTwoNum(m.Thickness_Data[i]);
+                        m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]);
-                        m.Thickness3 = SaveTwoNum(m.Thickness_Data[i]);
 
+                        //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置，
+                        //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折
+                        if (Code_NG == 1)
+                        {
+                            for (int ii = 0; ii < 27; ii++)
+                            {
+                                if (m.CCD_Data[i, ii] != 0)
+                                {
+                                    MyRes[i] = m.CCD_Data[i, ii];
+                                    break;
+                                }
 
-                        //芯包OKNG结果值判定                       
+                            }
-                        MyRes[i] = JudgmentResult(Code_NG, m.CCD_Data,i);
+                        }
+                        else
+                            MyRes[i] = 1;
+                        //MyRes[i] = JudgmentResult(Code_NG, m.CCD_Data);
 
                         m.Result = MyRes[i];
 
@@ -1841,7 +1913,12 @@ namespace JinYuan.ControlCenters
                                 {
                                     //MES出站判定结果
                                     m.Result = MyRes[i];
-                                  
+                                    ////芯包重量1判定结果
+                                    //if (m.list_Data1[i, 10] == 2) { m.Remark += "芯包重量NG,"; }
+                                    ////芯包侧厚判定结果
+                                    //if (m.list_Data1[i, 11] == 2) { m.Remark += "芯包侧厚NG,"; }
+                                    ////芯包CCD极性检测结果
+                                    //if (m.list_Data1[i, 12] == 2) { m.Remark += "芯包CCD极性检测NG,"; }
                                     m.Remark += MesMessage;
                                 }
                                 else
@@ -1867,7 +1944,12 @@ namespace JinYuan.ControlCenters
                                             m.Result = MyRes[i] = 2;
                                             break;
                                     }
-                                
+                                    ////芯包重量1判定结果
+                                    //if (m.list_Data1[i, 10] == 2) { m.Remark += "芯包重量NG,"; }
+                                    ////芯包侧厚判定结果
+                                    //if (m.list_Data1[i, 11] == 2) { m.Remark += "芯包侧厚NG,"; }
+                                    ////芯包CCD极性检测结果
+                                    //if (m.list_Data1[i, 12] == 2) { m.Remark += "芯包CCD极性检测NG,"; }
                                     m.Remark += MesMessage;
                                 }
                                 //发送产品结果参数给MES
@@ -1896,6 +1978,12 @@ namespace JinYuan.ControlCenters
                         {
                             m.Result = MyRes[i] = 2;
                             m.Remark += "本地存储";
+                            //芯包重量1判定结果
+                            if (m.list_Data1[i, 10] == 2) { m.Remark += ",芯包重量NG"; }
+                            //芯包侧厚判定结果
+                            if (m.list_Data1[i, 11] == 2) { m.Remark += ",芯包侧厚NG"; }
+                            //芯包CCD极性检测结果
+                            if (m.list_Data1[i, 12] == 2) { m.Remark += ",芯包CCD极性检测NG"; }
                             m.UpState = "未上传";
                         }
                         //极限件发3给PLC
@@ -2124,28 +2212,6 @@ namespace JinYuan.ControlCenters
 
             return NGcodelist;
         }
-        /// <summary>
-        /// 下料外观检不良代码
-        /// </summary>      
-        /// <returns></returns>
-        public List<string> NGWGcode(short[,] serialNum,int index)
-        {
-            
-            List<string> NGcodelist = new List<string>();
-            var ngType = "A";
-            for (int i = 0; i < 28; i++)
-            {
-                if (serialNum[index,i] == 4 || serialNum[index,i] == 150 || serialNum[index, i] == 151)
-                    ngType = "P";
-                if (serialNum[index, i] > 0)
-                {
-                    var strserialNum = serialNum[index, i].ToString().PadLeft(3, '0');
-                    NGcodelist.Add($"PFV{ngType}{strserialNum}");
-                }
-            }
-
-            return NGcodelist;
-        }
         #endregion
 
         #region NG下料不良代码

JinYuan.ControlCenter/ControlCenter_Total.cs

@@ -1,19 +1,15 @@
-using JinYuan.CommunicationLib.Enum;
+using HslCommunication.ModBus;
+using JinYuan.CommunicationLib.Enum;
 using JinYuan.DataConvertLib;
 using JinYuan.Helper;
-using JinYuan.MES.Enums;
 using JinYuan.MES.Models;
 using JinYuan.Models;
 using JinYuan.VirtualDataLibrary;
 using PLCCommunication;
-using PLCCommunication.Language;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
-using HslCommunication.ModBus;
 
 namespace JinYuan.ControlCenters
 {

JinYuan.ControlCenter/MES/MESDataCombin.cs

@@ -1,15 +1,12 @@
-using JinYuan.VirtualDataLibrary;
+using JinYuan.Helper;
+using JinYuan.MES;
+using JinYuan.MES.Models;
+using JinYuan.Models;
+using JinYuan.VirtualDataLibrary;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using JinYuan.Helper;
-using JinYuan.MES;
-using JinYuan.MES.Models;
-using JinYuan.MES.Enums;
-using JinYuan.Models;
-using SqlSugar;
 
 namespace JinYuan.ControlCenters
 {

JinYuan.ControlCenter/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

JinYuan.DAL/Enums/Enums.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.DAL.Enums
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.DAL.Enums
 {
     /// <summary>
     /// 查询条件枚举

JinYuan.DAL/ISugarHepler.cs

@@ -3,9 +3,7 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace JinYuan.DAL

JinYuan.DAL/Models/OrderSortEntity.cs

@@ -1,9 +1,4 @@
 using JinYuan.DAL.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.DAL.Models
 {

JinYuan.DAL/Models/QueryCondition.cs

@@ -1,9 +1,4 @@
 using JinYuan.DAL.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.DAL.Models
 {

JinYuan.DAL/Models/QueryDescriptor.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.DAL.Models
 {

JinYuan.DAL/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

JinYuan.DAL/SQLSugarHelper.cs

@@ -3,11 +3,7 @@ using JinYuan.Helper;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.DAL
 {

JinYuan.DAL/SQLSugarService.cs

@@ -1,8 +1,5 @@
-using JinYuan.DAL;
+using JinYuan.DAL.Enums;
-using JinYuan.DAL.Enums;
 using JinYuan.DAL.Models;
-using NLog;
-using Org.BouncyCastle.Asn1;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -10,8 +7,6 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Runtime.Remoting.Contexts;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace JinYuan.DAL

JinYuan.Helper/ArrayHelper.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/CSVHelper.cs

@@ -6,7 +6,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/ChartHelper.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Text;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms.DataVisualization.Charting;
 
 namespace JinYuan.Helper

JinYuan.Helper/ConvertHelper.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/DataGridViewHelper.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace JinYuan.Helper

JinYuan.Helper/DataTableExtend.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/DeleteLog.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

JinYuan.Helper/ExcelHelper.cs

@@ -1,4 +1,9 @@
-using System;
+using NPOI.HSSF.UserModel;
+using NPOI.SS.Formula.Eval;
+using NPOI.SS.UserModel;
+using NPOI.SS.Util;
+using NPOI.XSSF.UserModel;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
@@ -8,11 +13,6 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using NPOI.SS.UserModel;
-using NPOI.HSSF.UserModel;
-using NPOI.SS.Formula.Eval;
-using NPOI.SS.Util;
-using NPOI.XSSF.UserModel;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/FileHelper.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
-using System.Text;
+using System.Runtime.Serialization.Formatters.Binary;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/IniConfigHelper.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/IniFileHelper.cs

@@ -1,10 +1,6 @@
-using System;
+using System.IO;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace JinYuan.Helper

JinYuan.Helper/JsonHelper.cs

@@ -1,11 +1,8 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization.Json;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/LoggerHelp.cs

@@ -1,7 +1,5 @@
 using NLog;
 using System;
-using System.IO;
-using System.Linq;
 
 public class LoggerHelp
 {

JinYuan.Helper/PLCAlarmParseHelper.cs

@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

JinYuan.Helper/ScanerHook.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/SendDateMQTT.cs

@@ -1,15 +1,11 @@
-using HslCommunication.MQTT;
+using HslCommunication;
-using HslCommunication;
+using HslCommunication.MQTT;
+using JinYuan.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
 using System.IO;
-using System.Threading.Tasks;
+using System.Text;
-using System.Security.Policy;
-using JinYuan.Models;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/StreamIOHelper.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/StringSecurityHelper.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/TimerReset.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/TxtHelper.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace JinYuan.Helper
 {

JinYuan.Helper/XmlHelper.cs

@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Serialization;
-using System.Xml;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Xml.Serialization;
 
 namespace JinYuan.Helper
 {

JinYuan.MES/Enums/MesResType.cs

@@ -1,9 +1,4 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Enums
 {

JinYuan.MES/Enums/MesUploadType.cs

@@ -1,9 +1,4 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Enums
 {

JinYuan.MES/IMes.cs

@@ -1,11 +1,7 @@
 using JinYuan.MES.Enums;
 using JinYuan.MES.Models;
 using JinYuan.Models;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES
 {

JinYuan.MES/MESApiHelper.cs

@@ -1,13 +1,10 @@
-using Newtonsoft.Json;
+using JinYuan.MES.Models;
+using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http.Headers;
-using System.Net.Http;
 using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
-using System.Threading.Tasks;
-using JinYuan.MES.Models;
 
 namespace JinYuan.MES
 {

JinYuan.MES/MesDataProcess.cs

@@ -7,11 +7,6 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Reflection.Emit;
-using System.Runtime.Remoting.Messaging;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES
 {

JinYuan.MES/Models/EqpStatusParam.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/LoginEnyity.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.MES.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.MES.Models
 {
     /// <summary>
     /// 登录

JinYuan.MES/Models/ManyCellInStation.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/ManyCellOutStation.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/MesResponse.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/ParamChange.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/ParamReturnData.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/ProductProcessParam.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.MES.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.MES.Models
 {
     /// <summary>
     /// 产品过程加工参数

JinYuan.MES/Models/ProductResultParameters.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/SingleCellInStation.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.MES.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.MES.Models
 {
     /// <summary>
     /// 单个电池进站

JinYuan.MES/Models/SingleCellOutStation.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/UploadAlarmParam.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/UploadDeviceCollectData.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.MES.Models
 {

JinYuan.MES/Models/WattrMeter.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.MES.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.MES.Models
 {
     public class WattrMeter
     {

JinYuan.MES/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

JinYuan.Models/AGearEntity.cs

@@ -1,10 +1,4 @@
-using PLCCommunication;
+using SqlSugar;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/Alarm/AlarmData.cs

@@ -1,9 +1,4 @@
 using CsvHelper.Configuration.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/Alarm/AlarmStatus.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     public class AlarmStatus
     {

JinYuan.Models/AlarmCountEntry.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/AlarmForm.cs

@@ -1,9 +1,4 @@
 using CsvHelper.Configuration.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/BGearEntity.cs

@@ -1,5 +1,4 @@
 using SqlSugar;
-using System.Collections.Generic;
 
 namespace JinYuan.Models
 {
@@ -21,8 +20,8 @@ namespace JinYuan.Models
 
         public short[,] list_pan = new short[3, 1];//物流线托盘码
         //
-        public int[,] CCD_Data = new int[3,28];//芯包CCD信息1,2,3
+        public int[,] CCD_Data = new int[3, 27];//芯包CCD信息1,2,3
-        public float[] Thickness_Data = new float[3];//电芯3_厚度数据信息1,2,3
+        public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3
         /// <summary>
         /// 时间
         /// </summary>
@@ -76,7 +75,6 @@ namespace JinYuan.Models
         public int CCD25 { get; set; }
         public int CCD26 { get; set; }
         public int CCD27 { get; set; }
-        public int CCD28 { get; set; }
         /// <summary>
         /// 电芯1_厚度数据1
         /// </summary>
@@ -113,7 +111,6 @@ namespace JinYuan.Models
         public string CCDResult25 { get; set; }
         public string CCDResult26 { get; set; }
         public string CCDResult27 { get; set; }
-        public string CCDResult28 { get; set; }
 
         /// <summary>
         /// 芯包条码

JinYuan.Models/CPKModel.cs

@@ -1,14 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-
-
-
-namespace JinYuan.Models
 {
     //子组大小：这个与计算内的CPK值又非常打的关系，即是分组的样本个数，数据的分组在此处需要说明的是，必须
     //是根据实际情况来填写，比如每次抽样为5个，那么子组大小为5个，我们不能随心所欲的任意填写这个值，否则

JinYuan.Models/CPQCPTDate.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/Chart12HourData.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     /// <summary>
     /// 24小时统计表数据

JinYuan.Models/ChartDataType.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     /// <summary>
     /// 不良統計

JinYuan.Models/DataTurnover.cs

@@ -1,9 +1,4 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/DeviceOEE.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/ElectricEnergy.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     /// <summary>
     /// 智能电表

JinYuan.Models/Hourprod.cs

@@ -1,9 +1,4 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

JinYuan.Models/SysConfig/ChallengeCode.cs

@@ -1,9 +1,4 @@
-using SqlSugar;
+using System;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/Device.cs

@@ -2,11 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Security.Policy;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/Enum.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     /// <summary>
     /// 所有窗体枚举，小于临界窗体的为固定窗体，不执行关闭

JinYuan.Models/SysConfig/Group.cs

@@ -1,9 +1,5 @@
 using MiniExcelLibs.Attributes;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/ParamBase.cs

@@ -1,9 +1,4 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/ParamList.cs

@@ -1,9 +1,4 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/ProductModel.cs

@@ -1,9 +1,4 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/ProductModelParam.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     /// <summary>
     /// 产品型号参数范围

JinYuan.Models/SysConfig/SysAdmin.cs

@@ -1,9 +1,4 @@
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.Models/SysConfig/SysConfig.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     public class SysConfig
     {

JinYuan.Models/SysConfig/SysLog.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JinYuan.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JinYuan.Models
 {
     public class SysLog
     {

JinYuan.Models/SysConfig/Variable.cs

@@ -1,10 +1,4 @@
 using MiniExcelLibs.Attributes;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.Models
 {

JinYuan.VirtualDataLibrary/CommonMethods.cs

@@ -1,18 +1,15 @@
-using JinYuan.DAL;
+using JinYuan.CommunicationLib;
-using JinYuan.CommunicationLib.Library;
+using JinYuan.CommunicationLib.Base;
-using JinYuan.DataConvertLib;
+using JinYuan.CommunicationLib.Enum;
+using JinYuan.DAL;
+using JinYuan.Helper;
+using JinYuan.MES;
 using JinYuan.Models;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
 using System.Threading;
-using JinYuan.Helper;
+using System.Windows.Forms;
-using JinYuan.MES;
-using JinYuan.CommunicationLib.Enum;
-using JinYuan.CommunicationLib;
-using JinYuan.CommunicationLib.Base;
 
 namespace JinYuan.VirtualDataLibrary
 {

JinYuan.VirtualDataLibrary/DBSQL.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.VirtualDataLibrary
 {

JinYuan.VirtualDataLibrary/DelegateLib.cs

@@ -1,11 +1,6 @@
-using JinYuan.DataConvertLib;
+using JinYuan.Models;
-using JinYuan.Models;
 using PLCCommunication;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.VirtualDataLibrary
 {

JinYuan.VirtualDataLibrary/MesConfig.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JinYuan.VirtualDataLibrary
 {

JinYuan.VirtualDataLibrary/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的一般信息由以下

LargeSquareOne/FrmCpkCount.cs

@@ -1,16 +1,8 @@
-using JinYuan.Models;
+using System;
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using System.Windows.Markup;
 
 namespace LargeSquareOne
 {

LargeSquareOne/FrmDataMonitor.cs

@@ -11,9 +11,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using System.Windows.Documents;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmGroupConfig.cs

@@ -3,15 +3,9 @@ using JinYuan.Models;
 using MiniExcelLibs;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
 using System.Windows.Forms;
-using System.Xml.Schema;
 
 namespace LargeSquareOne
 {
@@ -254,7 +248,8 @@ namespace LargeSquareOne
                 if (value == null || value.ToString().Length == 0)
                 {
                     e.Value = "---";
-                };
+                }
+                ;
             }
         }
 

LargeSquareOne/FrmHelper.cs

@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmLogin.cs

@@ -2,14 +2,8 @@
 using JinYuan.Models;
 using JinYuan.VirtualDataLibrary;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmLoginMes.cs

@@ -1,14 +1,7 @@
-using JinYuan.Models;
+using JinYuan.VirtualDataLibrary;
-using JinYuan.VirtualDataLibrary;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmMain.cs

@@ -1,17 +1,17 @@
-using JinYuan.ControlLib;
+using JinYuan.ControlCenters;
+using JinYuan.ControlLib;
+using JinYuan.Helper;
 using JinYuan.Models;
+using JinYuan.VirtualDataLibrary;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Text;
 using System.Linq;
-using System.Threading;
-using System.Windows.Forms;
-using JinYuan.VirtualDataLibrary;
-using JinYuan.ControlCenters;
-using JinYuan.Helper;
 using System.Runtime.InteropServices;
+using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace LargeSquareOne
 {

LargeSquareOne/FrmMesParamMsgBoxWithAck.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmMsgBoxOutWithAck.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmMsgBoxWithAck.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmParamSet.cs

@@ -4,7 +4,6 @@ using JinYuan.VirtualDataLibrary;
 using Microsoft.Win32;
 using System;
 using System.IO;
-using System.Management.Instrumentation;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmRecipe.cs

@@ -1,18 +1,12 @@
 using JinYuan.CommunicationLib.Enum;
-using JinYuan.CommunicationLib.Interface;
-using PLCCommunication;
 using JinYuan.Helper;
 using JinYuan.Models;
 using JinYuan.VirtualDataLibrary;
-using SqlSugar;
+using PLCCommunication;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne

LargeSquareOne/FrmStaticsQuery.cs

@@ -1,13 +1,8 @@
 using JinYuan.Helper;
 using JinYuan.VirtualDataLibrary;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LargeSquareOne