diff --git a/JinYuan.ControlCenter/ControlCenter.cs b/JinYuan.ControlCenter/ControlCenter.cs index 5d0b165..590cc86 100644 --- a/JinYuan.ControlCenter/ControlCenter.cs +++ b/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 @@ -270,7 +262,7 @@ namespace JinYuan.ControlCenters if (resByte == null) { CommonMethods.AddDataMonitorLog(0, $"上料工位:{pf.GroupName},起始地址:{pf.VarList[1].VarAddress},得到空字节数组"); - LoggerHelp.WriteLog("循环读取PLC上料工位"+$"读取工位:{pf.GroupName},起始地址:{pf.VarList[1].VarAddress},得到空字节数组"); + LoggerHelp.WriteLog("循环读取PLC上料工位" + $"读取工位:{pf.GroupName},起始地址:{pf.VarList[1].VarAddress},得到空字节数组"); } else { diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 6eef0a7..352097d 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/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; //} /// - /// 判断总结果 Code_NG + /// 判断总结果 /// - 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 (Code_NG == 2) + if (A == 2 || B == 2 || C == 2 || D == 2 || H == 2 || J == 2) + { + //ed + Result = 2; + OK_NG = "NG"; + } + else if (A == 1 && B == 1 && C == 1 && D == 1 && H == 1 && J == 1) + { + Result = 1; + OK_NG = "OK"; + } + else + { + Result = 1; + OK_NG = "OK"; + } + + if (A == 2) { NG_Type += "无条码_"; - OK_NG = "NG"; Result = 2; } - //CCD 判定 - for (int i = 0; i < 27; i++) + if (B == 2) { - //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) - { - NG_Type += $"CCD{i}缺图NG_"; - OK_NG = "NG"; - Result = 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 上料工位(数据处理) @@ -209,7 +275,7 @@ namespace JinYuan.ControlCenters } if (bArrays.IsSuccess && bArrays.Content != null) { - + sw2.Restart(); //解析数据 @@ -233,7 +299,7 @@ namespace JinYuan.ControlCenters listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - + //listBarCode[0] = "TEST"; //listBarCode[1] = "TEST"; //listBarCode[2] = "TEST"; @@ -284,7 +350,7 @@ namespace JinYuan.ControlCenters MesResType mesResType1 = MesResType.A; bool Res = CommonMethods.hbgMes.SingleCellInStation(url, siteCode, lineCode, equipNum, materialCode, userName, listBarCode[i], ref MesMessage1, ref mesResType1); - + if (MesMessage1.Contains("发生一个或多个错误")) { MesMessage1 = "上传失败"; @@ -857,7 +923,7 @@ namespace JinYuan.ControlCenters // m.Flag = 1; // } - + // //m.UpState = "已上传"; // if (Res) // { @@ -900,7 +966,7 @@ namespace JinYuan.ControlCenters // bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage); - + // if (m.Flag == 1) // m.UpState = "已上传"; // else @@ -1674,22 +1740,17 @@ namespace JinYuan.ControlCenters AGearEntity TT = new AGearEntity(); //极限件标志 int ChallengeFlag = 0; - //芯包信息1 D3300~D3327 - //芯包信息2 D3330~D3357 - //芯包信息3 D3360~D3387 - for (int j = 0; j < 28; j++) + //芯包信息1 D3300~D3326 + //芯包信息2 D3330~D3356 + //芯包信息3 D3360~D3386 + for (int j = 0; j < 27; j++) { - m.CCD_Data[i,j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB); + m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB); } - //电芯1缺陷代码 D3400~D3427 - //电芯2缺陷代码 D3430~D3457 - //电芯3缺陷代码 D3460~D3487 - for (int j = 0; j < 28; j++) + for (int j = 0; j < 3; 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,56 +1801,67 @@ namespace JinYuan.ControlCenters //不良代码判定 List NGcodeList = new List(); - NGcodeList = NGWGcode(m.list_Data1,i); - // 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]); + 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] + , 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.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图"); - m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图"); - m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 0 ? "NG" : "缺图"); - m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 0 ? "NG" : "缺图"); - m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 0 ? "NG" : "缺图"); - m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 0 ? "NG" : "缺图"); - m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 0 ? "NG" : "缺图"); - m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 0 ? "NG" : "缺图"); - m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 0 ? "NG" : "缺图"); - m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 0 ? "NG" : "缺图"); - m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 0 ? "NG" : "缺图"); - m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 0 ? "NG" : "缺图"); - m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图"); - m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图"); - m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图"); - m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 0 ? "NG" : "缺图"); - m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 0 ? "NG" : "缺图"); - m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图"); - m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图"); - m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图"); - m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 0 ? "NG" : "缺图"); - m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 0 ? "NG" : "缺图"); - m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 0 ? "NG" : "缺图"); - m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 0 ? "NG" : "缺图"); - m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 0 ? "NG" : "缺图"); - m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 0 ? "NG" : "缺图"); - m.CCDResult28 = m.CCD_Data[i, 27] == 1 ? "OK" : (m.CCD_Data[i, 27] == 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] == 0 ? "OK" : (m.CCD_Data[i, 1] == 1 ? "NG" : "缺图"); + m.CCDResult3 = m.CCD_Data[i, 2] == 0 ? "OK" : (m.CCD_Data[i, 2] == 1 ? "NG" : "缺图"); + m.CCDResult4 = m.CCD_Data[i, 3] == 0 ? "OK" : (m.CCD_Data[i, 3] == 1 ? "NG" : "缺图"); + m.CCDResult5 = m.CCD_Data[i, 4] == 0 ? "OK" : (m.CCD_Data[i, 4] == 1 ? "NG" : "缺图"); + m.CCDResult6 = m.CCD_Data[i, 5] == 0 ? "OK" : (m.CCD_Data[i, 5] == 1 ? "NG" : "缺图"); + m.CCDResult7 = m.CCD_Data[i, 6] == 0 ? "OK" : (m.CCD_Data[i, 6] == 1 ? "NG" : "缺图"); + m.CCDResult8 = m.CCD_Data[i, 7] == 0 ? "OK" : (m.CCD_Data[i, 7] == 1 ? "NG" : "缺图"); + m.CCDResult9 = m.CCD_Data[i, 8] == 0 ? "OK" : (m.CCD_Data[i, 8] == 1 ? "NG" : "缺图"); + m.CCDResult10 = m.CCD_Data[i, 9] == 0 ? "OK" : (m.CCD_Data[i, 9] == 1 ? "NG" : "缺图"); + m.CCDResult11 = m.CCD_Data[i, 10] == 0 ? "OK" : (m.CCD_Data[i, 10] == 1 ? "NG" : "缺图"); + m.CCDResult12 = m.CCD_Data[i, 11] == 0 ? "OK" : (m.CCD_Data[i, 11] == 1 ? "NG" : "缺图"); + m.CCDResult13 = m.CCD_Data[i, 12] == 0 ? "OK" : (m.CCD_Data[i, 12] == 1 ? "NG" : "缺图"); + m.CCDResult14 = m.CCD_Data[i, 13] == 0 ? "OK" : (m.CCD_Data[i, 13] == 1 ? "NG" : "缺图"); + m.CCDResult15 = m.CCD_Data[i, 14] == 0 ? "OK" : (m.CCD_Data[i, 14] == 1 ? "NG" : "缺图"); + m.CCDResult16 = m.CCD_Data[i, 15] == 0 ? "OK" : (m.CCD_Data[i, 15] == 1 ? "NG" : "缺图"); + m.CCDResult17 = m.CCD_Data[i, 16] == 0 ? "OK" : (m.CCD_Data[i, 16] == 1 ? "NG" : "缺图"); + m.CCDResult18 = m.CCD_Data[i, 17] == 0 ? "OK" : (m.CCD_Data[i, 17] == 1 ? "NG" : "缺图"); + m.CCDResult19 = m.CCD_Data[i, 18] == 0 ? "OK" : (m.CCD_Data[i, 18] == 1 ? "NG" : "缺图"); + m.CCDResult20 = m.CCD_Data[i, 19] == 0 ? "OK" : (m.CCD_Data[i, 19] == 1 ? "NG" : "缺图"); + m.CCDResult21 = m.CCD_Data[i, 20] == 0 ? "OK" : (m.CCD_Data[i, 20] == 1 ? "NG" : "缺图"); + m.CCDResult22 = m.CCD_Data[i, 21] == 0 ? "OK" : (m.CCD_Data[i, 21] == 1 ? "NG" : "缺图"); + m.CCDResult23 = m.CCD_Data[i, 22] == 0 ? "OK" : (m.CCD_Data[i, 22] == 1 ? "NG" : "缺图"); + m.CCDResult24 = m.CCD_Data[i, 23] == 0 ? "OK" : (m.CCD_Data[i, 23] == 1 ? "NG" : "缺图"); + m.CCDResult25 = m.CCD_Data[i, 24] == 0 ? "OK" : (m.CCD_Data[i, 24] == 1 ? "NG" : "缺图"); + m.CCDResult26 = m.CCD_Data[i, 25] == 0 ? "OK" : (m.CCD_Data[i, 25] == 1 ? "NG" : "缺图"); + m.CCDResult27 = m.CCD_Data[i, 26] == 0 ? "OK" : (m.CCD_Data[i, 26] == 1 ? "NG" : "缺图"); #endregion - m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); m.CSBYHPROCESSNAME = "外观检测"; m.CSBYHSCHEDULE = CommonMethods.strClass; m.CSBYHINSTATIONTIME = m.ScanTime[0]; m.CSBYHOUTSTATIONTIME = m.ScanTime[1]; - //电芯1厚度数据1,2,3 改为 电芯1厚度 ；3字段只需1字段 - m.Thickness1 = SaveTwoNum(m.Thickness_Data[i]); - m.Thickness2 = SaveTwoNum(m.Thickness_Data[i]); - m.Thickness3 = SaveTwoNum(m.Thickness_Data[i]); + m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]); + m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]); + m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]); - - //芯包OKNG结果值判定 - MyRes[i] = JudgmentResult(Code_NG, m.CCD_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; + } + + } + } + 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 @@ -1895,7 +1977,13 @@ namespace JinYuan.ControlCenters else { m.Result = MyRes[i] = 2; - m.Remark += "本地存储"; + 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,31 +2212,9 @@ namespace JinYuan.ControlCenters return NGcodelist; } - /// - /// 下料外观检不良代码 - /// - /// - public List NGWGcode(short[,] serialNum,int index) - { - - List NGcodelist = new List(); - 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下料不良代码 + #region NG下料不良代码 public List NGCarcode(int a, int b, int c) { //芯包重量、测厚位移、极性 diff --git a/JinYuan.ControlCenter/ControlCenter_Total.cs b/JinYuan.ControlCenter/ControlCenter_Total.cs index 3556627..fb6e632 100644 --- a/JinYuan.ControlCenter/ControlCenter_Total.cs +++ b/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 { @@ -195,10 +191,10 @@ 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 = "铝极耳剪切不良", DataCount = 0 }); - - 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 = "MES不良", DataCount = 0 }); - CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "其他不良" , DataCount = 0 }); + CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "其他不良", DataCount = 0 }); } else //读取PLC数据 @@ -423,14 +419,14 @@ namespace JinYuan.ControlCenters string _anemometerAddress = "D15000";//风速仪起始地址 if (CommonMethods.mesConfig.isUpMes) { - JYResult jYResult = CommonMethods.PlcLink.ReadValue>(_anemometerAddress, Data_Type.ArrByte,150); + JYResult jYResult = CommonMethods.PlcLink.ReadValue>(_anemometerAddress, Data_Type.ArrByte, 150); List _anemograph = GetList(_anemometerNumber, 0);//初始化列表 - List _anemometerName=new List(); + List _anemometerName = new List(); string _mesage = ""; - for (int i=0;i< _anemometerNumber;i++) + for (int i = 0; i < _anemometerNumber; i++) { //初始化风速仪名称 - int _temple = i+1; + int _temple = i + 1; string _name = "风速仪" + _temple.ToString(); _anemometerName.Add(_name); @@ -440,22 +436,22 @@ namespace JinYuan.ControlCenters // // 写csv文件 string productName = string.Empty; - string fileName=string.Empty; - string filePath=string.Empty; + string fileName = string.Empty; + string filePath = string.Empty; DateTime nowDate = DateTime.Now; - string fileTitle= "工序名称,生产机台编号,拉线,型号,物料编号,操作人员,班次,采集时间,"; - string fileContent= $"预焊工序,{CommonMethods.mesConfig.equipNum},{CommonMethods.mesConfig.lineCode},{productName},{CommonMethods.mesConfig.MaterialCode},{CommonMethods.mesConfig.mesUserName},{CommonMethods.strClass},{nowDate.ToString("yyyy-MM-dd HH:mm:ss")},"; + string fileTitle = "工序名称,生产机台编号,拉线,型号,物料编号,操作人员,班次,采集时间,"; + string fileContent = $"预焊工序,{CommonMethods.mesConfig.equipNum},{CommonMethods.mesConfig.lineCode},{productName},{CommonMethods.mesConfig.MaterialCode},{CommonMethods.mesConfig.mesUserName},{CommonMethods.strClass},{nowDate.ToString("yyyy-MM-dd HH:mm:ss")},"; filePath = $@"{CommonMethods.strAnemographpath}\{nowDate.Year}\{nowDate.Month}"; fileName = $@"{nowDate.Day}.csv"; for (int j = 0; j < _anemometerNumber; j++) - { - fileTitle = fileTitle +","+ _anemometerName[j]; + { + fileTitle = fileTitle + "," + _anemometerName[j]; fileContent = fileContent + "," + _anemograph[j]; } CSVHelper.WriterCSV(filePath, fileName, fileTitle, fileContent); - + if (false)//待确认接口 { diff --git a/JinYuan.ControlCenter/MES/MESDataCombin.cs b/JinYuan.ControlCenter/MES/MESDataCombin.cs index 6a1826e..4c923b7 100644 --- a/JinYuan.ControlCenter/MES/MESDataCombin.cs +++ b/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 { @@ -54,7 +51,7 @@ namespace JinYuan.ControlCenters alarmParam.alarmLineList = alarmLineList; string SendJosn = JsonConvert.SerializeObject(alarmParam); var sw = new Stopwatch(); - sw.Start(); + sw.Start(); resJson = MESApiHelper.HttpPostJsonAPI(CommonMethods.mesConfig.AlarmCurrencyMesUrl, SendJosn); sw.Stop(); josnTxtMsg = $"{nowTime.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用MES设备报警接口:{CommonMethods.mesConfig.AlarmCurrencyMesUrl},请求数据为:{SendJosn},\n{nowTime.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resJson}"; diff --git a/JinYuan.ControlCenter/Properties/AssemblyInfo.cs b/JinYuan.ControlCenter/Properties/AssemblyInfo.cs index 1251188..a45bd93 100644 --- a/JinYuan.ControlCenter/Properties/AssemblyInfo.cs +++ b/JinYuan.ControlCenter/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/JinYuan.DAL/Enums/Enums.cs b/JinYuan.DAL/Enums/Enums.cs index d01e1ab..daa4c71 100644 --- a/JinYuan.DAL/Enums/Enums.cs +++ b/JinYuan.DAL/Enums/Enums.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.DAL.Enums +namespace JinYuan.DAL.Enums { /// /// 查询条件枚举 diff --git a/JinYuan.DAL/ISugarHepler.cs b/JinYuan.DAL/ISugarHepler.cs index fac9a2d..a2a6914 100644 --- a/JinYuan.DAL/ISugarHepler.cs +++ b/JinYuan.DAL/ISugarHepler.cs @@ -3,14 +3,12 @@ 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 { - public interface ISugarHepler: IDisposable + public interface ISugarHepler : IDisposable { /// /// 初始化数据库连接 @@ -177,7 +175,7 @@ namespace JinYuan.DAL #region 查询 - + /// /// 查询所有 /// diff --git a/JinYuan.DAL/Models/OrderSortEntity.cs b/JinYuan.DAL/Models/OrderSortEntity.cs index 323e0e8..591ea62 100644 --- a/JinYuan.DAL/Models/OrderSortEntity.cs +++ b/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 { diff --git a/JinYuan.DAL/Models/QueryCondition.cs b/JinYuan.DAL/Models/QueryCondition.cs index d9cef43..d5b1716 100644 --- a/JinYuan.DAL/Models/QueryCondition.cs +++ b/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 { diff --git a/JinYuan.DAL/Models/QueryDescriptor.cs b/JinYuan.DAL/Models/QueryDescriptor.cs index 0561948..b8f04ee 100644 --- a/JinYuan.DAL/Models/QueryDescriptor.cs +++ b/JinYuan.DAL/Models/QueryDescriptor.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.DAL.Models { diff --git a/JinYuan.DAL/Properties/AssemblyInfo.cs b/JinYuan.DAL/Properties/AssemblyInfo.cs index 45ad6f5..9741fe1 100644 --- a/JinYuan.DAL/Properties/AssemblyInfo.cs +++ b/JinYuan.DAL/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/JinYuan.DAL/SQLSugarHelper.cs b/JinYuan.DAL/SQLSugarHelper.cs index 26f1552..07240d0 100644 --- a/JinYuan.DAL/SQLSugarHelper.cs +++ b/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 { diff --git a/JinYuan.DAL/SQLSugarService.cs b/JinYuan.DAL/SQLSugarService.cs index 410c1cf..345c935 100644 --- a/JinYuan.DAL/SQLSugarService.cs +++ b/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,18 +7,16 @@ 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 { - + public class SQLSugarService : ISugarHepler { - - public void SetConnectionStr(string connectionStr, SqlSugar.DbType dbType= SqlSugar.DbType.SqlServer) + + public void SetConnectionStr(string connectionStr, SqlSugar.DbType dbType = SqlSugar.DbType.SqlServer) { SQLSugarHelper.connString = connectionStr; SqlSugarDb = SQLSugarHelper.SqlSugarClient; @@ -891,7 +886,7 @@ namespace JinYuan.DAL #endregion #region 修改 - + /// /// 修改（主键是更新条件） /// @@ -1629,6 +1624,6 @@ namespace JinYuan.DAL } - + } } diff --git a/JinYuan.Helper/ArrayHelper.cs b/JinYuan.Helper/ArrayHelper.cs index 4ef6af2..b57c9b0 100644 --- a/JinYuan.Helper/ArrayHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/CSVHelper.cs b/JinYuan.Helper/CSVHelper.cs index dbcc6f9..8e3d4c0 100644 --- a/JinYuan.Helper/CSVHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/ChartHelper.cs b/JinYuan.Helper/ChartHelper.cs index eb61dc6..79583c7 100644 --- a/JinYuan.Helper/ChartHelper.cs +++ b/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 diff --git a/JinYuan.Helper/ConvertHelper.cs b/JinYuan.Helper/ConvertHelper.cs index 73c3b8f..62a1371 100644 --- a/JinYuan.Helper/ConvertHelper.cs +++ b/JinYuan.Helper/ConvertHelper.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Linq; namespace JinYuan.Helper { - public static class ConvertHelper + public static class ConvertHelper { /// /// 字节数组高低位转换 diff --git a/JinYuan.Helper/DataGridViewHelper.cs b/JinYuan.Helper/DataGridViewHelper.cs index 95c6826..f5035e4 100644 --- a/JinYuan.Helper/DataGridViewHelper.cs +++ b/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 @@ -41,7 +37,7 @@ namespace JinYuan.Helper /// /// /// - public static void DgvRowPrePaint(DataGridView dgv,string Column, object sender, DataGridViewRowPrePaintEventArgs e) + public static void DgvRowPrePaint(DataGridView dgv, string Column, object sender, DataGridViewRowPrePaintEventArgs e) { if (e.RowIndex >= dgv.Rows.Count - 1) @@ -50,7 +46,7 @@ namespace JinYuan.Helper try { - if(dr.Cells[Column].Value != null) + if (dr.Cells[Column].Value != null) { if (dr.Cells[Column].Value.Equals("OK")) { @@ -66,7 +62,7 @@ namespace JinYuan.Helper dr.Cells[Column].Style.ForeColor = Color.Red; } } - + } catch (Exception ex) { @@ -117,7 +113,7 @@ namespace JinYuan.Helper public static void DoubleBufferedDataGirdView(this DataGridView dgv, bool flag) { Type dgvType = dgv.GetType(); - PropertyInfo pi = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic); + PropertyInfo pi = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic); pi.SetValue(dgv, flag, null); } @@ -130,7 +126,7 @@ namespace JinYuan.Helper public static void DoubleBufferedListView(this ListView lv, bool flag) { Type lvType = lv.GetType(); - PropertyInfo pi = lvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic); + PropertyInfo pi = lvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic); pi.SetValue(lv, flag, null); } diff --git a/JinYuan.Helper/DataTableExtend.cs b/JinYuan.Helper/DataTableExtend.cs index c36db73..b1cb9ee 100644 --- a/JinYuan.Helper/DataTableExtend.cs +++ b/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 { diff --git a/JinYuan.Helper/DeleteLog.cs b/JinYuan.Helper/DeleteLog.cs index 8d65c9c..1ab232e 100644 --- a/JinYuan.Helper/DeleteLog.cs +++ b/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; diff --git a/JinYuan.Helper/ExcelHelper.cs b/JinYuan.Helper/ExcelHelper.cs index 0a10cd7..f6aafda 100644 --- a/JinYuan.Helper/ExcelHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/FileHelper.cs b/JinYuan.Helper/FileHelper.cs index 587b58a..e7eea94 100644 --- a/JinYuan.Helper/FileHelper.cs +++ b/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.Threading.Tasks; +using System.Runtime.Serialization.Formatters.Binary; namespace JinYuan.Helper { diff --git a/JinYuan.Helper/IniConfigHelper.cs b/JinYuan.Helper/IniConfigHelper.cs index 8db70d9..e9b4fb1 100644 --- a/JinYuan.Helper/IniConfigHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/IniFileHelper.cs b/JinYuan.Helper/IniFileHelper.cs index b3c01d5..67298d2 100644 --- a/JinYuan.Helper/IniFileHelper.cs +++ b/JinYuan.Helper/IniFileHelper.cs @@ -1,79 +1,75 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; +using System.IO; using System.Runtime.InteropServices; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace JinYuan.Helper { public class IniFileHelper { - private static string iniFilePath = "Configure.ini"; + private static string iniFilePath = "Configure.ini"; - [DllImport("kernel32")] - private static extern long WritePrivateProfileString(string section, string key, string val, string filePath); + [DllImport("kernel32")] + private static extern long WritePrivateProfileString(string section, string key, string val, string filePath); - [DllImport("kernel32")] - private static extern long GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath); + [DllImport("kernel32")] + private static extern long GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath); - public static string ReadIniData(string Section, string Key) - { - try - { - if (File.Exists(iniFilePath)) - { - StringBuilder temp = new StringBuilder(1024); - GetPrivateProfileString(Section, Key, "", temp, 1024, iniFilePath); - return temp.ToString(); - } - MessageBox.Show("节点：" + Section + "，键名：" + Key + "：读取配置文件错误！"); - return null; - } - catch - { - throw; - } - } + public static string ReadIniData(string Section, string Key) + { + try + { + if (File.Exists(iniFilePath)) + { + StringBuilder temp = new StringBuilder(1024); + GetPrivateProfileString(Section, Key, "", temp, 1024, iniFilePath); + return temp.ToString(); + } + MessageBox.Show("节点：" + Section + "，键名：" + Key + "：读取配置文件错误！"); + return null; + } + catch + { + throw; + } + } - public static bool WriteIniData(string Section, string Key, string Value) - { - try - { - if (File.Exists(iniFilePath)) - { - if (WritePrivateProfileString(Section, Key, Value, iniFilePath) == 0L) - { - return false; - } - return true; - } - File.Create(iniFilePath).Close(); - if (WritePrivateProfileString(Section, Key, Value, iniFilePath) == 0L) - { - return false; - } - return true; - } - catch - { - throw; - } - } + public static bool WriteIniData(string Section, string Key, string Value) + { + try + { + if (File.Exists(iniFilePath)) + { + if (WritePrivateProfileString(Section, Key, Value, iniFilePath) == 0L) + { + return false; + } + return true; + } + File.Create(iniFilePath).Close(); + if (WritePrivateProfileString(Section, Key, Value, iniFilePath) == 0L) + { + return false; + } + return true; + } + catch + { + throw; + } + } - public static void CreateIniFile(string StartupPath, string AppName) - { - iniFilePath = StartupPath + AppName; - if (!Directory.Exists(StartupPath)) - { - Directory.CreateDirectory(StartupPath); - } - if (!File.Exists(iniFilePath)) - { - File.Create(iniFilePath).Close(); - } - } - } + public static void CreateIniFile(string StartupPath, string AppName) + { + iniFilePath = StartupPath + AppName; + if (!Directory.Exists(StartupPath)) + { + Directory.CreateDirectory(StartupPath); + } + if (!File.Exists(iniFilePath)) + { + File.Create(iniFilePath).Close(); + } + } + } } diff --git a/JinYuan.Helper/JsonHelper.cs b/JinYuan.Helper/JsonHelper.cs index 44d4d5e..a22bc4a 100644 --- a/JinYuan.Helper/JsonHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/LoggerHelp.cs b/JinYuan.Helper/LoggerHelp.cs index fe87a20..f2250f8 100644 --- a/JinYuan.Helper/LoggerHelp.cs +++ b/JinYuan.Helper/LoggerHelp.cs @@ -1,7 +1,5 @@ using NLog; using System; -using System.IO; -using System.Linq; public class LoggerHelp { diff --git a/JinYuan.Helper/PLCAlarmParseHelper.cs b/JinYuan.Helper/PLCAlarmParseHelper.cs index 1590f85..0276e35 100644 --- a/JinYuan.Helper/PLCAlarmParseHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/Properties/AssemblyInfo.cs b/JinYuan.Helper/Properties/AssemblyInfo.cs index d46d787..6d47b23 100644 --- a/JinYuan.Helper/Properties/AssemblyInfo.cs +++ b/JinYuan.Helper/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/JinYuan.Helper/ScanerHook.cs b/JinYuan.Helper/ScanerHook.cs index 2261a4d..a7cc54c 100644 --- a/JinYuan.Helper/ScanerHook.cs +++ b/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 { diff --git a/JinYuan.Helper/SendDateMQTT.cs b/JinYuan.Helper/SendDateMQTT.cs index 0719b03..877ee47 100644 --- a/JinYuan.Helper/SendDateMQTT.cs +++ b/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.Security.Policy; -using JinYuan.Models; +using System.Text; namespace JinYuan.Helper { @@ -86,9 +82,9 @@ namespace JinYuan.Helper public string Device_name = "602VIW01"; public string Action_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - + + /// /// 发送进出站数据 /// @@ -96,7 +92,7 @@ namespace JinYuan.Helper /// /// /// - public void EnterandExitSendMessge(int Station = 3) + public void EnterandExitSendMessge(int Station = 3) { try { @@ -113,7 +109,7 @@ namespace JinYuan.Helper PublishMessage(Topic, EnterandExitMessge("0")); } //出站 - else if (Station == 1) + else if (Station == 1) { PublishMessage(Topic, EnterandExitMessge("1")); @@ -121,7 +117,7 @@ namespace JinYuan.Helper } catch (Exception err) { - LoggerHelp.WriteError($"发送进出站数据错误，{err.Message}",err); + LoggerHelp.WriteError($"发送进出站数据错误，{err.Message}", err); } } /// @@ -144,7 +140,7 @@ namespace JinYuan.Helper } catch (Exception err) { - LoggerHelp.WriteError($"发送采集项数据错误，{err.Message}",err); + LoggerHelp.WriteError($"发送采集项数据错误，{err.Message}", err); } } diff --git a/JinYuan.Helper/StreamIOHelper.cs b/JinYuan.Helper/StreamIOHelper.cs index 4ae4727..a6a4df8 100644 --- a/JinYuan.Helper/StreamIOHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/StringSecurityHelper.cs b/JinYuan.Helper/StringSecurityHelper.cs index 5cda282..7071792 100644 --- a/JinYuan.Helper/StringSecurityHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/TimerReset.cs b/JinYuan.Helper/TimerReset.cs index b3aa06e..93b89ec 100644 --- a/JinYuan.Helper/TimerReset.cs +++ b/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 { diff --git a/JinYuan.Helper/TxtHelper.cs b/JinYuan.Helper/TxtHelper.cs index 3e5a405..c77733b 100644 --- a/JinYuan.Helper/TxtHelper.cs +++ b/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 { diff --git a/JinYuan.Helper/XmlHelper.cs b/JinYuan.Helper/XmlHelper.cs index a71ca27..f2d012e 100644 --- a/JinYuan.Helper/XmlHelper.cs +++ b/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 { diff --git a/JinYuan.MES/Enums/MesResType.cs b/JinYuan.MES/Enums/MesResType.cs index 9ce04d8..1f630b1 100644 --- a/JinYuan.MES/Enums/MesResType.cs +++ b/JinYuan.MES/Enums/MesResType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; namespace JinYuan.MES.Enums { diff --git a/JinYuan.MES/Enums/MesUploadType.cs b/JinYuan.MES/Enums/MesUploadType.cs index 9755efd..932dcba 100644 --- a/JinYuan.MES/Enums/MesUploadType.cs +++ b/JinYuan.MES/Enums/MesUploadType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; namespace JinYuan.MES.Enums { @@ -27,7 +22,7 @@ namespace JinYuan.MES.Enums /// [Description("DD")] DD = 3, - + } } diff --git a/JinYuan.MES/IMes.cs b/JinYuan.MES/IMes.cs index 0161e7c..6ad1c8f 100644 --- a/JinYuan.MES/IMes.cs +++ b/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 { @@ -25,7 +21,7 @@ namespace JinYuan.MES /// /// /// - bool LoginEnyity(string url, string siteCode, string lineCode, string equipNum, string userName, string passWord,string UserCardID, ref string resJson); + bool LoginEnyity(string url, string siteCode, string lineCode, string equipNum, string userName, string passWord, string UserCardID, ref string resJson); /// /// 设备参数设定值请求接口 /// @@ -69,7 +65,7 @@ namespace JinYuan.MES bool SingleCellInStation(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, string BarCode, ref string MesMessage, ref MesResType mesResType); - + /// /// 复投单个上传（只上传条码，不上传卷芯码） /// diff --git a/JinYuan.MES/MESApiHelper.cs b/JinYuan.MES/MESApiHelper.cs index 8084b9a..a709f02 100644 --- a/JinYuan.MES/MESApiHelper.cs +++ b/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 { @@ -32,7 +29,7 @@ namespace JinYuan.MES try { StringContent stringContent = new StringContent(strJosnData, Encoding.UTF8, "application/json"); - string ResponseMessage= new HttpClient() + string ResponseMessage = new HttpClient() { Timeout = TimeSpan.FromSeconds(3.0) }.PostAsync(url, (HttpContent)stringContent).Result.Content.ReadAsStringAsync().Result; @@ -97,7 +94,7 @@ namespace JinYuan.MES /// /// /// - public static string WebApiPostTranafer(string url,string json) + public static string WebApiPostTranafer(string url, string json) { try { diff --git a/JinYuan.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs index 6663edb..b09aaf2 100644 --- a/JinYuan.MES/MesDataProcess.cs +++ b/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 { @@ -45,7 +40,7 @@ namespace JinYuan.MES equipNum = equipNum, userName = userName, passWord = passWord, - userCardID =null// UserCardID + userCardID = null// UserCardID }; var nowDate = DateTime.Now; @@ -149,7 +144,7 @@ namespace JinYuan.MES resJson = $"设备参数设定值请求接口发生异常：{ex.Message}"; LoggerHelp.WriteEX("设备参数设定值请求接口", ex); } - + return null; } diff --git a/JinYuan.MES/Models/EqpStatusParam.cs b/JinYuan.MES/Models/EqpStatusParam.cs index e8c512a..f30ae8c 100644 --- a/JinYuan.MES/Models/EqpStatusParam.cs +++ b/JinYuan.MES/Models/EqpStatusParam.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { diff --git a/JinYuan.MES/Models/LoginEnyity.cs b/JinYuan.MES/Models/LoginEnyity.cs index 6e064ec..f912702 100644 --- a/JinYuan.MES/Models/LoginEnyity.cs +++ b/JinYuan.MES/Models/LoginEnyity.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.MES.Models +namespace JinYuan.MES.Models { /// /// 登录 diff --git a/JinYuan.MES/Models/ManyCellInStation.cs b/JinYuan.MES/Models/ManyCellInStation.cs index 381eace..2a380ce 100644 --- a/JinYuan.MES/Models/ManyCellInStation.cs +++ b/JinYuan.MES/Models/ManyCellInStation.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { - + /// /// 多个电池进站 /// diff --git a/JinYuan.MES/Models/ManyCellOutStation.cs b/JinYuan.MES/Models/ManyCellOutStation.cs index 066ab71..f6b8a98 100644 --- a/JinYuan.MES/Models/ManyCellOutStation.cs +++ b/JinYuan.MES/Models/ManyCellOutStation.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { @@ -49,7 +45,7 @@ namespace JinYuan.MES.Models /// public int type { get; set; } - // public List identiftyList { get; set; } + // public List identiftyList { get; set; } public List assembleLineList { get; set; } } @@ -93,7 +89,7 @@ namespace JinYuan.MES.Models } public class identiftyList { - + /// /// 产品条码 /// @@ -101,7 +97,7 @@ namespace JinYuan.MES.Models /// /// 原材料信息 /// - public List materialLotList=new List(); + public List materialLotList = new List(); /// /// 原材料条码 /// diff --git a/JinYuan.MES/Models/MesResponse.cs b/JinYuan.MES/Models/MesResponse.cs index 1f39431..3571ee2 100644 --- a/JinYuan.MES/Models/MesResponse.cs +++ b/JinYuan.MES/Models/MesResponse.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { diff --git a/JinYuan.MES/Models/ParamChange.cs b/JinYuan.MES/Models/ParamChange.cs index bf7146b..44bf8f0 100644 --- a/JinYuan.MES/Models/ParamChange.cs +++ b/JinYuan.MES/Models/ParamChange.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { diff --git a/JinYuan.MES/Models/ParamReturnData.cs b/JinYuan.MES/Models/ParamReturnData.cs index 0e4a60e..46c7f53 100644 --- a/JinYuan.MES/Models/ParamReturnData.cs +++ b/JinYuan.MES/Models/ParamReturnData.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { diff --git a/JinYuan.MES/Models/ProductProcessParam.cs b/JinYuan.MES/Models/ProductProcessParam.cs index 8c11595..e7345e6 100644 --- a/JinYuan.MES/Models/ProductProcessParam.cs +++ b/JinYuan.MES/Models/ProductProcessParam.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.MES.Models +namespace JinYuan.MES.Models { /// /// 产品过程加工参数 diff --git a/JinYuan.MES/Models/ProductResultParameters.cs b/JinYuan.MES/Models/ProductResultParameters.cs index f1722db..56671fe 100644 --- a/JinYuan.MES/Models/ProductResultParameters.cs +++ b/JinYuan.MES/Models/ProductResultParameters.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { @@ -22,7 +18,7 @@ namespace JinYuan.MES.Models /// /// 设备数据 /// - public string payload { get; set; } + public string payload { get; set; } } /// @@ -30,8 +26,8 @@ namespace JinYuan.MES.Models /// public class Payload1 { - - + + /// /// 工厂代码 /// @@ -71,7 +67,7 @@ namespace JinYuan.MES.Models /// /// 条码数组 /// - + public IdentificationListItem identification { get; set; } public List tagDataVOList { get; set; } } diff --git a/JinYuan.MES/Models/SingleCellInStation.cs b/JinYuan.MES/Models/SingleCellInStation.cs index 60d710c..483858b 100644 --- a/JinYuan.MES/Models/SingleCellInStation.cs +++ b/JinYuan.MES/Models/SingleCellInStation.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.MES.Models +namespace JinYuan.MES.Models { /// /// 单个电池进站 diff --git a/JinYuan.MES/Models/SingleCellOutStation.cs b/JinYuan.MES/Models/SingleCellOutStation.cs index a95ee7f..6e8d868 100644 --- a/JinYuan.MES/Models/SingleCellOutStation.cs +++ b/JinYuan.MES/Models/SingleCellOutStation.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { - + public class MaterialLotListItem { diff --git a/JinYuan.MES/Models/UploadAlarmParam.cs b/JinYuan.MES/Models/UploadAlarmParam.cs index b75362b..39b1fdf 100644 --- a/JinYuan.MES/Models/UploadAlarmParam.cs +++ b/JinYuan.MES/Models/UploadAlarmParam.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { diff --git a/JinYuan.MES/Models/UploadDeviceCollectData.cs b/JinYuan.MES/Models/UploadDeviceCollectData.cs index 3e5c756..9d454f1 100644 --- a/JinYuan.MES/Models/UploadDeviceCollectData.cs +++ b/JinYuan.MES/Models/UploadDeviceCollectData.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.MES.Models { diff --git a/JinYuan.MES/Models/WattrMeter.cs b/JinYuan.MES/Models/WattrMeter.cs index efc08a0..ab4fb21 100644 --- a/JinYuan.MES/Models/WattrMeter.cs +++ b/JinYuan.MES/Models/WattrMeter.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.MES.Models +namespace JinYuan.MES.Models { public class WattrMeter { diff --git a/JinYuan.MES/Properties/AssemblyInfo.cs b/JinYuan.MES/Properties/AssemblyInfo.cs index 9c2e3a6..01e120f 100644 --- a/JinYuan.MES/Properties/AssemblyInfo.cs +++ b/JinYuan.MES/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/JinYuan.Models/AGearEntity.cs b/JinYuan.Models/AGearEntity.cs index a6c7f81..d589b84 100644 --- a/JinYuan.Models/AGearEntity.cs +++ b/JinYuan.Models/AGearEntity.cs @@ -1,10 +1,4 @@ -using PLCCommunication; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SqlSugar; namespace JinYuan.Models { diff --git a/JinYuan.Models/Alarm/AlarmData.cs b/JinYuan.Models/Alarm/AlarmData.cs index ae4293d..a7af2e3 100644 --- a/JinYuan.Models/Alarm/AlarmData.cs +++ b/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 { diff --git a/JinYuan.Models/Alarm/AlarmStatus.cs b/JinYuan.Models/Alarm/AlarmStatus.cs index 641ee78..7ea9546 100644 --- a/JinYuan.Models/Alarm/AlarmStatus.cs +++ b/JinYuan.Models/Alarm/AlarmStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { public class AlarmStatus { diff --git a/JinYuan.Models/AlarmCountEntry.cs b/JinYuan.Models/AlarmCountEntry.cs index dc761b9..58a4e79 100644 --- a/JinYuan.Models/AlarmCountEntry.cs +++ b/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 { diff --git a/JinYuan.Models/AlarmForm.cs b/JinYuan.Models/AlarmForm.cs index 7f32b60..ac5ebe5 100644 --- a/JinYuan.Models/AlarmForm.cs +++ b/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 { diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs index 35f0847..6af674d 100644 --- a/JinYuan.Models/BGearEntity.cs +++ b/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 float[] Thickness_Data = new float[3];//电芯3_厚度数据信息1,2,3 + public int[,] CCD_Data = new int[3, 27];//芯包CCD信息1,2,3 + public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3 /// /// 时间 /// @@ -76,11 +75,10 @@ namespace JinYuan.Models public int CCD25 { get; set; } public int CCD26 { get; set; } public int CCD27 { get; set; } - public int CCD28 { get; set; } /// /// 电芯1_厚度数据1 /// - public float Thickness1 { get; set; } + public float Thickness1 { get; set; } public float Thickness2 { get; set; } public float Thickness3 { get; set; } /// @@ -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; } /// /// 芯包条码 @@ -151,617 +148,617 @@ namespace JinYuan.Models /// 备注 /// public string Remark { get; set; } - // /// - // /// 芯包称重1工位号 - // /// - //// public short CSBYHWEIGHTNOA1 { get; set; } - // /// - // /// 芯包重量1判定结果 - // /// - //// public string CSBYHWEIGHTRESULTA1 { get; set; } - // /// - // /// 芯包测厚工位号 - // /// - //// public short CSBYHTHICKNESSTESTSTATIONNOA { get; set; } - // /// - // /// 芯包测厚(位移)判定结果 - // /// - //// public string CSBYHTHICKNESSTESTJUDGERESULTA { get; set; } - // /// - // /// 芯包极性检测结果 - // /// - //// public string CSBYHPOLARITYRESULTA { get; set; } - // /// - // /// 芯包治具号 - // /// - //// public short CSBYHTOOLNOA { get; set; } - // /// - // /// 芯包铜焊接工位号1 - // /// - //// public short CSBYHCUWELDINGSTATIONNOA1 { get; set; } - // /// - // /// 芯包铜焊接工位号2 - // /// - //// public short CSBYHCUWELDINGSTATIONNOA2 { get; set; } - // /// - // /// 芯包铜焊接工位号3 - // /// - // public short CSBYHCUWELDINGSTATIONNOA3 { get; set; } - // /// - // /// 芯包铜焊焊头次数1 - // /// - // public int CSBYHCUWELDHEADCOUNTA1 { get; set; } - // /// - // /// 芯包铜焊焊头次数2 - // /// - // public int CSBYHCUWELDHEADCOUNTA2 { get; set; } - // /// - // /// 芯包铜焊焊头次数3 - // /// - // public int CSBYHCUWELDHEADCOUNTA3 { get; set; } - // /// - // /// 芯包铜焊焊座次数1 - // /// - // public int CSBYHCUWELDBASECOUNTA1 { get; set; } - // /// - // /// 芯包铜焊焊座次数2 - // /// - // public int CSBYHCUWELDBASECOUNTA2 { get; set; } - // /// - // /// 芯包铜焊焊座次数3 - // /// - // public int CSBYHCUWELDBASECOUNTA3 { get; set; } - // /// - // /// 芯包铝焊接工位号1 - // /// - // public short CSBYHALWELDINGSTATIONNOA1 { get; set; } - // /// - // /// 芯包铝焊接工位号2 - // /// - // public short CSBYHALWELDINGSTATIONNOA2 { get; set; } - // /// - // /// 芯包铝焊接工位号3 - // /// - // public short CSBYHALWELDINGSTATIONNOA3 { get; set; } - // /// - // /// 芯包铝焊焊头次数1 - // /// - // public int CSBYHALWELDHEADCOUNTA1 { get; set; } - // /// - // /// 芯包铝焊焊头次数2 - // /// - // public int CSBYHALWELDHEADCOUNTA2 { get; set; } - // /// - // /// 芯包铝焊焊头次数3 - // /// - // public int CSBYHALWELDHEADCOUNTA3 { get; set; } - // /// - // /// 芯包铝焊焊座次数1 - // /// - // public int CSBYHALWELDBASECOUNTA1 { get; set; } - // /// - // /// 芯包铝焊焊座次数2 - // /// - // public int CSBYHALWELDBASECOUNTA2 { get; set; } - // /// - // /// 芯包铝焊焊座次数3 - // /// - // public int CSBYHALWELDBASECOUNTA3 { get; set; } - // /// - // /// 电芯铜极耳切刀使用次数 - // /// - // public int CSBYHCUTABCUTTERCOUNTA { get; set; } - // /// - // /// 电芯铝极耳切刀使用次数 - // /// - // public int CSBYHALTABCUTTERCOUNTA { get; set; } - // /// - // /// 电芯裁切粘连判定结果 - // /// - // public string CSBYHCUTADHESIONJUDGERESULTA { get; set; } - // /// - // /// 电芯裁切毛刺判定结果 - // /// - // public string CSBYHCUTBURRJUDGERESULTA { get; set; } - // /// - // /// 芯包铜焊印位置判定结果1 - // /// - // public string CSBYHSOLDERJUDGERESULTA { get; set; } - // /// - // /// 芯包铜焊印位置判定结果2 - // /// - // public string CSBYHSOLDERJUDGERESULTA2 { get; set; } - // /// - // /// 芯包铝焊印位置判定结果1 - // /// - // public string AluminiumWeldPositionResult1 { get; set; } - // /// 芯包铝焊印位置判定结果2 - // /// - // public string AluminiumWeldPositionResult2 { get; set; } - // /// - // /// 芯包正面极耳撕裂判定结果 - // /// - // public string CSBYHFRONTEARCRACKLEJUDGERESULTA { get; set; } - // /// - // /// 芯包背面极耳撕裂判定结果 - // /// - // public string CSBYHBACKEARCRACKLEJUDGERESULTA { get; set; } - // /// - // /// 芯包正面极耳翻折检测结果 - // /// - // public string CSBYHFRONTEARFLODINGRESULTA { get; set; } - // /// - // /// 芯包背面极耳翻折检测结果 - // /// - // public string CSBYHBACKEARFLODINGRESULTA { get; set; } - // /// - // /// 电芯A/B出站判定结果 - // /// - // public string CSBYHOUTSTATIONJUDGMENTRESULT { get; set; } - // /// - // /// 电芯铜极耳切刀编号 - // /// - // public short CSBYHCUTABCUTTERNOA { get; set; } - // /// - // /// 电芯铝极耳切刀编号 - // /// - // public short CSBYHALTABCUTTERNOA { get; set; } - // /// - // /// 测厚压力结果 - // /// - // public string ThicknessPressureResult { get; set; } - // /// - // /// 焊前CCD检测结果 - // /// - // public string PreweldResult { get; set; } - // /// - // /// 铜焊头预警寿命(次) - // /// - // public int CopperWeldHeadLife { get; set; } - // /// - // /// 铜焊座预警寿命(次) - // /// - // public int CopperWeldSeatLife { get; set; } - // /// - // /// 铝焊头预警寿命(次) - // /// - // public int AluminiumWeldHeadLife { get; set; } - // /// - // /// 铝焊座预警寿命(次) - // /// - // public int AluminiumWeldSeatLife { get; set; } - // /// - // /// 裁切刀使用寿命(次) - // /// - // public int CuttingKnifeLife { get; set; } - // /// - // /// 复投次数 - // /// - // public int RethrowNum { get; set; } - // /// - // /// 芯包测厚位移值（尺寸2） - // /// - // public float ThicknessMeasureDisplacement { get; set; } + // /// + // /// 芯包称重1工位号 + // /// + //// public short CSBYHWEIGHTNOA1 { get; set; } + // /// + // /// 芯包重量1判定结果 + // /// + //// public string CSBYHWEIGHTRESULTA1 { get; set; } + // /// + // /// 芯包测厚工位号 + // /// + //// public short CSBYHTHICKNESSTESTSTATIONNOA { get; set; } + // /// + // /// 芯包测厚(位移)判定结果 + // /// + //// public string CSBYHTHICKNESSTESTJUDGERESULTA { get; set; } + // /// + // /// 芯包极性检测结果 + // /// + //// public string CSBYHPOLARITYRESULTA { get; set; } + // /// + // /// 芯包治具号 + // /// + //// public short CSBYHTOOLNOA { get; set; } + // /// + // /// 芯包铜焊接工位号1 + // /// + //// public short CSBYHCUWELDINGSTATIONNOA1 { get; set; } + // /// + // /// 芯包铜焊接工位号2 + // /// + //// public short CSBYHCUWELDINGSTATIONNOA2 { get; set; } + // /// + // /// 芯包铜焊接工位号3 + // /// + // public short CSBYHCUWELDINGSTATIONNOA3 { get; set; } + // /// + // /// 芯包铜焊焊头次数1 + // /// + // public int CSBYHCUWELDHEADCOUNTA1 { get; set; } + // /// + // /// 芯包铜焊焊头次数2 + // /// + // public int CSBYHCUWELDHEADCOUNTA2 { get; set; } + // /// + // /// 芯包铜焊焊头次数3 + // /// + // public int CSBYHCUWELDHEADCOUNTA3 { get; set; } + // /// + // /// 芯包铜焊焊座次数1 + // /// + // public int CSBYHCUWELDBASECOUNTA1 { get; set; } + // /// + // /// 芯包铜焊焊座次数2 + // /// + // public int CSBYHCUWELDBASECOUNTA2 { get; set; } + // /// + // /// 芯包铜焊焊座次数3 + // /// + // public int CSBYHCUWELDBASECOUNTA3 { get; set; } + // /// + // /// 芯包铝焊接工位号1 + // /// + // public short CSBYHALWELDINGSTATIONNOA1 { get; set; } + // /// + // /// 芯包铝焊接工位号2 + // /// + // public short CSBYHALWELDINGSTATIONNOA2 { get; set; } + // /// + // /// 芯包铝焊接工位号3 + // /// + // public short CSBYHALWELDINGSTATIONNOA3 { get; set; } + // /// + // /// 芯包铝焊焊头次数1 + // /// + // public int CSBYHALWELDHEADCOUNTA1 { get; set; } + // /// + // /// 芯包铝焊焊头次数2 + // /// + // public int CSBYHALWELDHEADCOUNTA2 { get; set; } + // /// + // /// 芯包铝焊焊头次数3 + // /// + // public int CSBYHALWELDHEADCOUNTA3 { get; set; } + // /// + // /// 芯包铝焊焊座次数1 + // /// + // public int CSBYHALWELDBASECOUNTA1 { get; set; } + // /// + // /// 芯包铝焊焊座次数2 + // /// + // public int CSBYHALWELDBASECOUNTA2 { get; set; } + // /// + // /// 芯包铝焊焊座次数3 + // /// + // public int CSBYHALWELDBASECOUNTA3 { get; set; } + // /// + // /// 电芯铜极耳切刀使用次数 + // /// + // public int CSBYHCUTABCUTTERCOUNTA { get; set; } + // /// + // /// 电芯铝极耳切刀使用次数 + // /// + // public int CSBYHALTABCUTTERCOUNTA { get; set; } + // /// + // /// 电芯裁切粘连判定结果 + // /// + // public string CSBYHCUTADHESIONJUDGERESULTA { get; set; } + // /// + // /// 电芯裁切毛刺判定结果 + // /// + // public string CSBYHCUTBURRJUDGERESULTA { get; set; } + // /// + // /// 芯包铜焊印位置判定结果1 + // /// + // public string CSBYHSOLDERJUDGERESULTA { get; set; } + // /// + // /// 芯包铜焊印位置判定结果2 + // /// + // public string CSBYHSOLDERJUDGERESULTA2 { get; set; } + // /// + // /// 芯包铝焊印位置判定结果1 + // /// + // public string AluminiumWeldPositionResult1 { get; set; } + // /// 芯包铝焊印位置判定结果2 + // /// + // public string AluminiumWeldPositionResult2 { get; set; } + // /// + // /// 芯包正面极耳撕裂判定结果 + // /// + // public string CSBYHFRONTEARCRACKLEJUDGERESULTA { get; set; } + // /// + // /// 芯包背面极耳撕裂判定结果 + // /// + // public string CSBYHBACKEARCRACKLEJUDGERESULTA { get; set; } + // /// + // /// 芯包正面极耳翻折检测结果 + // /// + // public string CSBYHFRONTEARFLODINGRESULTA { get; set; } + // /// + // /// 芯包背面极耳翻折检测结果 + // /// + // public string CSBYHBACKEARFLODINGRESULTA { get; set; } + // /// + // /// 电芯A/B出站判定结果 + // /// + // public string CSBYHOUTSTATIONJUDGMENTRESULT { get; set; } + // /// + // /// 电芯铜极耳切刀编号 + // /// + // public short CSBYHCUTABCUTTERNOA { get; set; } + // /// + // /// 电芯铝极耳切刀编号 + // /// + // public short CSBYHALTABCUTTERNOA { get; set; } + // /// + // /// 测厚压力结果 + // /// + // public string ThicknessPressureResult { get; set; } + // /// + // /// 焊前CCD检测结果 + // /// + // public string PreweldResult { get; set; } + // /// + // /// 铜焊头预警寿命(次) + // /// + // public int CopperWeldHeadLife { get; set; } + // /// + // /// 铜焊座预警寿命(次) + // /// + // public int CopperWeldSeatLife { get; set; } + // /// + // /// 铝焊头预警寿命(次) + // /// + // public int AluminiumWeldHeadLife { get; set; } + // /// + // /// 铝焊座预警寿命(次) + // /// + // public int AluminiumWeldSeatLife { get; set; } + // /// + // /// 裁切刀使用寿命(次) + // /// + // public int CuttingKnifeLife { get; set; } + // /// + // /// 复投次数 + // /// + // public int RethrowNum { get; set; } + // /// + // /// 芯包测厚位移值（尺寸2） + // /// + // public float ThicknessMeasureDisplacement { get; set; } - // /// - // /// 电芯A/B工序名 - // /// - // public string CSBYHPROCESSNAME { get; set; } - // /// - // /// 电芯A/B班次 - // /// - // public string CSBYHSCHEDULE { get; set; } - // /// - // /// 电芯A/B进站时间 - // /// - // public string CSBYHINSTATIONTIME { get; set; } - // /// - // /// 电芯A/B出站时间 - // /// - // public string CSBYHOUTSTATIONTIME { get; set; } - // /// - // /// 电芯A/B异常反馈信息 - // /// - // //public string CSBYHABNORMALINFORMATION { get; set; } - // /// - // /// 芯包重量1设定值最大值（g） - // /// - // public float CSBYHWEIGHTA1MAXSETTING { get; set; } - // /// - // /// 芯包重量1设定值最小值（g） - // /// - // public float CSBYHWEIGHTA1MINSETTING { get; set; } - // /// - // /// 芯包重量1（g） - // /// - // public float CSBYHWEIGHTA1 { get; set; } - // /// - // /// 芯包侧厚压力（Kg)设定最大值 - // /// - // public float CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA { get; set; } - // /// - // /// 芯包侧厚压力（Kg)设定最小值 - // /// - // public float CSBYHTHICKNESSTESTPRESSUREMINSETTINGA { get; set; } - // /// - // /// 芯包侧厚压力实际值 - // /// - // public float CSBYHTHICKNESSTESTPRESSUREA { get; set; } - // /// - // /// 芯包侧厚尺寸1（mm) - // /// - // public float CSBYHTHICKNESSTESTPRESSURESIZEA { get; set; } - // /// - // /// 芯包侧厚最大尺寸（mm) - // /// - // public float CSBYHTHICKNESSTESTPRESSUREMAXSIZEA { get; set; } - // /// - // /// 芯包侧厚最小尺寸（mm) - // /// - // public float CSBYHTHICKNESSTESTPRESSUREMINSIZEA { get; set; } - // /// - // /// 铜焊1压力(Psi)设定值最大值 - // /// - // public float CSBYHCUWELDINGPRESSUREMAXSETTING1 { get; set; } - // /// - // /// 铜焊2压力(Psi)设定值最大值 - // /// - // public float CSBYHCUWELDINGPRESSUREMAXSETTING2 { get; set; } - // /// - // /// 铜焊3压力(Psi)设定值最大值 - // /// - // public float CSBYHCUWELDINGPRESSUREMAXSETTING3 { get; set; } - // /// - // /// 铜焊接压力(Psi)设定值最小值 - // /// - // public float CSBYHCUWELDINGPRESSUREMINSETTING { get; set; } - // /// - // /// 铜焊1功率(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGPOWERMAXSETTING1 { get; set; } - // /// - // /// 铜焊2功率(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGPOWERMAXSETTING2 { get; set; } - // /// - // /// 铜焊3功率(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGPOWERMAXSETTING3 { get; set; } - // /// - // /// 铜焊1功率(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGPOWERMINSETTING1 { get; set; } - // /// - // /// 铜焊2功率(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGPOWERMINSETTING2 { get; set; } - // /// - // /// 铜焊3功率(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGPOWERMINSETTING3 { get; set; } - // /// - // /// 铜焊1能量(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGENERGYMAXSETTING1 { get; set; } - // /// - // /// 铜焊2能量(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGENERGYMAXSETTING2 { get; set; } - // /// - // /// 铜焊3能量(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGENERGYMAXSETTING3 { get; set; } - // /// - // /// 铜焊1能量(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGENERGYMINSETTING1 { get; set; } - // /// - // /// 铜焊2能量(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGENERGYMINSETTING2 { get; set; } - // /// - // /// 铜焊3能量(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGENERGYMINSETTING3 { get; set; } - // /// - // /// 铜焊1振幅(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGAMPLITUDEMAXSETTING1 { get; set; } - // /// - // /// 铜焊2振幅(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGAMPLITUDEMAXSETTING2 { get; set; } - // /// - // /// 铜焊3振幅(%)设定值最大值 - // /// - // public float CSBYHCUWELDINGAMPLITUDEMAXSETTING3 { get; set; } - // /// - // /// 铜焊1振幅(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGAMPLITUDEMINSETTING1 { get; set; } - // /// - // /// 铜焊2振幅(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGAMPLITUDEMINSETTING2 { get; set; } - // /// - // /// 铜焊3振幅(%)设定值最小值 - // /// - // public float CSBYHCUWELDINGAMPLITUDEMINSETTING3 { get; set; } - // /// - // /// 芯包铜焊焊接压力(Psi)实际值1 - // /// - // public float CSBYHCUPRESSUREA1 { get; set; } - // /// - // /// 芯包铜焊接功率(W)实际值1 - // /// - // public float CSBYHCUPOWERA1 { get; set; } - // /// - // /// 芯包铜焊焊接能量(J)实际值1 - // /// - // public float CSBYHCUENERGYA1 { get; set; } - // /// - // /// 芯包铜焊焊接振幅(%)实际值1 - // /// - // public float CSBYHCUAMPLITUDEA1 { get; set; } - // /// - // /// 芯包铜焊焊接时间(ms)实际值1 - // /// - // public float CSBYHCUTIMEA1 { get; set; } - // /// - // /// 芯包铜焊焊接压力(Psi)实际值2 - // /// - // public float CSBYHCUPRESSUREA2 { get; set; } - // /// - // /// 芯包铜焊接功率A(W)实际值2 - // /// - // public float CSBYHCUPOWERA2 { get; set; } - // /// - // /// 芯包铜焊焊接能量(J)实际值2 - // /// - // public float CSBYHCUENERGYA2 { get; set; } - // /// - // /// 芯包铜焊焊接振幅(%)实际值2 - // /// - // public float CSBYHCUAMPLITUDEA2 { get; set; } - // /// - // /// 芯包铜焊焊接时间(ms)实际值2 - // /// - // public float CSBYHCUTIMEA2 { get; set; } - // /// - // /// 芯包铜焊焊接压力(Psi)实际值3 - // /// - // public float CSBYHCUPRESSUREA3 { get; set; } - // /// - // /// 芯包铜焊接功率A(W)实际值3 - // /// - // public float CSBYHCUPOWERA3 { get; set; } - // /// - // /// 芯包铜焊焊接能量(J)实际值3 - // /// - // public float CSBYHCUENERGYA3 { get; set; } - // /// - // /// 芯包铜焊焊接振幅(%)实际值3 - // /// - // public float CSBYHCUAMPLITUDEA3 { get; set; } - // /// - // /// 芯包铜焊焊接时间(ms)实际值3 - // /// - // public float CSBYHCUTIMEA3 { get; set; } - // /// - // /// 铝焊1压力(Psi)设定值最大值 - // /// - // public float CSBYHALWELDINGPRESSUREMAXSETTING1 { get; set; } - // /// - // /// 铝焊2压力(Psi)设定值最大值 - // /// - // public float CSBYHALWELDINGPRESSUREMAXSETTING2 { get; set; } - // /// - // /// 铝焊3压力(Psi)设定值最大值 - // /// - // public float CSBYHALWELDINGPRESSUREMAXSETTING3 { get; set; } - // /// - // /// 铝焊接压力(Psi)设定值最小值 - // /// - // public float CSBYHALWELDINGPRESSUREMINSETTING { get; set; } - // /// - // /// 铝焊1功率(%)设定值最大值 - // /// - // public float CSBYHALWELDINGPOWERMAXSETTING1 { get; set; } - // /// - // /// 铝焊2功率(%)设定值最大值 - // /// - // public float CSBYHALWELDINGPOWERMAXSETTING2 { get; set; } - // /// - // /// 铝焊3功率(%)设定值最大值 - // /// - // public float CSBYHALWELDINGPOWERMAXSETTING3 { get; set; } - // /// - // /// 铝焊1功率(%)设定值最小值 - // /// - // public float CSBYHALWELDINGPOWERMINSETTING1 { get; set; } - // /// - // /// 铝焊2功率(%)设定值最小值 - // /// - // public float CSBYHALWELDINGPOWERMINSETTING2 { get; set; } - // /// - // /// 铝焊3功率(%)设定值最小值 - // /// - // public float CSBYHALWELDINGPOWERMINSETTING3 { get; set; } - // /// - // /// 铝焊1能量(%)设定值最大值 - // /// - // public float CSBYHALWELDINGENERGYMAXSETTING1 { get; set; } - // /// - // /// 铝焊2能量(%)设定值最大值 - // /// - // public float CSBYHALWELDINGENERGYMAXSETTING2 { get; set; } - // /// - // /// 铝焊3能量(%)设定值最大值 - // /// - // public float CSBYHALWELDINGENERGYMAXSETTING3 { get; set; } - // /// - // /// 铝焊1能量(%)设定值最小值 - // /// - // public float CSBYHALWELDINGENERGYMINSETTING1 { get; set; } - // /// - // /// 铝焊2能量(%)设定值最小值 - // /// - // public float CSBYHALWELDINGENERGYMINSETTING2 { get; set; } - // /// - // /// 铝焊3能量(%)设定值最小值 - // /// - // public float CSBYHALWELDINGENERGYMINSETTING3 { get; set; } - // /// - // /// 铝焊1振幅(%)设定值最大值 - // /// - // public float CSBYHALWELDINGAMPLITUDEMAXSETTING1 { get; set; } - // /// - // /// 铝焊2振幅(%)设定值最大值 - // /// - // public float CSBYHALWELDINGAMPLITUDEMAXSETTING2 { get; set; } - // /// - // /// 铝焊3振幅(%)设定值最大值 - // /// - // public float CSBYHALWELDINGAMPLITUDEMAXSETTING3 { get; set; } - // /// - // /// 铝焊1振幅(%)设定值最小值 - // /// - // public float CSBYHALWELDINGAMPLITUDEMINSETTING1 { get; set; } - // /// - // /// 铝焊2振幅(%)设定值最小值 - // /// - // public float CSBYHALWELDINGAMPLITUDEMINSETTING2 { get; set; } - // /// - // /// 铝焊3振幅(%)设定值最小值 - // /// - // public float CSBYHALWELDINGAMPLITUDEMINSETTING3 { get; set; } - // /// - // /// 芯包铝焊焊接压力(Psi)实际值1 - // /// - // public float CSBYHALPRESSUREA1 { get; set; } - // /// - // /// 芯包铝焊接功率(W)实际值1 - // /// - // public float CSBYHALPOWERA1 { get; set; } - // /// - // /// 芯包铝焊焊接能量(J)实际值1 - // /// - // public float CSBYHALENERGYA1 { get; set; } - // /// - // /// 芯包铝焊焊接振幅(%)实际值1 - // /// - // public float CSBYHALAMPLITUDEA1 { get; set; } - // /// - // /// 芯包铝焊焊接时间(ms)实际值1 - // /// - // public float CSBYHALTIMEA1 { get; set; } - // /// - // /// 芯包铝焊焊接压力(Psi)实际值2 - // /// - // public float CSBYHALPRESSUREA2 { get; set; } - // /// - // /// 芯包铝焊接功率(W)实际值2 - // /// - // public float CSBYHALPOWERA2 { get; set; } - // /// - // /// 芯包铝焊焊接能量(J)实际值2 - // /// - // public float CSBYHALENERGYA2 { get; set; } - // /// - // /// 芯包铝焊焊接振幅(%)实际值2 - // /// - // public float CSBYHALAMPLITUDEA2 { get; set; } - // /// - // /// 芯包铝焊焊接时间(ms)实际值2 - // /// - // public float CSBYHALTIMEA2 { get; set; } - // /// - // /// 芯包铝焊焊接压力(Psi)实际值3 - // /// - // public float CSBYHALPRESSUREA3 { get; set; } - // /// - // /// 芯包铝焊接功率(W)实际值3 - // /// - // public float CSBYHALPOWERA3 { get; set; } - // /// - // /// 芯包铝焊焊接能量(J)实际值3 - // /// - // public float CSBYHALENERGYA3 { get; set; } - // /// - // /// 芯包铝焊焊接振幅(%)实际值3 - // /// - // public float CSBYHALAMPLITUDEA3 { get; set; } - // /// - // /// 芯包铝焊焊接时间(ms)实际值3 - // /// - // public float CSBYHALTIMEA3 { get; set; } - // /// - // /// 电芯铜极极耳长度(mm) - // /// - // public float CSBYHCUTABLENGTHA { get; set; } - // /// - // /// 电芯铜极极耳宽度(mm) - // /// - // public float CSBYHCUTABWIDTHA { get; set; } - // /// - // /// 电芯铝极极耳长度(mm) - // /// - // public float CSBYHALTABLENGTHA { get; set; } - // /// - // /// 电芯铝极极耳宽度(mm) - // /// - // public float CSBYHALTABWIDTHA { get; set; } - // /// - // /// 电芯裁切粘连结果（mm） - // /// - // public float CSBYHCUTADHESIONRESULTA { get; set; } - // /// - // /// 电芯裁切毛刺结果（mm） - // /// - // public float CSBYHCUTBURRRESULTA { get; set; } - // /// - // /// 芯包铜顶部到焊印间距1 - // /// - // public float CSBYHTOPTOSOLDERDISTANCEA { get; set; } - // /// - // /// 芯包铜顶部到焊印间距2 - // /// - // public float CSBYHTOPTOSOLDERDISTANCEA2 { get; set; } - // /// - // /// 芯包铝顶部到焊印间距1 - // /// - // public float AluminumToWeld1 { get; set; } - // /// - // /// 芯包铝顶部到焊印间距2 - // /// - // public float AluminumToWeld2 { get; set; } - // /// - // /// 芯包焊印边缘到极耳边缘间距（mm) - // /// - // public float CSBYHSOLDERTOEARDISTANCEA { get; set; } - // /// - // /// 芯包正面极耳撕裂裂纹检测结果（mm) - // /// - // public float CSBYHFRONTEARCRACKLERESULTA { get; set; } - // /// - // /// 芯包背面极耳撕裂裂纹检测结果（mm) - // /// - // public float CSBYHBACKEARCRACKLERESULTA { get; set; } + // /// + // /// 电芯A/B工序名 + // /// + // public string CSBYHPROCESSNAME { get; set; } + // /// + // /// 电芯A/B班次 + // /// + // public string CSBYHSCHEDULE { get; set; } + // /// + // /// 电芯A/B进站时间 + // /// + // public string CSBYHINSTATIONTIME { get; set; } + // /// + // /// 电芯A/B出站时间 + // /// + // public string CSBYHOUTSTATIONTIME { get; set; } + // /// + // /// 电芯A/B异常反馈信息 + // /// + // //public string CSBYHABNORMALINFORMATION { get; set; } + // /// + // /// 芯包重量1设定值最大值（g） + // /// + // public float CSBYHWEIGHTA1MAXSETTING { get; set; } + // /// + // /// 芯包重量1设定值最小值（g） + // /// + // public float CSBYHWEIGHTA1MINSETTING { get; set; } + // /// + // /// 芯包重量1（g） + // /// + // public float CSBYHWEIGHTA1 { get; set; } + // /// + // /// 芯包侧厚压力（Kg)设定最大值 + // /// + // public float CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA { get; set; } + // /// + // /// 芯包侧厚压力（Kg)设定最小值 + // /// + // public float CSBYHTHICKNESSTESTPRESSUREMINSETTINGA { get; set; } + // /// + // /// 芯包侧厚压力实际值 + // /// + // public float CSBYHTHICKNESSTESTPRESSUREA { get; set; } + // /// + // /// 芯包侧厚尺寸1（mm) + // /// + // public float CSBYHTHICKNESSTESTPRESSURESIZEA { get; set; } + // /// + // /// 芯包侧厚最大尺寸（mm) + // /// + // public float CSBYHTHICKNESSTESTPRESSUREMAXSIZEA { get; set; } + // /// + // /// 芯包侧厚最小尺寸（mm) + // /// + // public float CSBYHTHICKNESSTESTPRESSUREMINSIZEA { get; set; } + // /// + // /// 铜焊1压力(Psi)设定值最大值 + // /// + // public float CSBYHCUWELDINGPRESSUREMAXSETTING1 { get; set; } + // /// + // /// 铜焊2压力(Psi)设定值最大值 + // /// + // public float CSBYHCUWELDINGPRESSUREMAXSETTING2 { get; set; } + // /// + // /// 铜焊3压力(Psi)设定值最大值 + // /// + // public float CSBYHCUWELDINGPRESSUREMAXSETTING3 { get; set; } + // /// + // /// 铜焊接压力(Psi)设定值最小值 + // /// + // public float CSBYHCUWELDINGPRESSUREMINSETTING { get; set; } + // /// + // /// 铜焊1功率(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGPOWERMAXSETTING1 { get; set; } + // /// + // /// 铜焊2功率(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGPOWERMAXSETTING2 { get; set; } + // /// + // /// 铜焊3功率(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGPOWERMAXSETTING3 { get; set; } + // /// + // /// 铜焊1功率(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGPOWERMINSETTING1 { get; set; } + // /// + // /// 铜焊2功率(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGPOWERMINSETTING2 { get; set; } + // /// + // /// 铜焊3功率(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGPOWERMINSETTING3 { get; set; } + // /// + // /// 铜焊1能量(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGENERGYMAXSETTING1 { get; set; } + // /// + // /// 铜焊2能量(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGENERGYMAXSETTING2 { get; set; } + // /// + // /// 铜焊3能量(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGENERGYMAXSETTING3 { get; set; } + // /// + // /// 铜焊1能量(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGENERGYMINSETTING1 { get; set; } + // /// + // /// 铜焊2能量(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGENERGYMINSETTING2 { get; set; } + // /// + // /// 铜焊3能量(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGENERGYMINSETTING3 { get; set; } + // /// + // /// 铜焊1振幅(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGAMPLITUDEMAXSETTING1 { get; set; } + // /// + // /// 铜焊2振幅(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGAMPLITUDEMAXSETTING2 { get; set; } + // /// + // /// 铜焊3振幅(%)设定值最大值 + // /// + // public float CSBYHCUWELDINGAMPLITUDEMAXSETTING3 { get; set; } + // /// + // /// 铜焊1振幅(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGAMPLITUDEMINSETTING1 { get; set; } + // /// + // /// 铜焊2振幅(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGAMPLITUDEMINSETTING2 { get; set; } + // /// + // /// 铜焊3振幅(%)设定值最小值 + // /// + // public float CSBYHCUWELDINGAMPLITUDEMINSETTING3 { get; set; } + // /// + // /// 芯包铜焊焊接压力(Psi)实际值1 + // /// + // public float CSBYHCUPRESSUREA1 { get; set; } + // /// + // /// 芯包铜焊接功率(W)实际值1 + // /// + // public float CSBYHCUPOWERA1 { get; set; } + // /// + // /// 芯包铜焊焊接能量(J)实际值1 + // /// + // public float CSBYHCUENERGYA1 { get; set; } + // /// + // /// 芯包铜焊焊接振幅(%)实际值1 + // /// + // public float CSBYHCUAMPLITUDEA1 { get; set; } + // /// + // /// 芯包铜焊焊接时间(ms)实际值1 + // /// + // public float CSBYHCUTIMEA1 { get; set; } + // /// + // /// 芯包铜焊焊接压力(Psi)实际值2 + // /// + // public float CSBYHCUPRESSUREA2 { get; set; } + // /// + // /// 芯包铜焊接功率A(W)实际值2 + // /// + // public float CSBYHCUPOWERA2 { get; set; } + // /// + // /// 芯包铜焊焊接能量(J)实际值2 + // /// + // public float CSBYHCUENERGYA2 { get; set; } + // /// + // /// 芯包铜焊焊接振幅(%)实际值2 + // /// + // public float CSBYHCUAMPLITUDEA2 { get; set; } + // /// + // /// 芯包铜焊焊接时间(ms)实际值2 + // /// + // public float CSBYHCUTIMEA2 { get; set; } + // /// + // /// 芯包铜焊焊接压力(Psi)实际值3 + // /// + // public float CSBYHCUPRESSUREA3 { get; set; } + // /// + // /// 芯包铜焊接功率A(W)实际值3 + // /// + // public float CSBYHCUPOWERA3 { get; set; } + // /// + // /// 芯包铜焊焊接能量(J)实际值3 + // /// + // public float CSBYHCUENERGYA3 { get; set; } + // /// + // /// 芯包铜焊焊接振幅(%)实际值3 + // /// + // public float CSBYHCUAMPLITUDEA3 { get; set; } + // /// + // /// 芯包铜焊焊接时间(ms)实际值3 + // /// + // public float CSBYHCUTIMEA3 { get; set; } + // /// + // /// 铝焊1压力(Psi)设定值最大值 + // /// + // public float CSBYHALWELDINGPRESSUREMAXSETTING1 { get; set; } + // /// + // /// 铝焊2压力(Psi)设定值最大值 + // /// + // public float CSBYHALWELDINGPRESSUREMAXSETTING2 { get; set; } + // /// + // /// 铝焊3压力(Psi)设定值最大值 + // /// + // public float CSBYHALWELDINGPRESSUREMAXSETTING3 { get; set; } + // /// + // /// 铝焊接压力(Psi)设定值最小值 + // /// + // public float CSBYHALWELDINGPRESSUREMINSETTING { get; set; } + // /// + // /// 铝焊1功率(%)设定值最大值 + // /// + // public float CSBYHALWELDINGPOWERMAXSETTING1 { get; set; } + // /// + // /// 铝焊2功率(%)设定值最大值 + // /// + // public float CSBYHALWELDINGPOWERMAXSETTING2 { get; set; } + // /// + // /// 铝焊3功率(%)设定值最大值 + // /// + // public float CSBYHALWELDINGPOWERMAXSETTING3 { get; set; } + // /// + // /// 铝焊1功率(%)设定值最小值 + // /// + // public float CSBYHALWELDINGPOWERMINSETTING1 { get; set; } + // /// + // /// 铝焊2功率(%)设定值最小值 + // /// + // public float CSBYHALWELDINGPOWERMINSETTING2 { get; set; } + // /// + // /// 铝焊3功率(%)设定值最小值 + // /// + // public float CSBYHALWELDINGPOWERMINSETTING3 { get; set; } + // /// + // /// 铝焊1能量(%)设定值最大值 + // /// + // public float CSBYHALWELDINGENERGYMAXSETTING1 { get; set; } + // /// + // /// 铝焊2能量(%)设定值最大值 + // /// + // public float CSBYHALWELDINGENERGYMAXSETTING2 { get; set; } + // /// + // /// 铝焊3能量(%)设定值最大值 + // /// + // public float CSBYHALWELDINGENERGYMAXSETTING3 { get; set; } + // /// + // /// 铝焊1能量(%)设定值最小值 + // /// + // public float CSBYHALWELDINGENERGYMINSETTING1 { get; set; } + // /// + // /// 铝焊2能量(%)设定值最小值 + // /// + // public float CSBYHALWELDINGENERGYMINSETTING2 { get; set; } + // /// + // /// 铝焊3能量(%)设定值最小值 + // /// + // public float CSBYHALWELDINGENERGYMINSETTING3 { get; set; } + // /// + // /// 铝焊1振幅(%)设定值最大值 + // /// + // public float CSBYHALWELDINGAMPLITUDEMAXSETTING1 { get; set; } + // /// + // /// 铝焊2振幅(%)设定值最大值 + // /// + // public float CSBYHALWELDINGAMPLITUDEMAXSETTING2 { get; set; } + // /// + // /// 铝焊3振幅(%)设定值最大值 + // /// + // public float CSBYHALWELDINGAMPLITUDEMAXSETTING3 { get; set; } + // /// + // /// 铝焊1振幅(%)设定值最小值 + // /// + // public float CSBYHALWELDINGAMPLITUDEMINSETTING1 { get; set; } + // /// + // /// 铝焊2振幅(%)设定值最小值 + // /// + // public float CSBYHALWELDINGAMPLITUDEMINSETTING2 { get; set; } + // /// + // /// 铝焊3振幅(%)设定值最小值 + // /// + // public float CSBYHALWELDINGAMPLITUDEMINSETTING3 { get; set; } + // /// + // /// 芯包铝焊焊接压力(Psi)实际值1 + // /// + // public float CSBYHALPRESSUREA1 { get; set; } + // /// + // /// 芯包铝焊接功率(W)实际值1 + // /// + // public float CSBYHALPOWERA1 { get; set; } + // /// + // /// 芯包铝焊焊接能量(J)实际值1 + // /// + // public float CSBYHALENERGYA1 { get; set; } + // /// + // /// 芯包铝焊焊接振幅(%)实际值1 + // /// + // public float CSBYHALAMPLITUDEA1 { get; set; } + // /// + // /// 芯包铝焊焊接时间(ms)实际值1 + // /// + // public float CSBYHALTIMEA1 { get; set; } + // /// + // /// 芯包铝焊焊接压力(Psi)实际值2 + // /// + // public float CSBYHALPRESSUREA2 { get; set; } + // /// + // /// 芯包铝焊接功率(W)实际值2 + // /// + // public float CSBYHALPOWERA2 { get; set; } + // /// + // /// 芯包铝焊焊接能量(J)实际值2 + // /// + // public float CSBYHALENERGYA2 { get; set; } + // /// + // /// 芯包铝焊焊接振幅(%)实际值2 + // /// + // public float CSBYHALAMPLITUDEA2 { get; set; } + // /// + // /// 芯包铝焊焊接时间(ms)实际值2 + // /// + // public float CSBYHALTIMEA2 { get; set; } + // /// + // /// 芯包铝焊焊接压力(Psi)实际值3 + // /// + // public float CSBYHALPRESSUREA3 { get; set; } + // /// + // /// 芯包铝焊接功率(W)实际值3 + // /// + // public float CSBYHALPOWERA3 { get; set; } + // /// + // /// 芯包铝焊焊接能量(J)实际值3 + // /// + // public float CSBYHALENERGYA3 { get; set; } + // /// + // /// 芯包铝焊焊接振幅(%)实际值3 + // /// + // public float CSBYHALAMPLITUDEA3 { get; set; } + // /// + // /// 芯包铝焊焊接时间(ms)实际值3 + // /// + // public float CSBYHALTIMEA3 { get; set; } + // /// + // /// 电芯铜极极耳长度(mm) + // /// + // public float CSBYHCUTABLENGTHA { get; set; } + // /// + // /// 电芯铜极极耳宽度(mm) + // /// + // public float CSBYHCUTABWIDTHA { get; set; } + // /// + // /// 电芯铝极极耳长度(mm) + // /// + // public float CSBYHALTABLENGTHA { get; set; } + // /// + // /// 电芯铝极极耳宽度(mm) + // /// + // public float CSBYHALTABWIDTHA { get; set; } + // /// + // /// 电芯裁切粘连结果（mm） + // /// + // public float CSBYHCUTADHESIONRESULTA { get; set; } + // /// + // /// 电芯裁切毛刺结果（mm） + // /// + // public float CSBYHCUTBURRRESULTA { get; set; } + // /// + // /// 芯包铜顶部到焊印间距1 + // /// + // public float CSBYHTOPTOSOLDERDISTANCEA { get; set; } + // /// + // /// 芯包铜顶部到焊印间距2 + // /// + // public float CSBYHTOPTOSOLDERDISTANCEA2 { get; set; } + // /// + // /// 芯包铝顶部到焊印间距1 + // /// + // public float AluminumToWeld1 { get; set; } + // /// + // /// 芯包铝顶部到焊印间距2 + // /// + // public float AluminumToWeld2 { get; set; } + // /// + // /// 芯包焊印边缘到极耳边缘间距（mm) + // /// + // public float CSBYHSOLDERTOEARDISTANCEA { get; set; } + // /// + // /// 芯包正面极耳撕裂裂纹检测结果（mm) + // /// + // public float CSBYHFRONTEARCRACKLERESULTA { get; set; } + // /// + // /// 芯包背面极耳撕裂裂纹检测结果（mm) + // /// + // public float CSBYHBACKEARCRACKLERESULTA { get; set; } - // /// - // /// 物流线托盘码 - // /// - // //public short pan { get; set; } + // /// + // /// 物流线托盘码 + // /// + // //public short pan { get; set; } - // /// - // /// 标志 - // /// - // public int Flag { get; set; } - // /// - // /// 备注 - // /// - // public string Remark { get; set; } + // /// + // /// 标志 + // /// + // public int Flag { get; set; } + // /// + // /// 备注 + // /// + // public string Remark { get; set; } } } diff --git a/JinYuan.Models/CPKModel.cs b/JinYuan.Models/CPKModel.cs index 5e7b922..b10e4f1 100644 --- a/JinYuan.Models/CPKModel.cs +++ b/JinYuan.Models/CPKModel.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - - - - - -namespace JinYuan.Models +namespace JinYuan.Models { //子组大小：这个与计算内的CPK值又非常打的关系，即是分组的样本个数，数据的分组在此处需要说明的是，必须 //是根据实际情况来填写，比如每次抽样为5个，那么子组大小为5个，我们不能随心所欲的任意填写这个值，否则 diff --git a/JinYuan.Models/CPQCPTDate.cs b/JinYuan.Models/CPQCPTDate.cs index 18daa76..c0d7fd2 100644 --- a/JinYuan.Models/CPQCPTDate.cs +++ b/JinYuan.Models/CPQCPTDate.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.Models { @@ -14,19 +10,19 @@ namespace JinYuan.Models /// /// 注液前重量 /// - public string CTP_PreWeighing_Value { get; set; } + public string CTP_PreWeighing_Value { get; set; } /// /// 保液量 /// - public string CTP_Liquid_Retention_Value { get; set; } + public string CTP_Liquid_Retention_Value { get; set; } /// /// 注液量 /// - public string CTP_Filling_Value { get; set; } + public string CTP_Filling_Value { get; set; } /// /// 失液量 /// - public string CTP_Liquid_Loss_Value { get; set; } + public string CTP_Liquid_Loss_Value { get; set; } /// /// 充氦值 /// @@ -34,19 +30,19 @@ namespace JinYuan.Models /// /// 钟罩真空值 /// - public string CTP_Belljar_Vacuum_Value { get; set; } + public string CTP_Belljar_Vacuum_Value { get; set; } /// /// 钟罩真空时间 /// - public string CTP_Belljar_Vacuum_Time { get; set; } + public string CTP_Belljar_Vacuum_Time { get; set; } /// /// 钟罩高压值 /// - public string CTP_Belljar_HighPressure_Value { get; set; } + public string CTP_Belljar_HighPressure_Value { get; set; } /// /// 钟罩高压时间 /// - public string CTP_Belljar_HighPressure_Time { get; set; } + public string CTP_Belljar_HighPressure_Time { get; set; } /// /// 钟罩循环次数 /// @@ -54,7 +50,7 @@ namespace JinYuan.Models /// /// 回氦前真空值 /// - public string CTP_Pre_Helium_Value { get; set; } + public string CTP_Pre_Helium_Value { get; set; } /// /// 回氦后真空值 /// @@ -62,23 +58,23 @@ namespace JinYuan.Models /// /// 平压压力 /// - public string CTP_Flat_Pressure { get; set; } + public string CTP_Flat_Pressure { get; set; } /// /// 电芯测厚压力 /// - public string CTP_Cell_Thickness_Pressure { get; set; } + public string CTP_Cell_Thickness_Pressure { get; set; } /// /// 注液后重量 /// - public string CTQ_PostWeighing_Value { get; set; } + public string CTQ_PostWeighing_Value { get; set; } /// /// 电芯厚度 /// - public string CTQ_Cell_Thickness { get; set; } + public string CTQ_Cell_Thickness { get; set; } /// /// 终压胶粒高度 /// - public string CTQ_Finalpress_Rubber_Height { get; set; } + public string CTQ_Finalpress_Rubber_Height { get; set; } /// /// 注液前负压压力 /// @@ -104,9 +100,9 @@ namespace JinYuan.Models /// public string CTQ_Finalpress_Rubber_Thickness { get; set; } } - /// - /// 进出站上传数据 - /// + /// + /// 进出站上传数据 + /// public class EnterandExit { /// @@ -188,7 +184,7 @@ namespace JinYuan.Models /// /// 采集项数据列表 /// - public List taglist { get; set; } + public List taglist { get; set; } } @@ -197,7 +193,7 @@ namespace JinYuan.Models /// /// 时间 /// - public string device_time { get; set; } + public string device_time { get; set; } /// /// 采集项键值对 /// diff --git a/JinYuan.Models/Chart12HourData.cs b/JinYuan.Models/Chart12HourData.cs index 5e78da3..a86ef80 100644 --- a/JinYuan.Models/Chart12HourData.cs +++ b/JinYuan.Models/Chart12HourData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { /// /// 24小时统计表数据 diff --git a/JinYuan.Models/ChartDataType.cs b/JinYuan.Models/ChartDataType.cs index 7bc9a2c..21a2f48 100644 --- a/JinYuan.Models/ChartDataType.cs +++ b/JinYuan.Models/ChartDataType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { /// /// 不良統計 diff --git a/JinYuan.Models/DataTurnover.cs b/JinYuan.Models/DataTurnover.cs index 1e90f38..dfd5a5f 100644 --- a/JinYuan.Models/DataTurnover.cs +++ b/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 { diff --git a/JinYuan.Models/DeviceOEE.cs b/JinYuan.Models/DeviceOEE.cs index b0edaa6..49600a9 100644 --- a/JinYuan.Models/DeviceOEE.cs +++ b/JinYuan.Models/DeviceOEE.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.Models { diff --git a/JinYuan.Models/ElectricEnergy.cs b/JinYuan.Models/ElectricEnergy.cs index b0e7593..798b654 100644 --- a/JinYuan.Models/ElectricEnergy.cs +++ b/JinYuan.Models/ElectricEnergy.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { /// /// 智能电表 diff --git a/JinYuan.Models/Hourprod.cs b/JinYuan.Models/Hourprod.cs index d2f9504..52d1a96 100644 --- a/JinYuan.Models/Hourprod.cs +++ b/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 { diff --git a/JinYuan.Models/Properties/AssemblyInfo.cs b/JinYuan.Models/Properties/AssemblyInfo.cs index c23b09c..f08f0e6 100644 --- a/JinYuan.Models/Properties/AssemblyInfo.cs +++ b/JinYuan.Models/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/JinYuan.Models/SysConfig/ChallengeCode.cs b/JinYuan.Models/SysConfig/ChallengeCode.cs index da34084..3cfd130 100644 --- a/JinYuan.Models/SysConfig/ChallengeCode.cs +++ b/JinYuan.Models/SysConfig/ChallengeCode.cs @@ -1,9 +1,4 @@ -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; namespace JinYuan.Models { diff --git a/JinYuan.Models/SysConfig/Device.cs b/JinYuan.Models/SysConfig/Device.cs index 6c8e480..ca60ec0 100644 --- a/JinYuan.Models/SysConfig/Device.cs +++ b/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 { @@ -27,7 +23,7 @@ namespace JinYuan.Models /// /// PLC类型 /// - public string PLCType { get; set; } + public string PLCType { get; set; } /// /// 当前设备的连接状态 /// @@ -37,19 +33,19 @@ namespace JinYuan.Models /// /// 是否是首次连接 /// - + public bool IsFirstConnect { get; set; } = true; /// /// 重连周期 /// - + public int ReConnectTime { get; set; } = 2000; /// /// 休眠时间 /// - + public int SleepTime { get; set; } = 10; /// @@ -75,19 +71,19 @@ namespace JinYuan.Models /// /// 计时器 /// - + public Stopwatch Stopwatch { get; set; } /// /// 所有归档变量的集合 /// - + public List StoreVarList { get; set; } = new List(); /// /// 按工位读取 /// - + public List WorkVarList { get; set; } = new List(); /// /// 通信组集合 @@ -106,7 +102,7 @@ namespace JinYuan.Models /// /// 定义报警触发和消除事件 /// - public event Action AlarmTrigEvent; + public event Action AlarmTrigEvent; /// /// 变量初始化 @@ -142,7 +138,7 @@ namespace JinYuan.Models } - + /// /// 索引器，通过键名获取到数据 diff --git a/JinYuan.Models/SysConfig/Enum.cs b/JinYuan.Models/SysConfig/Enum.cs index aad638d..6bcc8fb 100644 --- a/JinYuan.Models/SysConfig/Enum.cs +++ b/JinYuan.Models/SysConfig/Enum.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { /// /// 所有窗体枚举，小于临界窗体的为固定窗体，不执行关闭 @@ -19,6 +13,6 @@ namespace JinYuan.Models 数据追溯, 参数设置, 系统设置, - 用户管理 + 用户管理 } } diff --git a/JinYuan.Models/SysConfig/Group.cs b/JinYuan.Models/SysConfig/Group.cs index c92d6fb..c1286ed 100644 --- a/JinYuan.Models/SysConfig/Group.cs +++ b/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 { @@ -19,7 +15,7 @@ namespace JinYuan.Models /// /// 起始地址 /// - public string Start { get; set; } + public string Start { get; set; } /// /// 长度 /// @@ -33,7 +29,7 @@ namespace JinYuan.Models /// 是否需要反馈结果到PLC /// public bool IsFeedbackPlc { get; set; } - + /// /// 是否启用 /// diff --git a/JinYuan.Models/SysConfig/ParamBase.cs b/JinYuan.Models/SysConfig/ParamBase.cs index ff123d1..a7261e3 100644 --- a/JinYuan.Models/SysConfig/ParamBase.cs +++ b/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 { diff --git a/JinYuan.Models/SysConfig/ParamList.cs b/JinYuan.Models/SysConfig/ParamList.cs index 11dd231..ef67072 100644 --- a/JinYuan.Models/SysConfig/ParamList.cs +++ b/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 { diff --git a/JinYuan.Models/SysConfig/ProductModel.cs b/JinYuan.Models/SysConfig/ProductModel.cs index 85c5049..a6aff95 100644 --- a/JinYuan.Models/SysConfig/ProductModel.cs +++ b/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 { diff --git a/JinYuan.Models/SysConfig/ProductModelParam.cs b/JinYuan.Models/SysConfig/ProductModelParam.cs index a1c26a9..dd9a377 100644 --- a/JinYuan.Models/SysConfig/ProductModelParam.cs +++ b/JinYuan.Models/SysConfig/ProductModelParam.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { /// /// 产品型号参数范围 diff --git a/JinYuan.Models/SysConfig/SysAdmin.cs b/JinYuan.Models/SysConfig/SysAdmin.cs index 2f285ce..068c4df 100644 --- a/JinYuan.Models/SysConfig/SysAdmin.cs +++ b/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 { @@ -12,7 +7,7 @@ namespace JinYuan.Models /// public class SysAdmin { - [SugarColumn(IsPrimaryKey = true,IsIgnore =true)] + [SugarColumn(IsPrimaryKey = true, IsIgnore = true)] public int LoginId { get; set; } public string LoginName { get; set; } public string LoginPwd { get; set; } diff --git a/JinYuan.Models/SysConfig/SysConfig.cs b/JinYuan.Models/SysConfig/SysConfig.cs index 455b46e..94da9e1 100644 --- a/JinYuan.Models/SysConfig/SysConfig.cs +++ b/JinYuan.Models/SysConfig/SysConfig.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { public class SysConfig { @@ -46,7 +40,7 @@ namespace JinYuan.Models /// /// MES/非MES模式切换 /// - public bool MesModeSwitching { get; set;} + public bool MesModeSwitching { get; set; } /// /// 切屏 /// @@ -64,6 +58,6 @@ namespace JinYuan.Models /// public bool SaveThreadTime { get; set; } - + } } diff --git a/JinYuan.Models/SysConfig/SysLog.cs b/JinYuan.Models/SysConfig/SysLog.cs index 1ad80d0..d1c82d1 100644 --- a/JinYuan.Models/SysConfig/SysLog.cs +++ b/JinYuan.Models/SysConfig/SysLog.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JinYuan.Models +namespace JinYuan.Models { public class SysLog { diff --git a/JinYuan.Models/SysConfig/Variable.cs b/JinYuan.Models/SysConfig/Variable.cs index c1ca1f7..3bdcb52 100644 --- a/JinYuan.Models/SysConfig/Variable.cs +++ b/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 { @@ -17,7 +11,7 @@ namespace JinYuan.Models /// 变量名称 /// public string VarName { get; set; } - + /// /// 变量地址 /// @@ -29,7 +23,7 @@ namespace JinYuan.Models /// /// 数据类型 /// - public string DataType { get; set; } + public string DataType { get; set; } /// /// 偏移或长度 /// @@ -37,7 +31,7 @@ namespace JinYuan.Models /// /// 所属通信组名称 /// - public string GroupName { get; set; } + public string GroupName { get; set; } /// /// 备注说明 /// @@ -45,11 +39,11 @@ namespace JinYuan.Models /// /// 是否上升沿报警 /// - public bool PosAlarm { get; set; } + public bool PosAlarm { get; set; } /// /// 是否下降沿报警 /// - public bool NegAlarm { get; set;} + public bool NegAlarm { get; set; } /// /// 转换系数 /// diff --git a/JinYuan.VirtualDataLibrary/CommonMethods.cs b/JinYuan.VirtualDataLibrary/CommonMethods.cs index 2110767..ea17426 100644 --- a/JinYuan.VirtualDataLibrary/CommonMethods.cs +++ b/JinYuan.VirtualDataLibrary/CommonMethods.cs @@ -1,18 +1,15 @@ -using JinYuan.DAL; -using JinYuan.CommunicationLib.Library; -using JinYuan.DataConvertLib; +using JinYuan.CommunicationLib; +using JinYuan.CommunicationLib.Base; +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 JinYuan.MES; -using JinYuan.CommunicationLib.Enum; -using JinYuan.CommunicationLib; -using JinYuan.CommunicationLib.Base; +using System.Windows.Forms; namespace JinYuan.VirtualDataLibrary { @@ -71,7 +68,7 @@ namespace JinYuan.VirtualDataLibrary public static SysConfig sysConfig = new SysConfig(); - + public static int InvadTime; @@ -83,7 +80,7 @@ namespace JinYuan.VirtualDataLibrary /// ///是否开启刷新 /// - public static bool isRefreshTimerWeeding=false; + public static bool isRefreshTimerWeeding = false; /// /// SQL语句 @@ -230,7 +227,7 @@ namespace JinYuan.VirtualDataLibrary /// /// PLC开机/运行时间地址 /// - public static List PlcOpenAndRunTimeAdress = new List { "D50", "D52" , "D54" , "D56" , "D58" , "D60"}; + public static List PlcOpenAndRunTimeAdress = new List { "D50", "D52", "D54", "D56", "D58", "D60" }; public static int ProdDRFIDNgQty = 0;//低托杯 public static int ProdDXNgQty = 0;//卷心码 public static int ProdGRFIDNgQty = 0;//高托杯 @@ -435,7 +432,7 @@ namespace JinYuan.VirtualDataLibrary sysConfig.GetMesParam = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "获取MES参数", "false")); sysConfig.OKSwitching = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "强制OK/正常NG模式切换", "false")); sysConfig.SaveThreadTime = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "线程耗时日志保存", "false")); - + } catch (Exception) { @@ -600,7 +597,7 @@ namespace JinYuan.VirtualDataLibrary /// 显示下料数据 /// public static Action> ShowBlankingDelegate; - + /// /// 数据监视委托 /// diff --git a/JinYuan.VirtualDataLibrary/DBSQL.cs b/JinYuan.VirtualDataLibrary/DBSQL.cs index b23e8f4..fac98fa 100644 --- a/JinYuan.VirtualDataLibrary/DBSQL.cs +++ b/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 { @@ -166,7 +162,7 @@ namespace JinYuan.VirtualDataLibrary { CommonMethods.AddLog(true, ex.Message); } - + return strSql; } diff --git a/JinYuan.VirtualDataLibrary/DelegateLib.cs b/JinYuan.VirtualDataLibrary/DelegateLib.cs index 860a54b..279e599 100644 --- a/JinYuan.VirtualDataLibrary/DelegateLib.cs +++ b/JinYuan.VirtualDataLibrary/DelegateLib.cs @@ -1,15 +1,10 @@ -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 { - + public delegate void dgStationFunction(JYResult bArrays, object plcModel); /// @@ -43,5 +38,5 @@ namespace JinYuan.VirtualDataLibrary /// public delegate void DGShowWeldingPowerData(List DataList); - + } diff --git a/JinYuan.VirtualDataLibrary/MesConfig.cs b/JinYuan.VirtualDataLibrary/MesConfig.cs index 9fc6f07..2294e38 100644 --- a/JinYuan.VirtualDataLibrary/MesConfig.cs +++ b/JinYuan.VirtualDataLibrary/MesConfig.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace JinYuan.VirtualDataLibrary { diff --git a/JinYuan.VirtualDataLibrary/Properties/AssemblyInfo.cs b/JinYuan.VirtualDataLibrary/Properties/AssemblyInfo.cs index 52f93ec..a8452d0 100644 --- a/JinYuan.VirtualDataLibrary/Properties/AssemblyInfo.cs +++ b/JinYuan.VirtualDataLibrary/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/LargeSquareOne/CustomMessageBox.cs b/LargeSquareOne/CustomMessageBox.cs index e8bd663..5b31374 100644 --- a/LargeSquareOne/CustomMessageBox.cs +++ b/LargeSquareOne/CustomMessageBox.cs @@ -9,11 +9,11 @@ namespace LargeSquareOne { DataTable dataTable = new DataTable(); string strLblMessage = ""; - + public CustomMessageBox(DataTable _dataTable, string _strLblMessage) { InitializeComponent(); - + dataTable = _dataTable; strLblMessage = _strLblMessage; @@ -34,7 +34,7 @@ namespace LargeSquareOne private void btnOK_Click(object sender, EventArgs e) { this.DialogResult = DialogResult.OK; - + } private void btnNo_Click(object sender, EventArgs e) { diff --git a/LargeSquareOne/FrmAlarmLog.cs b/LargeSquareOne/FrmAlarmLog.cs index df23765..68d7008 100644 --- a/LargeSquareOne/FrmAlarmLog.cs +++ b/LargeSquareOne/FrmAlarmLog.cs @@ -49,7 +49,7 @@ namespace LargeSquareOne Operater = CommonMethods.currentAdmin.LoginName }; //存储到数据库 - var b = CommonMethods.db.AddReturnBool(model); + var b = CommonMethods.db.AddReturnBool(model); if (!b) { LoggerHelp.WriteError($"数据库记录失败. 表：SysLog，内容:{model.ToJsonString()}"); diff --git a/LargeSquareOne/FrmCpkCount.cs b/LargeSquareOne/FrmCpkCount.cs index 8109a32..31d31cc 100644 --- a/LargeSquareOne/FrmCpkCount.cs +++ b/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 { @@ -42,7 +34,7 @@ namespace LargeSquareOne private void btn_Add_Click(object sender, EventArgs e) { - List data= GetSPCData(); + List data = GetSPCData(); // 计算Xbar和R double xbar = CalculateXbar(data); double r = CalculateR(data); @@ -53,7 +45,7 @@ namespace LargeSquareOne double uclR = CalculateUCLR(data.Count); double lclR = CalculateLCLR(data.Count); - + // 清空图表 chartControl.Series.Clear(); double xmaxValue = Math.Max(xbar, Math.Max(uclXbar, uclR)); @@ -89,7 +81,7 @@ namespace LargeSquareOne seriesR.Points.AddXY(i + 1, r); } - + } @@ -98,7 +90,7 @@ namespace LargeSquareOne { // 返回样本数据的List // 根据需要修改为实际的获取方法 - return new List{1.2, 1.3, 1.0, 2.5, 2.2, 2.8, 0.8, 0.9, 1.1}; + return new List { 1.2, 1.3, 1.0, 2.5, 2.2, 2.8, 0.8, 0.9, 1.1 }; } /// @@ -414,7 +406,7 @@ namespace LargeSquareOne double D3 = 0; // 控制系数 // 根据样本大小确定控制系数D3 - D3=GetD3(sampleSize); + D3 = GetD3(sampleSize); //对样本进行分组 List data = GetSPCData(); diff --git a/LargeSquareOne/FrmDataMonitor.cs b/LargeSquareOne/FrmDataMonitor.cs index b22d3cd..0b84632 100644 --- a/LargeSquareOne/FrmDataMonitor.cs +++ b/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 @@ -120,12 +118,12 @@ namespace LargeSquareOne CommonMethods.mesConfig.ModelName = gg.Text.ToString(); CommonMethods.mesConfig.MaterialCode = gg.Tag.ToString(); txtMaterialCode.Text = CommonMethods.mesConfig.MaterialCode; - - + + } } } - + catch (Exception ex) { //LogHelper.Instance.WriteEx("获取数据库型号异常", ex); @@ -135,7 +133,7 @@ namespace LargeSquareOne public bool IsNoOrg = false; public bool IsSetParam = false; - + private void cmbModelType_SelectedItemsChanged(object sender, EventArgs e) { @@ -370,7 +368,7 @@ namespace LargeSquareOne { listTA.Add(m); } - if (listTA.Count >=500) + if (listTA.Count >= 500) { listTA.Clear(); GC.Collect(); @@ -566,7 +564,7 @@ namespace LargeSquareOne btSatrt.Enabled = !b; btStop.Enabled = b; - cmbModelType.Enabled =true; + cmbModelType.Enabled = true; txtMaterialCode.Enabled = !b; } @@ -615,7 +613,7 @@ namespace LargeSquareOne StringFormat sf = new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center };//字体水平位置居左，垂直居中 private void lVConfigRange_DrawColumnHeader(object sender, DrawListViewColumnHeaderEventArgs e) { - + e.Graphics.FillRectangle(Brushes.RoyalBlue, e.Bounds); //设置背景颜色 Font font = new Font("微软雅黑", 12, FontStyle.Bold); //设置字体大小 e.Graphics.DrawString(e.Header.Text, font, Brushes.White, e.Bounds, sf); //设置字体颜色 diff --git a/LargeSquareOne/FrmGroupConfig.cs b/LargeSquareOne/FrmGroupConfig.cs index 8b8e254..5b9f9d7 100644 --- a/LargeSquareOne/FrmGroupConfig.cs +++ b/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 { @@ -62,7 +56,7 @@ namespace LargeSquareOne return new List(); } - + } /// @@ -112,10 +106,10 @@ namespace LargeSquareOne /// private void btn_Add_Click(object sender, EventArgs e) { - string groupName =this.txt_GroupName.Text.Trim(); - if (groupName.Length==0) + string groupName = this.txt_GroupName.Text.Trim(); + if (groupName.Length == 0) { - new FrmMsgBoxOutWithAck(2,"通信组名称不能为空！", "添加通信组").Show(); + new FrmMsgBoxOutWithAck(2, "通信组名称不能为空！", "添加通信组").Show(); return; } @@ -127,28 +121,28 @@ namespace LargeSquareOne TotalGroups.Add(new Group() { - GroupName=this.txt_GroupName.Text, - Start=this.txtStart.Text, + GroupName = this.txt_GroupName.Text, + Start = this.txtStart.Text, Length = Convert.ToUInt16(this.num_Length.Value), - IsTiggerRead = this.ckb_IsTiggerRead.Checked ?true : false, - IsFeedbackPlc= this.chk_IsFeedbackPlc.Checked ? true : false, + IsTiggerRead = this.ckb_IsTiggerRead.Checked ? true : false, + IsFeedbackPlc = this.chk_IsFeedbackPlc.Checked ? true : false, IsActive = this.ckb_IsEnable.Checked ? true : false, - Remark =this.txt_Remark.Text.Trim() + Remark = this.txt_Remark.Text.Trim() }); try { MiniExcel.SaveAs(groupPath, TotalGroups, overwriteFile: true); - new FrmMsgBoxOutWithAck(1,"添加通信组成功", "添加通信组").Show(); + new FrmMsgBoxOutWithAck(1, "添加通信组成功", "添加通信组").Show(); //刷新数据 RefreshGroup(); } catch (Exception ex) { - new FrmMsgBoxOutWithAck(3,"添加通信组失败:"+ex.Message, "添加通信组").Show(); + new FrmMsgBoxOutWithAck(3, "添加通信组失败:" + ex.Message, "添加通信组").Show(); } - + } /// @@ -159,7 +153,7 @@ namespace LargeSquareOne private void btn_Delete_Click(object sender, EventArgs e) { string groupName = this.txt_GroupName.Text.Trim(); - + if (IsGroupNameExits(groupName)) { new FrmMsgBoxOutWithAck(2, "通信组名称不存在！", "删除通信组").Show(); @@ -196,11 +190,11 @@ namespace LargeSquareOne return; } - var group =TotalGroups.Find(c=>c.GroupName == groupName); + var group = TotalGroups.Find(c => c.GroupName == groupName); group.Start = this.txtStart.Text; group.Length = Convert.ToUInt16(this.num_Length.Value); - group.IsTiggerRead = this.ckb_IsTiggerRead.Checked ? true: false; + group.IsTiggerRead = this.ckb_IsTiggerRead.Checked ? true : false; group.IsFeedbackPlc = this.chk_IsFeedbackPlc.Checked ? true : false; group.IsActive = this.ckb_IsEnable.Checked ? true : false; group.Remark = this.txt_Remark.Text.Trim(); @@ -247,14 +241,15 @@ namespace LargeSquareOne /// private void dgv_Main_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { - if (e.ColumnIndex >= 0&&e.RowIndex>=0) + if (e.ColumnIndex >= 0 && e.RowIndex >= 0) { object value = this.dgv_Main.Rows[e.RowIndex].Cells[e.ColumnIndex].Value; - if (value == null||value.ToString().Length==0) - { - e.Value = "---"; - }; + if (value == null || value.ToString().Length == 0) + { + e.Value = "---"; + } + ; } } @@ -266,7 +261,7 @@ namespace LargeSquareOne /// private void dgv_Main_CellClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex>=0) + if (e.RowIndex >= 0) { UpdateGroup(TotalGroups[e.RowIndex]); } @@ -274,7 +269,7 @@ namespace LargeSquareOne private void UpdateGroup(Group group) { - if (group!=null) + if (group != null) { this.txt_GroupName.Text = group.GroupName; this.txtStart.Text = group.Start; @@ -282,7 +277,7 @@ namespace LargeSquareOne this.ckb_IsTiggerRead.Checked = group.IsTiggerRead; this.chk_IsFeedbackPlc.Checked = group.IsFeedbackPlc; this.ckb_IsEnable.Checked = group.IsActive; - this.txt_Remark.Text = group.Remark; + this.txt_Remark.Text = group.Remark; } } } diff --git a/LargeSquareOne/FrmHelper.cs b/LargeSquareOne/FrmHelper.cs index 5992378..98823e7 100644 --- a/LargeSquareOne/FrmHelper.cs +++ b/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 diff --git a/LargeSquareOne/FrmLogin.cs b/LargeSquareOne/FrmLogin.cs index 068a933..c7bbd9c 100644 --- a/LargeSquareOne/FrmLogin.cs +++ b/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 @@ -21,7 +15,7 @@ namespace LargeSquareOne InitializeComponent(); this.Load += FrmLogin_Load; } - + private void FrmLogin_Load(object sender, EventArgs e) { CommonMethods.GetSysConfig(); @@ -44,13 +38,13 @@ namespace LargeSquareOne //数据验证 if (this.txt_LoginName.Text.Trim().Length == 0) { - new FrmMsgBoxOutWithAck(2,"请填写登录用户名", "登录提示").ShowDialog(); + new FrmMsgBoxOutWithAck(2, "请填写登录用户名", "登录提示").ShowDialog(); this.txt_LoginName.Focus(); return; } if (this.txt_LoginPwd.Text.Trim().Length == 0) { - new FrmMsgBoxOutWithAck(2,"请填写登录用密码", "登录提示").ShowDialog(); + new FrmMsgBoxOutWithAck(2, "请填写登录用密码", "登录提示").ShowDialog(); this.txt_LoginPwd.Focus(); return; } @@ -66,7 +60,7 @@ namespace LargeSquareOne sysAdmin = CommonMethods.db.Query(it => it.LoginName == sysAdmin.LoginName && it.LoginPwd == sysAdmin.LoginPwd); if (sysAdmin == null) { - new FrmMsgBoxOutWithAck(3,"登录用户或密码错误！！！", "登录提示").ShowDialog(); + new FrmMsgBoxOutWithAck(3, "登录用户或密码错误！！！", "登录提示").ShowDialog(); return; } else @@ -75,7 +69,7 @@ namespace LargeSquareOne CommonMethods.LoginOut = false; //存储用户对象 CommonMethods.currentAdmin = sysAdmin; - CommonMethods.IsLoginOk = true; + CommonMethods.IsLoginOk = true; } } @@ -244,6 +238,6 @@ namespace LargeSquareOne #endregion - + } } diff --git a/LargeSquareOne/FrmLoginMes.cs b/LargeSquareOne/FrmLoginMes.cs index 4ac9378..5529230 100644 --- a/LargeSquareOne/FrmLoginMes.cs +++ b/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 @@ -57,7 +50,7 @@ namespace LargeSquareOne CommonMethods.mesConfig.mesPwd = this.txt_LoginMesPwd.Text.Trim(); string Mesage = ""; string UserCardID = CommonMethods.currentAdmin.LoginUid; - bool Res = CommonMethods.hbgMes.LoginEnyity(CommonMethods.mesConfig.LoginMesUrl, CommonMethods.mesConfig.siteCode, CommonMethods.mesConfig.lineCode, CommonMethods.mesConfig.equipNum, CommonMethods.mesConfig.mesUserName, CommonMethods.mesConfig.mesPwd, UserCardID, ref Mesage); + bool Res = CommonMethods.hbgMes.LoginEnyity(CommonMethods.mesConfig.LoginMesUrl, CommonMethods.mesConfig.siteCode, CommonMethods.mesConfig.lineCode, CommonMethods.mesConfig.equipNum, CommonMethods.mesConfig.mesUserName, CommonMethods.mesConfig.mesPwd, UserCardID, ref Mesage); if (!Res) { new FrmMsgBoxOutWithAck(3, Mesage, "登录提示").ShowDialog(); @@ -73,7 +66,7 @@ namespace LargeSquareOne } } - + private void txt_LoginMesName_KeyDown(object sender, KeyEventArgs e) { diff --git a/LargeSquareOne/FrmMain.cs b/LargeSquareOne/FrmMain.cs index c99482f..cecac8b 100644 --- a/LargeSquareOne/FrmMain.cs +++ b/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 { @@ -68,7 +68,7 @@ namespace LargeSquareOne CommonMethods.listener.ScanerEvent += Listener_ScanerEvent; CommonMethods.listener.Start(); - + this.Load += FrmMain_Load; this.FormClosing += FrmMain_FormClosing; @@ -99,10 +99,10 @@ namespace LargeSquareOne private void FrmMain_Load(object sender, EventArgs e) { - + InitReadInI(); UserTimeOut(30); - + ControlCenter controlCenter = ControlCenter.Instance; //1.设置登录用户 @@ -169,7 +169,7 @@ namespace LargeSquareOne { CommonMethods.mesConfig.electricMeterNum.Add(strArray[i]); } - + } CommonMethods.mesConfig.listAntiDustAirSpeedNum.Clear(); @@ -208,7 +208,7 @@ namespace LargeSquareOne //CommonMethods.ProdDXNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDXNgQty", "0")); //CommonMethods.ProdGRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdGRFIDNgQty", "0")); //CommonMethods.ProdYLZNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdYLZNgQty", "0")); - + } #endregion @@ -222,7 +222,7 @@ namespace LargeSquareOne CommonMethods.tickCount++; if (CommonMethods.tickCount == CommonMethods.sysConfig.LockPeriod * 60 * 1000 / this.updateTimer.Interval) { - + //锁屏 LockWorkStation(); } @@ -236,7 +236,7 @@ namespace LargeSquareOne CommonNaviButton_Click(this.nav_Monitor, null); } } - + } @@ -261,7 +261,7 @@ namespace LargeSquareOne sysAdmin = CommonMethods.db.Query(it => it.LoginUid == sysAdmin.LoginUid); if (sysAdmin == null) { - + new FrmMsgBoxOutWithAck(3, "登录用户或密码错误！！！", "登录提示").ShowDialog(); return; } @@ -280,7 +280,7 @@ namespace LargeSquareOne } - + private void StoreTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) @@ -336,7 +336,7 @@ namespace LargeSquareOne CommonNaviButton_Click(this.nav_DataMonitor, null); CommonMethods.sysConfig.ScreenCutting = false; } - + if (CommonMethods.Statues != null && CommonMethods.Statues.Count > 0) { diff --git a/LargeSquareOne/FrmMesParamMsgBoxWithAck.cs b/LargeSquareOne/FrmMesParamMsgBoxWithAck.cs index 1c0f166..12b675b 100644 --- a/LargeSquareOne/FrmMesParamMsgBoxWithAck.cs +++ b/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 @@ -47,14 +42,14 @@ namespace LargeSquareOne private Point mPoint; private void Panel_MouseDown(object sender, MouseEventArgs e) { - mPoint=new Point(e.X, e.Y); + mPoint = new Point(e.X, e.Y); } private void Panel_MouseMove(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) { - this.Location=new Point(this.Location.X+e.X-mPoint.X,this.Location.Y+e.Y-mPoint.Y); + this.Location = new Point(this.Location.X + e.X - mPoint.X, this.Location.Y + e.Y - mPoint.Y); } } #endregion diff --git a/LargeSquareOne/FrmMsgBoxOutWithAck.cs b/LargeSquareOne/FrmMsgBoxOutWithAck.cs index fdb9543..f9330d6 100644 --- a/LargeSquareOne/FrmMsgBoxOutWithAck.cs +++ b/LargeSquareOne/FrmMsgBoxOutWithAck.cs @@ -1,18 +1,12 @@ 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 { public partial class FrmMsgBoxOutWithAck : Form { - public FrmMsgBoxOutWithAck(int type,string content, string title) + public FrmMsgBoxOutWithAck(int type, string content, string title) { InitializeComponent(); @@ -21,7 +15,7 @@ namespace LargeSquareOne this.lbl_Content.Text = content; this.lbl_Title.Text = title; - switch(type) + switch (type) { case 1: this.pic_TitleImage.Image = LargeSquareOne.Properties.Resources.info; @@ -33,7 +27,7 @@ namespace LargeSquareOne this.pic_TitleImage.Image = LargeSquareOne.Properties.Resources.error; break; } - + } @@ -42,14 +36,14 @@ namespace LargeSquareOne private Point mPoint; private void Panel_MouseDown(object sender, MouseEventArgs e) { - mPoint=new Point(e.X, e.Y); + mPoint = new Point(e.X, e.Y); } private void Panel_MouseMove(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) { - this.Location=new Point(this.Location.X+e.X-mPoint.X,this.Location.Y+e.Y-mPoint.Y); + this.Location = new Point(this.Location.X + e.X - mPoint.X, this.Location.Y + e.Y - mPoint.Y); } } #endregion diff --git a/LargeSquareOne/FrmMsgBoxWithAck.cs b/LargeSquareOne/FrmMsgBoxWithAck.cs index 47c3159..a316c85 100644 --- a/LargeSquareOne/FrmMsgBoxWithAck.cs +++ b/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 @@ -41,14 +35,14 @@ namespace LargeSquareOne private Point mPoint; private void Panel_MouseDown(object sender, MouseEventArgs e) { - mPoint=new Point(e.X, e.Y); + mPoint = new Point(e.X, e.Y); } private void Panel_MouseMove(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) { - this.Location=new Point(this.Location.X+e.X-mPoint.X,this.Location.Y+e.Y-mPoint.Y); + this.Location = new Point(this.Location.X + e.X - mPoint.X, this.Location.Y + e.Y - mPoint.Y); } } #endregion diff --git a/LargeSquareOne/FrmParamSet.cs b/LargeSquareOne/FrmParamSet.cs index 1816bf9..8d2e651 100644 --- a/LargeSquareOne/FrmParamSet.cs +++ b/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 @@ -364,7 +363,7 @@ namespace LargeSquareOne private void tog_OKSwitching_CheckedChanged(object sender, EventArgs e) { - + if (CommonMethods.plcDevice.IsConnected && CommonMethods.sysConfig.OKSwitching) { CommonMethods.sysConfig.OKSwitching = true; diff --git a/LargeSquareOne/FrmRecipe.cs b/LargeSquareOne/FrmRecipe.cs index d30f45a..279a7f1 100644 --- a/LargeSquareOne/FrmRecipe.cs +++ b/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 diff --git a/LargeSquareOne/FrmStaticsQuery.cs b/LargeSquareOne/FrmStaticsQuery.cs index 1f67536..aac3805 100644 --- a/LargeSquareOne/FrmStaticsQuery.cs +++ b/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 diff --git a/LargeSquareOne/FrmUserManage.cs b/LargeSquareOne/FrmUserManage.cs index c5f43a5..d073a04 100644 --- a/LargeSquareOne/FrmUserManage.cs +++ b/LargeSquareOne/FrmUserManage.cs @@ -1,5 +1,4 @@ -using HML; -using JinYuan.Helper; +using JinYuan.Helper; using JinYuan.Models; using JinYuan.VirtualDataLibrary; using System; @@ -52,7 +51,7 @@ namespace LargeSquareOne this.txtICCard.Text = sysAdmin.LoginUid; this.txt_LoginPwd.Text = sysAdmin.LoginPwd; this.txt_LoginPwd2.Text = sysAdmin.LoginPwd; - this.cmbUserLevel.Text= sysAdmin.LoginLevel; + this.cmbUserLevel.Text = sysAdmin.LoginLevel; this.chk_SystemLog.Checked = sysAdmin.SystemLog; this.chk_CPK.Checked = sysAdmin.CpkData; this.chk_HistorySelect.Checked = sysAdmin.HistoryData; @@ -202,7 +201,7 @@ namespace LargeSquareOne LoginId = sysAdmins[this.dgv_Main.SelectedRows[0].Index].LoginId, LoginName = this.txt_LoginName.Text.Trim(), LoginPwd = StringSecurityHelper.DESEncrypt(this.txt_LoginPwd.Text.Trim()), - LoginUid=this.txtICCard.Text.Trim(), + LoginUid = this.txtICCard.Text.Trim(), LoginLevel = CommonMethods.mesConfig.userLevel, SystemLog = this.chk_SystemLog.Checked, CpkData = this.chk_CPK.Checked, @@ -306,14 +305,14 @@ namespace LargeSquareOne } } - DateTime dt1; + DateTime dt1; DateTime dt2; private void txtICCard_KeyUp(object sender, KeyEventArgs e) { - string Item= txtICCard.Text.Trim(); - if (txtICCard.TextLength==1) + string Item = txtICCard.Text.Trim(); + if (txtICCard.TextLength == 1) { - dt1 =System.DateTime.Now; + dt1 = System.DateTime.Now; } if (txtICCard.TextLength == 2) { diff --git a/LargeSquareOne/FrmVariableConfig.cs b/LargeSquareOne/FrmVariableConfig.cs index da7a1a0..a77bd6e 100644 --- a/LargeSquareOne/FrmVariableConfig.cs +++ b/LargeSquareOne/FrmVariableConfig.cs @@ -335,7 +335,8 @@ namespace LargeSquareOne if (value == null || value.ToString().Length == 0) { e.Value = "---"; - }; + } + ; } } @@ -352,7 +353,7 @@ namespace LargeSquareOne int index = e.RowIndex; UpdateVariable(SignelVariables[e.RowIndex]); //Variable variable - + } } diff --git a/LargeSquareOne/Program.cs b/LargeSquareOne/Program.cs index 7ac66c8..15d6039 100644 --- a/LargeSquareOne/Program.cs +++ b/LargeSquareOne/Program.cs @@ -1,18 +1,12 @@ -using JinYuan.ControlCenters; -using JinYuan.Helper; -using JinYuan.Models; +using JinYuan.Helper; using JinYuan.VirtualDataLibrary; -using NLog; -using NLog.Config; using System; -using System.Collections.Generic; using System.Configuration; using System.Diagnostics; using System.Linq; using System.Reflection; using System.Runtime.InteropServices; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms; namespace LargeSquareOne diff --git a/LargeSquareOne/Properties/AssemblyInfo.cs b/LargeSquareOne/Properties/AssemblyInfo.cs index 11fd554..3246faf 100644 --- a/LargeSquareOne/Properties/AssemblyInfo.cs +++ b/LargeSquareOne/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/LargeSquareOne/trw.cs b/LargeSquareOne/trw.cs index fed5dc8..da8d180 100644 --- a/LargeSquareOne/trw.cs +++ b/LargeSquareOne/trw.cs @@ -27,7 +27,7 @@ namespace LargeSquareOne #endregion - private int subgroupSize =5; + private int subgroupSize = 5; [Browsable(true)] [Category("自定义属性")] [Description("设置或获取子组大小值")] @@ -86,9 +86,9 @@ namespace LargeSquareOne this.Invalidate(); } } - - private CPKModel _cPKData=new CPKModel(); + + private CPKModel _cPKData = new CPKModel(); [Browsable(true)] [Category("自定义属性")] [Description("获取目标值")] @@ -97,7 +97,7 @@ namespace LargeSquareOne get { return _cPKData; } set { - if (value!=null) + if (value != null) { _cPKData = value; //总样本数 @@ -114,7 +114,7 @@ namespace LargeSquareOne listView1.Items[3].SubItems[3].Text = _cPKData.Neg3Sigma.ToString(); // 组内标准差值 - listView2.Items[0].SubItems[1].Text= _cPKData.GroupSTDEV.ToString(); + listView2.Items[0].SubItems[1].Text = _cPKData.GroupSTDEV.ToString(); // 整体标准差值 listView2.Items[0].SubItems[2].Text = _cPKData.WholeSTDEV.ToString(); @@ -151,10 +151,10 @@ namespace LargeSquareOne // 整体PPMN Total值 listView2.Items[7].SubItems[2].Text = _cPKData.WholePPM_Total.ToString(); - lbl_Ca.Text= _cPKData.CA.ToString(); + lbl_Ca.Text = _cPKData.CA.ToString(); this.Invalidate(); } - + } } @@ -172,15 +172,15 @@ namespace LargeSquareOne // 假设ListView控件的名称为listView1 // 添加列头 - listView1.Columns.Add("项目1",80); - listView1.Columns.Add("数值1",90); - listView1.Columns.Add("项目2",80); + listView1.Columns.Add("项目1", 80); + listView1.Columns.Add("数值1", 90); + listView1.Columns.Add("项目2", 80); listView1.Columns.Add("数值2", 90); listView1.Columns.Add("项目3", 80); listView1.Columns.Add("数值3", 95); // 创建一个ListViewItem对象，并将数据添加到指定单元格 0 - ListViewItem item1_1 = new ListViewItem("总样本数"); + ListViewItem item1_1 = new ListViewItem("总样本数"); item1_1.SubItems.Add("0"); item1_1.SubItems.Add("子组大小"); item1_1.SubItems.Add("0"); @@ -233,32 +233,32 @@ namespace LargeSquareOne item2_2.SubItems.Add("0"); item2_2.SubItems.Add("0"); item2_2.SubItems.Add(""); - listView2.Items.Add(item2_2); + listView2.Items.Add(item2_2); ListViewItem item2_3 = new ListViewItem("CP");//2 item2_3.SubItems.Add("0"); item2_3.SubItems.Add("0"); item2_3.SubItems.Add(""); - listView2.Items.Add(item2_3); + listView2.Items.Add(item2_3); ListViewItem item2_4 = new ListViewItem("CPL");//3 item2_4.SubItems.Add("0"); item2_4.SubItems.Add("0"); item2_4.SubItems.Add(""); - listView2.Items.Add(item2_4); + listView2.Items.Add(item2_4); ListViewItem item2_5 = new ListViewItem("CPU");//4 item2_5.SubItems.Add("0"); item2_5.SubItems.Add("0"); item2_5.SubItems.Add(""); - listView2.Items.Add(item2_5); + listView2.Items.Add(item2_5); ListViewItem item2_6 = new ListViewItem("PPMUSL");//6 item2_7.SubItems.Add("0"); item2_7.SubItems.Add("0"); item2_7.SubItems.Add("0"); - listView2.Items.Add(item2_7); + listView2.Items.Add(item2_7); ListViewItem item2_8 = new ListViewItem("PPM Total");//7 item2_8.SubItems.Add("0"); item2_8.SubItems.Add("0");