diff --git a/JinYuan.ControlCenter/ControlCenter.cs b/JinYuan.ControlCenter/ControlCenter.cs index e85db2c..ee70f6a 100644 --- a/JinYuan.ControlCenter/ControlCenter.cs +++ b/JinYuan.ControlCenter/ControlCenter.cs @@ -262,14 +262,14 @@ namespace JinYuan.ControlCenters JYResult resByte = CommonMethods.PlcLink.ReadValue>($"{pf.VarList[1].VarAddress}", Data_Type.ArrByte, Convert.ToUInt16(pf.VarList[1].OffsetOrLenght)); sw1.Stop(); CommonMethods.AddDataMonitorLog(0, $"{pf.GroupName},耗时：{sw1.Elapsed.TotalMilliseconds}ms"); - LogHelper.Instance.WriteLog("循环读取PLC工位", $"读取工位:{pf.GroupName},启动读取字节共耗时：" + sw1.Elapsed.TotalMilliseconds); + LogHelper.Instance.WriteLog( $"读取工位:{pf.GroupName},启动读取字节共耗时：" + sw1.Elapsed.TotalMilliseconds, "循环读取PLC工位"); //置位 PLC-防止重复读取 CommonMethods.PlcLink.WriteInt16(pf.VarList[0].VarAddress, 2);//置位，读取进行中的标志 if (resByte == null) { CommonMethods.AddDataMonitorLog(0, $"上料工位:{pf.GroupName},起始地址:{pf.VarList[1].VarAddress},得到空字节数组"); - LogHelper.Instance.WriteLog("循环读取PLC上料工位", $"读取工位:{pf.GroupName},起始地址:{pf.VarList[1].VarAddress},得到空字节数组"); + LogHelper.Instance.WriteLog( $"读取工位:{pf.GroupName},起始地址:{pf.VarList[1].VarAddress},得到空字节数组", "循环读取PLC上料工位"); } else { diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 0b74589..d5a4867 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -157,112 +157,37 @@ namespace JinYuan.ControlCenters // return Result; //} /// - /// 判断总结果 + /// 判断总结果 Code_NG /// - 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极性检测，芯包正面极耳撕裂，芯包正面极耳翻折 + private int JudgmentResult(int Code_NG, int[,] CCD_Data,int codeIndex) + { int Result = 0; OK_NG = "OK"; - 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 1 = OK 2 = NG + if (Code_NG == 2) { NG_Type += "无条码_"; + OK_NG = "NG"; Result = 2; } - if (B == 2) + //CCD 判定 + for (int i = 0; i < 27; i++) { - 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; - } + //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; + } + } - //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 上料工位(数据处理) @@ -1747,17 +1672,22 @@ namespace JinYuan.ControlCenters AGearEntity TT = new AGearEntity(); //极限件标志 int ChallengeFlag = 0; - //芯包信息1 D3300~D3326 - //芯包信息2 D3330~D3356 - //芯包信息3 D3360~D3386 - for (int j = 0; j < 27; j++) + //芯包信息1 D3300~D3327 + //芯包信息2 D3330~D3357 + //芯包信息3 D3360~D3387 + for (int j = 0; j < 28; j++) { m.CCD_Data[i,j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB); } - for (int j = 0; j < 3; j++) + //电芯1缺陷代码 D3400~D3427 + //电芯2缺陷代码 D3430~D3457 + //电芯3缺陷代码 D3460~D3487 + for (int j = 0; j < 28; j++) { - m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB); + m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 2, 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"); @@ -1808,38 +1738,40 @@ namespace JinYuan.ControlCenters //不良代码判定 List NGcodeList = new List(); - 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]); + 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]); //电芯CCD判定结果 #region //电芯CCD判定结果 - 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" : "缺图"); + 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" : "缺图"); #endregion m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -1848,31 +1780,18 @@ namespace JinYuan.ControlCenters m.CSBYHINSTATIONTIME = m.ScanTime[0]; m.CSBYHOUTSTATIONTIME = m.ScanTime[1]; - m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]); - m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]); - m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]); + //电芯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]); - //条码，芯包重量，芯包侧厚，芯包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); + + //芯包OKNG结果值判定 + MyRes[i] = JudgmentResult(Code_NG, m.CCD_Data,i); m.Result = MyRes[i]; - m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG; + m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG; m.Remark += NG_Type; @@ -1920,12 +1839,7 @@ 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 @@ -1951,12 +1865,7 @@ 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 @@ -1984,13 +1893,7 @@ namespace JinYuan.ControlCenters else { m.Result = MyRes[i] = 2; - m.Remark += "本地存储"; - //芯包重量1判定结果 - if (m.list_Data1[i, 10] == 2) { m.Remark += ",芯包重量NG"; } - //芯包侧厚判定结果 - if (m.list_Data1[i, 11] == 2) { m.Remark += ",芯包侧厚NG"; } - //芯包CCD极性检测结果 - if (m.list_Data1[i, 12] == 2) { m.Remark += ",芯包CCD极性检测NG"; } + m.Remark += "本地存储"; m.UpState = "未上传"; } //极限件发3给PLC @@ -2219,9 +2122,31 @@ 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 21d5248..072ce52 100644 --- a/JinYuan.ControlCenter/ControlCenter_Total.cs +++ b/JinYuan.ControlCenter/ControlCenter_Total.cs @@ -375,7 +375,7 @@ namespace JinYuan.ControlCenters param.equipNum = CommonMethods.mesConfig.equipNum; param.userName = CommonMethods.mesConfig.mesUserName; param.electricMeterNum = CommonMethods.mesConfig.electricMeterNum[i]; - param.recordDate = nowDate.ToString("yyyy/MM/dd HH:mm:ss"); + param.recordDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss"); param.accumulatedElectricity = (decimal)m.AccumulatedElectricity; param.phaseVoltageA = (decimal)m.PhaseVoltageA; param.phaseVoltageB = (decimal)m.PhaseVoltageB; @@ -400,7 +400,7 @@ namespace JinYuan.ControlCenters filePath = $@"{CommonMethods.strWattrMeterpath}\{nowDate.Year}\{nowDate.Month}"; fileName = $@"{nowDate.Day}.csv"; fileTitle = "工序名称,生产机台编号,拉线,型号,物料编号,操作人员,班次,电表编号,采集时间,有功电能（累计电能）KwH,A相电压 V,B相电压 V,C相电压 V,A相电流 A,B相电流 A,C相电流 A,A相功率 Kw,B相功率 Kw,C相功率 Kw,总有功功率 Kw,总功率因数 %,电压变比,电流变比"; - fileContent = $"入壳A工序,{CommonMethods.mesConfig.equipNum},{CommonMethods.mesConfig.lineCode},{productName},{CommonMethods.mesConfig.MaterialCode},{CommonMethods.mesConfig.mesUserName},{CommonMethods.strClass},{param.electricMeterNum},{nowDate.ToString("yyyy-MM-dd HH:mm:ss")}," + + fileContent = $"外观检工序,{CommonMethods.mesConfig.equipNum},{CommonMethods.mesConfig.lineCode},{productName},{CommonMethods.mesConfig.MaterialCode},{CommonMethods.mesConfig.mesUserName},{CommonMethods.strClass},{param.electricMeterNum},{nowDate.ToString("yyyy-MM-dd HH:mm:ss")}," + $"{param.accumulatedElectricity},{param.phaseVoltageA},{param.phaseVoltageB},{param.phaseVoltageC},{param.phaseCurrentA},{param.phaseCurrentB},{param.phaseCurrentC}," + $"{param.phasePowerA},{param.phasePowerB},{param.phasePowerC},{param.activePower},{param.powerFactor},{param.pt},{param.ct}"; CSVHelper.WriterCSV(filePath, fileName, fileTitle, fileContent); diff --git a/JinYuan.ControlCenter/MES/MESDataCombin.cs b/JinYuan.ControlCenter/MES/MESDataCombin.cs index 647c56e..2b8c5a7 100644 --- a/JinYuan.ControlCenter/MES/MESDataCombin.cs +++ b/JinYuan.ControlCenter/MES/MESDataCombin.cs @@ -54,7 +54,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.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs index 1a896a2..53d3c64 100644 --- a/JinYuan.MES/MesDataProcess.cs +++ b/JinYuan.MES/MesDataProcess.cs @@ -785,7 +785,7 @@ namespace JinYuan.MES long outTime = sw.ElapsedMilliseconds; if (outTime > 1000) { - LogHelper.Instance.WriteLog($"预焊出站PC<=>MES上传耗时:{outTime}ms,电芯码:{listBar.CSBYHCODEA}", "MESTime"); + LogHelper.Instance.WriteLog($"外观检出站PC<=>MES上传耗时:{outTime}ms,电芯码:{listBar.CSBYHCODEA}", "MESTime"); } if (string.IsNullOrEmpty(result)) diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs index d41a0a9..35f0847 100644 --- a/JinYuan.Models/BGearEntity.cs +++ b/JinYuan.Models/BGearEntity.cs @@ -21,8 +21,8 @@ namespace JinYuan.Models public short[,] list_pan = new short[3, 1];//物流线托盘码 // - public int[,] CCD_Data = new int[3,27];//芯包CCD信息1,2,3 - public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3 + public int[,] CCD_Data = new int[3,28];//芯包CCD信息1,2,3 + public float[] Thickness_Data = new float[3];//电芯3_厚度数据信息1,2,3 /// /// 时间 /// @@ -76,6 +76,7 @@ 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 /// @@ -112,6 +113,7 @@ namespace JinYuan.Models public string CCDResult25 { get; set; } public string CCDResult26 { get; set; } public string CCDResult27 { get; set; } + public string CCDResult28 { get; set; } /// /// 芯包条码 diff --git a/LargeSquareOne/App.config b/LargeSquareOne/App.config index 97ad05e..71dfbd6 100644 --- a/LargeSquareOne/App.config +++ b/LargeSquareOne/App.config @@ -5,7 +5,7 @@ - + diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs index 808289c..8ebb1fc 100644 --- a/LargeSquareOne/FrmDataMonitor.Designer.cs +++ b/LargeSquareOne/FrmDataMonitor.Designer.cs @@ -29,12 +29,12 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDataMonitor)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.groupBoxEX3 = new JinYuan.ControlLib.GroupBoxEX(); @@ -142,12 +142,12 @@ // this.groupBoxEX3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.groupBoxEX3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); + this.groupBoxEX3.Controls.Add(this.btSatrt); this.groupBoxEX3.Controls.Add(this.txtMaterialCode); this.groupBoxEX3.Controls.Add(this.cmbModelType); this.groupBoxEX3.Controls.Add(this.angleLabel2); this.groupBoxEX3.Controls.Add(this.angleLabel1); this.groupBoxEX3.Controls.Add(this.btStop); - this.groupBoxEX3.Controls.Add(this.btSatrt); this.groupBoxEX3.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX3.ForeColor = System.Drawing.Color.White; this.groupBoxEX3.Location = new System.Drawing.Point(2, 2); @@ -324,14 +324,14 @@ this.dgvFeedingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.dgvFeedingData.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvFeedingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dgvFeedingData.ColumnHeadersHeight = 34; this.dgvFeedingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvFeedingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -341,14 +341,14 @@ this.InResult, this.Column5, this.Column139}); - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); - dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle8; this.dgvFeedingData.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvFeedingData.EnableHeadersVisualStyles = false; this.dgvFeedingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); @@ -358,14 +358,14 @@ this.dgvFeedingData.Name = "dgvFeedingData"; this.dgvFeedingData.ReadOnly = true; this.dgvFeedingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvFeedingData.RowHeadersVisible = false; this.dgvFeedingData.RowHeadersWidth = 60; this.dgvFeedingData.RowTemplate.Height = 23; @@ -486,14 +486,14 @@ this.dgvBlankingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.dgvBlankingData.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvBlankingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); - dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvBlankingData.ColumnHeadersHeight = 34; this.dgvBlankingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvBlankingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -538,14 +538,14 @@ this.Column35, this.Column102, this.Column22}); - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle11; this.dgvBlankingData.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvBlankingData.EnableHeadersVisualStyles = false; this.dgvBlankingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); @@ -555,14 +555,14 @@ this.dgvBlankingData.Name = "dgvBlankingData"; this.dgvBlankingData.ReadOnly = true; this.dgvBlankingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dgvBlankingData.RowHeadersVisible = false; this.dgvBlankingData.RowHeadersWidth = 60; this.dgvBlankingData.RowTemplate.Height = 23; diff --git a/LargeSquareOne/FrmDataMonitor.resx b/LargeSquareOne/FrmDataMonitor.resx index 5cf4cd9..fc7ebed 100644 --- a/LargeSquareOne/FrmDataMonitor.resx +++ b/LargeSquareOne/FrmDataMonitor.resx @@ -197,7 +197,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE - DQAAAk1TRnQBSQFMAgEBAwEAAUgBAgFIAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + DQAAAk1TRnQBSQFMAgEBAwEAAVgBAgFYAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1 ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2