From d168ab7e58bd7e91e8665ff6e0e862b2ceb472cb Mon Sep 17 00:00:00 2001 From: ldw <11622064+ldw888@user.noreply.gitee.com> Date: Wed, 23 Jul 2025 15:43:44 +0800 Subject: [PATCH] =?UTF-8?q?1257=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JinYuan.ControlCenter/ControlCenter_Plc.cs | 1963 ++++++----- JinYuan.Helper/SendDateMQTT.cs | 2 +- JinYuan.MES/MesDataProcess.cs | 3621 ++++++++++---------- JinYuan.Models/BGearEntity.cs | 1288 +++---- LargeSquareOne/App.config | 2 +- LargeSquareOne/Config/Configure.ini | 2 +- LargeSquareOne/FrmDataMonitor.Designer.cs | 1684 ++------- LargeSquareOne/FrmDataMonitor.resx | 392 +-- LargeSquareOne/FrmMain.cs | 18 +- 9 files changed, 3908 insertions(+), 5064 deletions(-) diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 53ee9f1..a4b5aec 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -177,29 +177,34 @@ namespace JinYuan.ControlCenters if (bArrays.IsSuccess && bArrays.Content != null) { sw2.Restart(); - //解析数据 + //解析数据 + //1257 3个条码 List list = new List();//实体 - List listBarCode = GetList(4, "");//电芯条码 + List listBarCode = GetList(3, "");//电芯条码 //List listNum = GetList(1, "");//进站磁悬浮动子编号 - List listRes = GetList(4, 0);//进站电芯反馈结果 + List listRes = GetList(3, 0);//进站电芯反馈结果 byte[] bytes = bArrays.Content.ByteReverse();//高低位转换 - // 从D2100开始 + // 从D2200开始 #region 数据解析 //电芯条码 //从bytes读取第二位参数到第三位参数的内容 0-19 第四位参数为格式 第五位为规则 - listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 200, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 240, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 280, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[3] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 320, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + //listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 200, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + //listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 240, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + //listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 280, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + //listBarCode[3] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 320, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + //listBarCode[0] = "TEST"; //listBarCode[1] = "TEST"; //listBarCode[2] = "TEST"; //listBarCode[3] = "TEST"; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 3; i++) { //有无条码标志 int CodeFlag = 1; @@ -267,25 +272,25 @@ namespace JinYuan.ControlCenters { case MesResType.A:// 停线，设备报警停机 //listRes[i] = 10; - listRes[i] = 2; + listRes[i] = 3; //m.Remark = MesMessage1; break; case MesResType.B: //listRes[i] = 9; - listRes[i] = 2; + listRes[i] = 3; //m.Remark = MesMessage1; break; case MesResType.C: //listRes[i] = 1; - listRes[i] = 2; + listRes[i] = 3; //m.Remark = MesMessage1; break; - case MesResType.D: - listRes[i] = 2; + case MesResType.D://OK + listRes[i] = 1; //m.Remark = MesMessage1; break; default: - listRes[i] = 2; + listRes[i] = 3; break; } if (CommonMethods.sysConfig.OKSwitching) @@ -316,7 +321,7 @@ namespace JinYuan.ControlCenters // listRes[j] = 1; // m.Result = "OK"; //} - list.Add(m); + //list.Add(m); } } else @@ -329,6 +334,7 @@ namespace JinYuan.ControlCenters } //极限件发3给PLC + //需要沟通极限 发多少给plc if (ChallengeFlag == 1) { if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0) @@ -370,11 +376,11 @@ namespace JinYuan.ControlCenters JYResult result = CommonMethods.PlcLink.WriteValue("D2100", listRes[0], Data_Type.Short);//调试结果写入PLC CommonMethods.PlcLink.WriteValue("D2101", listRes[1], Data_Type.Short);//调试结果写入PLC CommonMethods.PlcLink.WriteValue("D2102", listRes[2], Data_Type.Short);//调试结果写入PLC - CommonMethods.PlcLink.WriteValue("D2103", listRes[3], Data_Type.Short);//调试结果写入PLC + //CommonMethods.PlcLink.WriteValue("D2103", listRes[3], Data_Type.Short);//调试结果写入PLC //CommonMethods.PlcLink.WriteInt16("D2100", listRes[0]);//调试结果OK写入PLC if (result != null) { - string strres = $"卷心工位发送给PLC: D2100={listRes[0]},D2101={listRes[1]},D2102={listRes[2]},D2103={listRes[3]},"; + string strres = $"卷心工位发送给PLC: D2100={listRes[0]},D2101={listRes[1]},D2102={listRes[2]},"; CommonMethods.AddDataMonitorLog(0, strres); } @@ -485,468 +491,1112 @@ namespace JinYuan.ControlCenters CommonMethods.AddLog(false, $"NG出站PLC有触发信号，但无数据!"); LogHelper.Instance.WriteLog($"NG出站PLC有触发信号，但无数据!", "SysErrorLog"); } - if (bArrays.IsSuccess && bArrays.Content != null) - { - Random random = new Random(); - //解析数据 - sw2.Restart(); - #region 数据变量定义 - List list = new List();//实体 - int[] MyRes = new int[2];//AB反馈结果 + #region 预焊机 + //if (bArrays.IsSuccess && bArrays.Content != null) + //{ + // Random random = new Random(); + // //解析数据 + // sw2.Restart(); + // #region 数据变量定义 + // List list = new List();//实体 + // int[] MyRes = new int[2];//AB反馈结果 - #endregion - //高低位转换 - byte[] bytes = bArrays.Content.ByteReverse(); - byte[] bytes1 = bArrays.Content; - //反馈结果 - #region 电芯解析 - //D3100起 - //电芯解析 - #region 上传MES + // #endregion + // //高低位转换 + // byte[] bytes = bArrays.Content.ByteReverse(); + // byte[] bytes1 = bArrays.Content; + // //反馈结果 + // #region 电芯解析 + // //D3100起 + // //电芯解析 + // #region 上传MES - for (int i = 0; i < 2; i++) - { - try - { - int ChallengeFlag = 0; - BGearEntity m = new BGearEntity(); - AGearEntity TT = new AGearEntity(); - if (i == 0) - { - m.A_B = "A芯包"; - //A_NG芯包信息1 D2442~D2446 - for (int j = 0; j < 5; j++) - { - m.NG_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 84 + j * 2, DataFormat.CDAB); - } + // for (int i = 0; i < 2; i++) + // { + // try + // { + // int ChallengeFlag = 0; + // BGearEntity m = new BGearEntity(); + // AGearEntity TT = new AGearEntity(); + // if (i == 0) + // { + // m.A_B = "A芯包"; + // //A_NG芯包信息1 D2442~D2446 + // for (int j = 0; j < 5; j++) + // { + // m.NG_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 84 + j * 2, DataFormat.CDAB); + // } - //A_NG芯包信息2 D2452~D2468 - for (int j = 0; j < 9; j++) - { - m.NG_Data2[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 104 + j * 4, DataFormat.CDAB); - } - } - else - { - m.A_B = "B芯包"; - //B_NG芯包信息1 D2447~D2451 - for (int j = 0; j < 5; j++) - { - m.NG_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 94 + j * 2, DataFormat.CDAB); - } + // //A_NG芯包信息2 D2452~D2468 + // for (int j = 0; j < 9; j++) + // { + // m.NG_Data2[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 104 + j * 4, DataFormat.CDAB); + // } + // } + // else + // { + // m.A_B = "B芯包"; + // //B_NG芯包信息1 D2447~D2451 + // for (int j = 0; j < 5; j++) + // { + // m.NG_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 94 + j * 2, DataFormat.CDAB); + // } - //B_NG芯包信息2 D2470~D2486 - for (int j = 0; j < 9; j++) - { - m.NG_Data2[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 140 + j * 4, DataFormat.CDAB); - } - } + // //B_NG芯包信息2 D2470~D2486 + // for (int j = 0; j < 9; j++) + // { + // m.NG_Data2[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 140 + j * 4, DataFormat.CDAB); + // } + // } - //芯包条码 D2400~D3239 - m.CSBYHCODEA = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40 * i, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - //m.CSBYHCODEA = "TEST"; - //判断是否极限件 查询极限件数据 - var EX = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetChallengeCode(m.CSBYHCODEA)); - for (int j = 0; j < EX.Count; j++) - { - if (string.Compare(EX[j].ChallengeBarCode, m.CSBYHCODEA) == 0) - { - m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")"; - ChallengeFlag = 1; - } - } + // //芯包条码 D2400~D3239 + // m.CSBYHCODEA = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40 * i, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + // //m.CSBYHCODEA = "TEST"; + // //判断是否极限件 查询极限件数据 + // var EX = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetChallengeCode(m.CSBYHCODEA)); + // for (int j = 0; j < EX.Count; j++) + // { + // if (string.Compare(EX[j].ChallengeBarCode, m.CSBYHCODEA) == 0) + // { + // m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")"; + // ChallengeFlag = 1; + // } + // } - //查询进站时间数据 - var w = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetInTime(m.CSBYHCODEA)); - //获取最新一行数据 - if (w.Count > 0) - TT = w[w.Count - 1]; - if (TT.TestTime != null) - m.ScanTime[0] = TT.TestTime; - else - m.ScanTime[0] = ""; - //芯包出站时间 - m.ScanTime[1] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - int Code_NG = 0;//条码有无标志 1为有，2为无 - //判断有无条码 - if (m.CSBYHCODEA != null && m.CSBYHCODEA != "") - Code_NG = 1; - else - Code_NG = 2; + // //查询进站时间数据 + // var w = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetInTime(m.CSBYHCODEA)); + // //获取最新一行数据 + // if (w.Count > 0) + // TT = w[w.Count - 1]; + // if (TT.TestTime != null) + // m.ScanTime[0] = TT.TestTime; + // else + // m.ScanTime[0] = ""; + // //芯包出站时间 + // m.ScanTime[1] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + // int Code_NG = 0;//条码有无标志 1为有，2为无 + // //判断有无条码 + // if (m.CSBYHCODEA != null && m.CSBYHCODEA != "") + // Code_NG = 1; + // else + // Code_NG = 2; - //m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + // //m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - //不良代码判定 - List NGcodeList = new List(); - NGcodeList = NGCarcode(m.NG_Data1[i, 1], m.NG_Data1[i, 3], m.NG_Data1[i, 4]); + // //不良代码判定 + // List NGcodeList = new List(); + // NGcodeList = NGCarcode(m.NG_Data1[i, 1], m.NG_Data1[i, 3], m.NG_Data1[i, 4]); - //芯包重量1判定结果 - if (m.NG_Data1[i, 1] == 1) - m.CSBYHWEIGHTRESULTA1 = "OK"; - else if (m.NG_Data1[i, 1] == 2) - m.CSBYHWEIGHTRESULTA1 = "NG"; - else - m.CSBYHWEIGHTRESULTA1 = "无"; - //芯包侧厚判定结果 - if (m.NG_Data1[i, 3] == 1) - m.CSBYHTHICKNESSTESTJUDGERESULTA = "OK"; - else if (m.NG_Data1[i, 3] == 2) - m.CSBYHTHICKNESSTESTJUDGERESULTA = "NG"; - else - m.CSBYHTHICKNESSTESTJUDGERESULTA = "无"; - //芯包CCD极性检测结果 - if (m.NG_Data1[i, 4] == 1) - m.CSBYHPOLARITYRESULTA = "OK"; - else if (m.NG_Data1[i, 4] == 2) - m.CSBYHPOLARITYRESULTA = "NG"; - else - m.CSBYHPOLARITYRESULTA = "无"; - //电芯裁切粘连判定结果 - m.CSBYHCUTADHESIONJUDGERESULTA = "无"; - //电芯裁切毛刺判定结果 - m.CSBYHCUTBURRJUDGERESULTA = "无"; - //芯包焊印位置判定结果 - m.CSBYHSOLDERJUDGERESULTA = "无"; - m.CSBYHSOLDERJUDGERESULTA2 = "无"; - m.AluminiumWeldPositionResult1 = "无"; - m.AluminiumWeldPositionResult2 = "无"; - //芯包正面极耳撕裂判定结果 - m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "无"; - //芯包背面极耳撕裂判定结果 - m.CSBYHBACKEARCRACKLEJUDGERESULTA = "无"; - //芯包正面极耳翻折检测结果 - m.CSBYHFRONTEARFLODINGRESULTA = "无"; - //芯包背面极耳翻折检测结果 - m.CSBYHBACKEARFLODINGRESULTA = "无"; + // //芯包重量1判定结果 + // if (m.NG_Data1[i, 1] == 1) + // m.CSBYHWEIGHTRESULTA1 = "OK"; + // else if (m.NG_Data1[i, 1] == 2) + // m.CSBYHWEIGHTRESULTA1 = "NG"; + // else + // m.CSBYHWEIGHTRESULTA1 = "无"; + // //芯包侧厚判定结果 + // if (m.NG_Data1[i, 3] == 1) + // m.CSBYHTHICKNESSTESTJUDGERESULTA = "OK"; + // else if (m.NG_Data1[i, 3] == 2) + // m.CSBYHTHICKNESSTESTJUDGERESULTA = "NG"; + // else + // m.CSBYHTHICKNESSTESTJUDGERESULTA = "无"; + // //芯包CCD极性检测结果 + // if (m.NG_Data1[i, 4] == 1) + // m.CSBYHPOLARITYRESULTA = "OK"; + // else if (m.NG_Data1[i, 4] == 2) + // m.CSBYHPOLARITYRESULTA = "NG"; + // else + // m.CSBYHPOLARITYRESULTA = "无"; + // //电芯裁切粘连判定结果 + // m.CSBYHCUTADHESIONJUDGERESULTA = "无"; + // //电芯裁切毛刺判定结果 + // m.CSBYHCUTBURRJUDGERESULTA = "无"; + // //芯包焊印位置判定结果 + // m.CSBYHSOLDERJUDGERESULTA = "无"; + // m.CSBYHSOLDERJUDGERESULTA2 = "无"; + // m.AluminiumWeldPositionResult1 = "无"; + // m.AluminiumWeldPositionResult2 = "无"; + // //芯包正面极耳撕裂判定结果 + // m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "无"; + // //芯包背面极耳撕裂判定结果 + // m.CSBYHBACKEARCRACKLEJUDGERESULTA = "无"; + // //芯包正面极耳翻折检测结果 + // m.CSBYHFRONTEARFLODINGRESULTA = "无"; + // //芯包背面极耳翻折检测结果 + // m.CSBYHBACKEARFLODINGRESULTA = "无"; - m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - m.CSBYHWEIGHTNOA1 = m.NG_Data1[i, 2]; - m.CSBYHTHICKNESSTESTSTATIONNOA = m.NG_Data1[i, 4]; - m.CSBYHTOOLNOA = 0; - m.CSBYHCUWELDINGSTATIONNOA1 = 0; - m.CSBYHCUWELDINGSTATIONNOA2 = 0; - m.CSBYHCUWELDINGSTATIONNOA3 = 0; - m.CSBYHCUWELDHEADCOUNTA1 = 0; - m.CSBYHCUWELDHEADCOUNTA2 = 0; - m.CSBYHCUWELDHEADCOUNTA3 = 0; - m.CSBYHCUWELDBASECOUNTA1 = 0; - m.CSBYHCUWELDBASECOUNTA2 = 0; - m.CSBYHCUWELDBASECOUNTA3 = 0; - m.CSBYHALWELDINGSTATIONNOA1 = 0; - m.CSBYHALWELDINGSTATIONNOA2 = 0; - m.CSBYHALWELDINGSTATIONNOA3 = 0; - m.CSBYHALWELDHEADCOUNTA1 = 0; - m.CSBYHALWELDHEADCOUNTA2 = 0; - m.CSBYHALWELDHEADCOUNTA3 = 0; - m.CSBYHALWELDBASECOUNTA1 = 0; - m.CSBYHALWELDBASECOUNTA2 = 0; - m.CSBYHALWELDBASECOUNTA3 = 0; - m.CSBYHCUTABCUTTERCOUNTA = 0; - m.CSBYHALTABCUTTERCOUNTA = 0; + // m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + // m.CSBYHWEIGHTNOA1 = m.NG_Data1[i, 2]; + // m.CSBYHTHICKNESSTESTSTATIONNOA = m.NG_Data1[i, 4]; + // m.CSBYHTOOLNOA = 0; + // m.CSBYHCUWELDINGSTATIONNOA1 = 0; + // m.CSBYHCUWELDINGSTATIONNOA2 = 0; + // m.CSBYHCUWELDINGSTATIONNOA3 = 0; + // m.CSBYHCUWELDHEADCOUNTA1 = 0; + // m.CSBYHCUWELDHEADCOUNTA2 = 0; + // m.CSBYHCUWELDHEADCOUNTA3 = 0; + // m.CSBYHCUWELDBASECOUNTA1 = 0; + // m.CSBYHCUWELDBASECOUNTA2 = 0; + // m.CSBYHCUWELDBASECOUNTA3 = 0; + // m.CSBYHALWELDINGSTATIONNOA1 = 0; + // m.CSBYHALWELDINGSTATIONNOA2 = 0; + // m.CSBYHALWELDINGSTATIONNOA3 = 0; + // m.CSBYHALWELDHEADCOUNTA1 = 0; + // m.CSBYHALWELDHEADCOUNTA2 = 0; + // m.CSBYHALWELDHEADCOUNTA3 = 0; + // m.CSBYHALWELDBASECOUNTA1 = 0; + // m.CSBYHALWELDBASECOUNTA2 = 0; + // m.CSBYHALWELDBASECOUNTA3 = 0; + // m.CSBYHCUTABCUTTERCOUNTA = 0; + // m.CSBYHALTABCUTTERCOUNTA = 0; - m.CSBYHCUTABCUTTERNOA = 0; - m.CSBYHALTABCUTTERNOA = 0; - m.CSBYHPROCESSNAME = "超声波预焊接"; - m.CSBYHSCHEDULE = CommonMethods.strClass; - m.CSBYHINSTATIONTIME = m.ScanTime[0]; - m.CSBYHOUTSTATIONTIME = m.ScanTime[1]; - //m.CSBYHABNORMALINFORMATION = m.list_Process[i, 4]; - m.CSBYHWEIGHTA1MAXSETTING = SaveTwoNum(m.NG_Data2[i, 0]); - m.CSBYHWEIGHTA1MINSETTING = SaveTwoNum(m.NG_Data2[i, 1]); - m.CSBYHWEIGHTA1 = SaveTwoNum(m.NG_Data2[i, 2]); - m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA = SaveTwoNum(m.NG_Data2[i, 3]); - m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA = SaveTwoNum(m.NG_Data2[i, 4]); - m.CSBYHTHICKNESSTESTPRESSUREA = SaveTwoNum(m.NG_Data2[i, 5]); - m.CSBYHTHICKNESSTESTPRESSURESIZEA = SaveTwoNum(m.NG_Data2[i, 6]); - m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA = SaveTwoNum(m.NG_Data2[i, 7]); - m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA = SaveTwoNum(m.NG_Data2[i, 8]); - m.CSBYHCUWELDINGPRESSUREMAXSETTING1 = 0; - m.CSBYHCUWELDINGPRESSUREMAXSETTING2 = 0; - m.CSBYHCUWELDINGPRESSUREMAXSETTING3 = 0; - m.CSBYHCUWELDINGPRESSUREMINSETTING = 0;//压力最小值 - m.CSBYHCUWELDINGPOWERMAXSETTING1 = 0; - m.CSBYHCUWELDINGPOWERMAXSETTING2 = 0; - m.CSBYHCUWELDINGPOWERMAXSETTING3 = 0; - m.CSBYHCUWELDINGPOWERMINSETTING1 = 0; - m.CSBYHCUWELDINGPOWERMINSETTING2 = 0; - m.CSBYHCUWELDINGPOWERMINSETTING3 = 0; - m.CSBYHCUWELDINGENERGYMAXSETTING1 = 0; - m.CSBYHCUWELDINGENERGYMAXSETTING2 = 0; - m.CSBYHCUWELDINGENERGYMAXSETTING3 = 0; - m.CSBYHCUWELDINGENERGYMINSETTING1 = 0; - m.CSBYHCUWELDINGENERGYMINSETTING2 = 0; - m.CSBYHCUWELDINGENERGYMINSETTING3 = 0; - m.CSBYHCUWELDINGAMPLITUDEMAXSETTING1 = 0; - m.CSBYHCUWELDINGAMPLITUDEMAXSETTING2 = 0; - m.CSBYHCUWELDINGAMPLITUDEMAXSETTING3 = 0; - m.CSBYHCUWELDINGAMPLITUDEMINSETTING1 = 0; - m.CSBYHCUWELDINGAMPLITUDEMINSETTING2 = 0; - m.CSBYHCUWELDINGAMPLITUDEMINSETTING3 = 0; - m.CSBYHCUPRESSUREA1 = 0; - m.CSBYHCUPOWERA1 = 0; - m.CSBYHCUENERGYA1 = 0; - m.CSBYHCUAMPLITUDEA1 = 0; - m.CSBYHCUTIMEA1 = 0; - m.CSBYHCUPRESSUREA2 = 0; - m.CSBYHCUPOWERA2 = 0; - m.CSBYHCUENERGYA2 = 0; - m.CSBYHCUAMPLITUDEA2 = 0; - m.CSBYHCUTIMEA2 = 0; - m.CSBYHCUPRESSUREA3 = 0; - m.CSBYHCUPOWERA3 = 0; - m.CSBYHCUENERGYA3 = 0; - m.CSBYHCUAMPLITUDEA3 = 0; - m.CSBYHCUTIMEA3 = 0; - m.CSBYHALWELDINGPRESSUREMAXSETTING1 = 0; - m.CSBYHALWELDINGPRESSUREMAXSETTING2 = 0; - m.CSBYHALWELDINGPRESSUREMAXSETTING3 = 0; - m.CSBYHALWELDINGPRESSUREMINSETTING = 0; - m.CSBYHALWELDINGPOWERMAXSETTING1 = 0; - m.CSBYHALWELDINGPOWERMAXSETTING2 = 0; - m.CSBYHALWELDINGPOWERMAXSETTING3 = 0; - m.CSBYHALWELDINGPOWERMINSETTING1 = 0; - m.CSBYHALWELDINGPOWERMINSETTING2 = 0; - m.CSBYHALWELDINGPOWERMINSETTING3 = 0; - m.CSBYHALWELDINGENERGYMAXSETTING1 = 0; - m.CSBYHALWELDINGENERGYMAXSETTING2 = 0; - m.CSBYHALWELDINGENERGYMAXSETTING3 = 0; - m.CSBYHALWELDINGENERGYMINSETTING1 = 0; - m.CSBYHALWELDINGENERGYMINSETTING2 = 0; - m.CSBYHALWELDINGENERGYMINSETTING3 = 0; - m.CSBYHALWELDINGAMPLITUDEMAXSETTING1 = 0; - m.CSBYHALWELDINGAMPLITUDEMAXSETTING2 = 0; - m.CSBYHALWELDINGAMPLITUDEMAXSETTING3 = 0; - m.CSBYHALWELDINGAMPLITUDEMINSETTING1 = 0; - m.CSBYHALWELDINGAMPLITUDEMINSETTING2 = 0; - m.CSBYHALWELDINGAMPLITUDEMINSETTING3 = 0; - m.CSBYHALPRESSUREA1 = 0; - m.CSBYHALPOWERA1 = 0; - m.CSBYHALENERGYA1 = 0; - m.CSBYHALAMPLITUDEA1 = 0; - m.CSBYHALTIMEA1 = 0; - m.CSBYHALPRESSUREA2 = 0; - m.CSBYHALPOWERA2 = 0; - m.CSBYHALENERGYA2 = 0; - m.CSBYHALAMPLITUDEA2 = 0; - m.CSBYHALTIMEA2 = 0; - m.CSBYHALPRESSUREA3 = 0; - m.CSBYHALPOWERA3 = 0; - m.CSBYHALENERGYA3 = 0; - m.CSBYHALAMPLITUDEA3 = 0; - m.CSBYHALTIMEA3 = 0; - m.CSBYHCUTABLENGTHA = 0; - m.CSBYHCUTABWIDTHA = 0; - m.CSBYHALTABLENGTHA = 0; - m.CSBYHALTABWIDTHA = 0; - m.CSBYHTOPTOSOLDERDISTANCEA = 0; - m.CSBYHTOPTOSOLDERDISTANCEA2 = 0; - m.AluminumToWeld1 = 0; - m.AluminumToWeld2 = 0; - m.CSBYHSOLDERTOEARDISTANCEA = 0; - //MyRes[i] = JudgmentResult(Code_NG, m.list_Data1[i, 1], m.list_Data1[i, 4], m.list_Data1[i, 5], m.list_Data1[i, 15], - // m.list_Data1[i, 16], m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], - // m.list_Data1[i, 20], m.list_Data1[i, 21], m.list_Data2[i, 59], m.list_Data2[i, 60], - // m.list_Data2[i, 63], m.list_Data2[i, 64]); + // m.CSBYHCUTABCUTTERNOA = 0; + // m.CSBYHALTABCUTTERNOA = 0; + // m.CSBYHPROCESSNAME = "超声波预焊接"; + // m.CSBYHSCHEDULE = CommonMethods.strClass; + // m.CSBYHINSTATIONTIME = m.ScanTime[0]; + // m.CSBYHOUTSTATIONTIME = m.ScanTime[1]; + // //m.CSBYHABNORMALINFORMATION = m.list_Process[i, 4]; + // m.CSBYHWEIGHTA1MAXSETTING = SaveTwoNum(m.NG_Data2[i, 0]); + // m.CSBYHWEIGHTA1MINSETTING = SaveTwoNum(m.NG_Data2[i, 1]); + // m.CSBYHWEIGHTA1 = SaveTwoNum(m.NG_Data2[i, 2]); + // m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA = SaveTwoNum(m.NG_Data2[i, 3]); + // m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA = SaveTwoNum(m.NG_Data2[i, 4]); + // m.CSBYHTHICKNESSTESTPRESSUREA = SaveTwoNum(m.NG_Data2[i, 5]); + // m.CSBYHTHICKNESSTESTPRESSURESIZEA = SaveTwoNum(m.NG_Data2[i, 6]); + // m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA = SaveTwoNum(m.NG_Data2[i, 7]); + // m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA = SaveTwoNum(m.NG_Data2[i, 8]); + // m.CSBYHCUWELDINGPRESSUREMAXSETTING1 = 0; + // m.CSBYHCUWELDINGPRESSUREMAXSETTING2 = 0; + // m.CSBYHCUWELDINGPRESSUREMAXSETTING3 = 0; + // m.CSBYHCUWELDINGPRESSUREMINSETTING = 0;//压力最小值 + // m.CSBYHCUWELDINGPOWERMAXSETTING1 = 0; + // m.CSBYHCUWELDINGPOWERMAXSETTING2 = 0; + // m.CSBYHCUWELDINGPOWERMAXSETTING3 = 0; + // m.CSBYHCUWELDINGPOWERMINSETTING1 = 0; + // m.CSBYHCUWELDINGPOWERMINSETTING2 = 0; + // m.CSBYHCUWELDINGPOWERMINSETTING3 = 0; + // m.CSBYHCUWELDINGENERGYMAXSETTING1 = 0; + // m.CSBYHCUWELDINGENERGYMAXSETTING2 = 0; + // m.CSBYHCUWELDINGENERGYMAXSETTING3 = 0; + // m.CSBYHCUWELDINGENERGYMINSETTING1 = 0; + // m.CSBYHCUWELDINGENERGYMINSETTING2 = 0; + // m.CSBYHCUWELDINGENERGYMINSETTING3 = 0; + // m.CSBYHCUWELDINGAMPLITUDEMAXSETTING1 = 0; + // m.CSBYHCUWELDINGAMPLITUDEMAXSETTING2 = 0; + // m.CSBYHCUWELDINGAMPLITUDEMAXSETTING3 = 0; + // m.CSBYHCUWELDINGAMPLITUDEMINSETTING1 = 0; + // m.CSBYHCUWELDINGAMPLITUDEMINSETTING2 = 0; + // m.CSBYHCUWELDINGAMPLITUDEMINSETTING3 = 0; + // m.CSBYHCUPRESSUREA1 = 0; + // m.CSBYHCUPOWERA1 = 0; + // m.CSBYHCUENERGYA1 = 0; + // m.CSBYHCUAMPLITUDEA1 = 0; + // m.CSBYHCUTIMEA1 = 0; + // m.CSBYHCUPRESSUREA2 = 0; + // m.CSBYHCUPOWERA2 = 0; + // m.CSBYHCUENERGYA2 = 0; + // m.CSBYHCUAMPLITUDEA2 = 0; + // m.CSBYHCUTIMEA2 = 0; + // m.CSBYHCUPRESSUREA3 = 0; + // m.CSBYHCUPOWERA3 = 0; + // m.CSBYHCUENERGYA3 = 0; + // m.CSBYHCUAMPLITUDEA3 = 0; + // m.CSBYHCUTIMEA3 = 0; + // m.CSBYHALWELDINGPRESSUREMAXSETTING1 = 0; + // m.CSBYHALWELDINGPRESSUREMAXSETTING2 = 0; + // m.CSBYHALWELDINGPRESSUREMAXSETTING3 = 0; + // m.CSBYHALWELDINGPRESSUREMINSETTING = 0; + // m.CSBYHALWELDINGPOWERMAXSETTING1 = 0; + // m.CSBYHALWELDINGPOWERMAXSETTING2 = 0; + // m.CSBYHALWELDINGPOWERMAXSETTING3 = 0; + // m.CSBYHALWELDINGPOWERMINSETTING1 = 0; + // m.CSBYHALWELDINGPOWERMINSETTING2 = 0; + // m.CSBYHALWELDINGPOWERMINSETTING3 = 0; + // m.CSBYHALWELDINGENERGYMAXSETTING1 = 0; + // m.CSBYHALWELDINGENERGYMAXSETTING2 = 0; + // m.CSBYHALWELDINGENERGYMAXSETTING3 = 0; + // m.CSBYHALWELDINGENERGYMINSETTING1 = 0; + // m.CSBYHALWELDINGENERGYMINSETTING2 = 0; + // m.CSBYHALWELDINGENERGYMINSETTING3 = 0; + // m.CSBYHALWELDINGAMPLITUDEMAXSETTING1 = 0; + // m.CSBYHALWELDINGAMPLITUDEMAXSETTING2 = 0; + // m.CSBYHALWELDINGAMPLITUDEMAXSETTING3 = 0; + // m.CSBYHALWELDINGAMPLITUDEMINSETTING1 = 0; + // m.CSBYHALWELDINGAMPLITUDEMINSETTING2 = 0; + // m.CSBYHALWELDINGAMPLITUDEMINSETTING3 = 0; + // m.CSBYHALPRESSUREA1 = 0; + // m.CSBYHALPOWERA1 = 0; + // m.CSBYHALENERGYA1 = 0; + // m.CSBYHALAMPLITUDEA1 = 0; + // m.CSBYHALTIMEA1 = 0; + // m.CSBYHALPRESSUREA2 = 0; + // m.CSBYHALPOWERA2 = 0; + // m.CSBYHALENERGYA2 = 0; + // m.CSBYHALAMPLITUDEA2 = 0; + // m.CSBYHALTIMEA2 = 0; + // m.CSBYHALPRESSUREA3 = 0; + // m.CSBYHALPOWERA3 = 0; + // m.CSBYHALENERGYA3 = 0; + // m.CSBYHALAMPLITUDEA3 = 0; + // m.CSBYHALTIMEA3 = 0; + // m.CSBYHCUTABLENGTHA = 0; + // m.CSBYHCUTABWIDTHA = 0; + // m.CSBYHALTABLENGTHA = 0; + // m.CSBYHALTABWIDTHA = 0; + // m.CSBYHTOPTOSOLDERDISTANCEA = 0; + // m.CSBYHTOPTOSOLDERDISTANCEA2 = 0; + // m.AluminumToWeld1 = 0; + // m.AluminumToWeld2 = 0; + // m.CSBYHSOLDERTOEARDISTANCEA = 0; + // //MyRes[i] = JudgmentResult(Code_NG, m.list_Data1[i, 1], m.list_Data1[i, 4], m.list_Data1[i, 5], m.list_Data1[i, 15], + // // m.list_Data1[i, 16], m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], + // // m.list_Data1[i, 20], m.list_Data1[i, 21], m.list_Data2[i, 59], m.list_Data2[i, 60], + // // m.list_Data2[i, 63], m.list_Data2[i, 64]); - //初值OK - m.Result = m.listRes[i] = 1; - m.CSBYHOUTSTATIONJUDGMENTRESULT = "OK"; + // //初值OK + // m.Result = m.listRes[i] = 1; + // m.CSBYHOUTSTATIONJUDGMENTRESULT = "OK"; - //优先级 ：条码 MES 极性 重量 测厚压力 测厚位移 （焊前CCD 正面极耳撕裂和翻折） - //无条码则无后面检测 + // //优先级 ：条码 MES 极性 重量 测厚压力 测厚位移 （焊前CCD 正面极耳撕裂和翻折） + // //无条码则无后面检测 - if (m.NG_Data1[i, 1] == 2 || m.NG_Data1[i, 3] == 2 || m.NG_Data1[i, 4] == 2) - { - m.Result = m.listRes[i] = 2; - m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; - } + // if (m.NG_Data1[i, 1] == 2 || m.NG_Data1[i, 3] == 2 || m.NG_Data1[i, 4] == 2) + // { + // m.Result = m.listRes[i] = 2; + // m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; + // } - list.Add(m); + // list.Add(m); - string ur2 = CommonMethods.mesConfig.ResultProcessParamMesUrl; - string siteCode1 = CommonMethods.mesConfig.siteCode; - string lineCode1 = CommonMethods.mesConfig.lineCode; - string equipNum1 = CommonMethods.mesConfig.equipNum; - string materialCode1 = CommonMethods.mesConfig.MaterialCode; - string userName1 = CommonMethods.mesConfig.mesUserName; - MesUploadType unloadType = MesUploadType.DD; - string Mesage = ""; - //加判断无条码不上传mes - m.Remark += "NG小车1，"; - //芯包测厚（位移）判定结果 - if (m.NG_Data1[i, 3] == 2) { m.Remark += "芯包侧厚（位移）NG,"; } - //芯包测厚（压力）判定结果 （） - if (false) { m.Remark += "芯包侧厚（压力）NG,"; } - //芯包重量1判定结果 - if (m.NG_Data1[i, 1] == 2) { m.Remark += "芯包重量NG,"; } - //芯包CCD极性检测结果 - if (m.NG_Data1[i, 4] == 2) { m.Remark += "芯包CCD极性检测NG,"; } - if (Code_NG == 1) - { - string MesMessage = ""; - MesResType mesResType = MesResType.C; + // string ur2 = CommonMethods.mesConfig.ResultProcessParamMesUrl; + // string siteCode1 = CommonMethods.mesConfig.siteCode; + // string lineCode1 = CommonMethods.mesConfig.lineCode; + // string equipNum1 = CommonMethods.mesConfig.equipNum; + // string materialCode1 = CommonMethods.mesConfig.MaterialCode; + // string userName1 = CommonMethods.mesConfig.mesUserName; + // MesUploadType unloadType = MesUploadType.DD; + // string Mesage = ""; + // //加判断无条码不上传mes + // m.Remark += "NG小车1，"; + // //芯包测厚（位移）判定结果 + // if (m.NG_Data1[i, 3] == 2) { m.Remark += "芯包侧厚（位移）NG,"; } + // //芯包测厚（压力）判定结果 （） + // if (false) { m.Remark += "芯包侧厚（压力）NG,"; } + // //芯包重量1判定结果 + // if (m.NG_Data1[i, 1] == 2) { m.Remark += "芯包重量NG,"; } + // //芯包CCD极性检测结果 + // if (m.NG_Data1[i, 4] == 2) { m.Remark += "芯包CCD极性检测NG,"; } + // if (Code_NG == 1) + // { + // string MesMessage = ""; + // MesResType mesResType = MesResType.C; - //m.Result = MyRes[i] = m.listRes[i] = 2; - //m.UpState = "未上传"; - //m.Remark = "出站前NG"; + // //m.Result = MyRes[i] = m.listRes[i] = 2; + // //m.UpState = "未上传"; + // //m.Remark = "出站前NG"; - if (CommonMethods.mesConfig.isUpMes) - { - string url = CommonMethods.mesConfig.OutStationMesUrl; - string siteCode = CommonMethods.mesConfig.siteCode; - string lineCode = CommonMethods.mesConfig.lineCode; - string equipNum = CommonMethods.mesConfig.equipNum; - string materialCode = CommonMethods.mesConfig.MaterialCode; - string userName = CommonMethods.mesConfig.mesUserName; - int type = 1; - //int type = 1; - //string materialLotCodeLocator = ""; - #region NG小车排料调出站 - bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, m, ref MesMessage, ref mesResType, NGcodeList); - //bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,) - if (MesMessage.Contains("发生一个或多个错误")) - { - MesMessage = "上传失败,"; - } - else - { - m.Flag = 1; - } + // if (CommonMethods.mesConfig.isUpMes) + // { + // string url = CommonMethods.mesConfig.OutStationMesUrl; + // string siteCode = CommonMethods.mesConfig.siteCode; + // string lineCode = CommonMethods.mesConfig.lineCode; + // string equipNum = CommonMethods.mesConfig.equipNum; + // string materialCode = CommonMethods.mesConfig.MaterialCode; + // string userName = CommonMethods.mesConfig.mesUserName; + // int type = 1; + // //int type = 1; + // //string materialLotCodeLocator = ""; + // #region NG小车排料调出站 + // bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, m, ref MesMessage, ref mesResType, NGcodeList); + // //bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,) + // if (MesMessage.Contains("发生一个或多个错误")) + // { + // MesMessage = "上传失败,"; + // } + // else + // { + // m.Flag = 1; + // } - //m.UpState = "已上传"; - if (Res) - { - m.Remark += MesMessage; - } - else - { - m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; - switch (mesResType) - { - case MesResType.A:// 停线，设备报警停机 - m.listRes[i] = 2; - MyRes[i] = m.listRes[i]; - break; - case MesResType.B://不停机，MEs NG品要排出，要给PLC发NG信号 - m.listRes[i] = 2; - MyRes[i] = m.listRes[i]; - break; - case MesResType.C://可忽略 - m.listRes[i] = 2; - MyRes[i] = m.listRes[i]; - break; - default: - m.listRes[i] = 2; - MyRes[i] = m.listRes[i]; - break; + // //m.UpState = "已上传"; + // if (Res) + // { + // m.Remark += MesMessage; + // } + // else + // { + // m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; + // switch (mesResType) + // { + // case MesResType.A:// 停线，设备报警停机 + // m.listRes[i] = 2; + // MyRes[i] = m.listRes[i]; + // break; + // case MesResType.B://不停机，MEs NG品要排出，要给PLC发NG信号 + // m.listRes[i] = 2; + // MyRes[i] = m.listRes[i]; + // break; + // case MesResType.C://可忽略 + // m.listRes[i] = 2; + // MyRes[i] = m.listRes[i]; + // break; + // default: + // m.listRes[i] = 2; + // MyRes[i] = m.listRes[i]; + // break; - } - ////芯包测厚（位移）判定结果 - //if (m.NG_Data1[i, 3] == 2) { m.Remark += "芯包侧厚（位移）NG,"; } - ////芯包测厚（压力）判定结果 - //if (false) { m.Remark += "芯包侧厚（压力）NG,"; } - ////芯包重量1判定结果 - //if (m.NG_Data1[i, 1] == 2) { m.Remark += "芯包重量NG,"; } - ////芯包CCD极性检测结果 - //if (m.NG_Data1[i, 4] == 2) { m.Remark += "芯包CCD极性检测NG,"; } - m.Remark += MesMessage; - } - #endregion + // } + // ////芯包测厚（位移）判定结果 + // //if (m.NG_Data1[i, 3] == 2) { m.Remark += "芯包侧厚（位移）NG,"; } + // ////芯包测厚（压力）判定结果 + // //if (false) { m.Remark += "芯包侧厚（压力）NG,"; } + // ////芯包重量1判定结果 + // //if (m.NG_Data1[i, 1] == 2) { m.Remark += "芯包重量NG,"; } + // ////芯包CCD极性检测结果 + // //if (m.NG_Data1[i, 4] == 2) { m.Remark += "芯包CCD极性检测NG,"; } + // m.Remark += MesMessage; + // } + // #endregion - bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage); + // bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage); - if (m.Flag == 1) - m.UpState = "已上传"; - else - m.UpState = "未上传"; + // if (m.Flag == 1) + // m.UpState = "已上传"; + // else + // m.UpState = "未上传"; - } - else - { - m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; - m.Result = MyRes[i] = m.listRes[i] = 2; - m.UpState = "未上传"; - ////芯包测厚（位移）判定结果 - //if (m.NG_Data1[i, 3] == 2) { m.Remark += "芯包侧厚（位移）NG,"; } - ////芯包测厚（压力）判定结果 - //if (false) { m.Remark += "芯包侧厚（压力）NG,"; } - ////芯包重量1判定结果 - //if (m.NG_Data1[i, 1] == 2) { m.Remark += "芯包重量NG,"; } - ////芯包CCD极性检测结果 - //if (m.NG_Data1[i, 4] == 2) { m.Remark += "芯包CCD极性检测NG,"; } - } + // } + // else + // { + // m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; + // m.Result = MyRes[i] = m.listRes[i] = 2; + // m.UpState = "未上传"; + // ////芯包测厚（位移）判定结果 + // //if (m.NG_Data1[i, 3] == 2) { m.Remark += "芯包侧厚（位移）NG,"; } + // ////芯包测厚（压力）判定结果 + // //if (false) { m.Remark += "芯包侧厚（压力）NG,"; } + // ////芯包重量1判定结果 + // //if (m.NG_Data1[i, 1] == 2) { m.Remark += "芯包重量NG,"; } + // ////芯包CCD极性检测结果 + // //if (m.NG_Data1[i, 4] == 2) { m.Remark += "芯包CCD极性检测NG,"; } + // } - } - else - { - m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; - m.Result = MyRes[i] = m.listRes[i] = 2; - m.Remark += "无条码,本地存储"; - //正常无条码，以下不会NG不会出现 - ////芯包重量1判定结果 - //if (m.NG_Data1[i, 1] == 2) { m.Remark += ",芯包重量NG"; } - ////芯包侧厚判定结果 - //if (m.NG_Data1[i, 3] == 2) { m.Remark += ",芯包侧厚NG"; } - ////芯包CCD极性检测结果 - //if (m.NG_Data1[i, 4] == 2) { m.Remark += ",芯包CCD极性检测NG"; } - m.UpState = "未上传"; - } + // } + // else + // { + // m.CSBYHOUTSTATIONJUDGMENTRESULT = "NG"; + // m.Result = MyRes[i] = m.listRes[i] = 2; + // m.Remark += "无条码,本地存储"; + // //正常无条码，以下不会NG不会出现 + // ////芯包重量1判定结果 + // //if (m.NG_Data1[i, 1] == 2) { m.Remark += ",芯包重量NG"; } + // ////芯包侧厚判定结果 + // //if (m.NG_Data1[i, 3] == 2) { m.Remark += ",芯包侧厚NG"; } + // ////芯包CCD极性检测结果 + // //if (m.NG_Data1[i, 4] == 2) { m.Remark += ",芯包CCD极性检测NG"; } + // m.UpState = "未上传"; + // } - //极限件发3给PLC - //if (ChallengeFlag == 1) - //{ - // if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0) - // { - // MyRes[i] = 3; - // } - // if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0) - // { - // MyRes[i] = 4; - // } - //} + // //极限件发3给PLC + // //if (ChallengeFlag == 1) + // //{ + // // if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0) + // // { + // // MyRes[i] = 3; + // // } + // // if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0) + // // { + // // MyRes[i] = 4; + // // } + // //} - Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); }); + // Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); }); - } - catch (Exception ex) - { - LogHelper.Instance.WriteError($"卷芯出站线程数据解析：{ex}", "SysErrorLog"); - } - } + // } + // catch (Exception ex) + // { + // LogHelper.Instance.WriteError($"卷芯出站线程数据解析：{ex}", "SysErrorLog"); + // } + // } - #endregion - JYResult result1 = null; - JYResult result2 = null; - if (pf.IsFeedbackPlc) - { - //result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC - //result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC - } - JYResult result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0 - //CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); - //LogHelper.Instance.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); + // #endregion + // JYResult result1 = null; + // JYResult result2 = null; + // if (pf.IsFeedbackPlc) + // { + // //result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC + // //result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC + // } + // JYResult result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0 + // //CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); + // //LogHelper.Instance.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); - //数据存储 - 异步处理 - Task.Run(() => - { - SaveBlankingData(list); - }); + // //数据存储 - 异步处理 + // Task.Run(() => + // { + // SaveBlankingData(list); + // }); - sw2.Stop(); - ////输出下料数据处理耗时： - CommonMethods.AddDataMonitorLog(0, $"NG出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms"); - } + // sw2.Stop(); + // ////输出下料数据处理耗时： + // CommonMethods.AddDataMonitorLog(0, $"NG出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms"); + //} + #endregion } #region 下料工位(数据处理) //int OutCount = 0; - //下料解析 + #region //下料解析 预焊检 + //private void BlankingStation_YHJ(JYResult bArrays, object plcModel) + //{ + // Group pf = plcModel as Group; + // if (bArrays == null) + // { + // CommonMethods.PlcLink.WriteInt16(pf.VarList[0].VarAddress, 0);//置位0 + // CommonMethods.AddLog(false, $"电芯出站PLC有触发信号，但无数据!"); + // LogHelper.Instance.WriteLog($"电芯出站PLC有触发信号，但无数据!", "SysErrorLog"); + // } + // if (bArrays.IsSuccess && bArrays.Content != null) + // { + // Random random = new Random(); + // //解析数据 + // sw2.Restart(); + // #region 数据变量定义 + // List list = new List();//实体 + // //int[] MyRes = new int[2];//AB反馈结果 + // int[] MyRes = new int[3];//三个卷芯反馈结果 + // #endregion + // //高低位转换 + // byte[] bytes = bArrays.Content.ByteReverse(); + // byte[] bytes1 = bArrays.Content; + + // List listBarCode = GetList(3, "");//电芯条码 + // //List listNum = GetList(1, "");//进站磁悬浮动子编号 + // List listRes = GetList(3, 0);//出站电芯反馈结果 + // //反馈结果 + // #region 电芯解析 + // //电芯解析 从3200 开始 + // listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + // listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + // listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + // #region 上传MES + // //D3100起 + // for (int i = 0; i < 3; i++) + // { + // try + // { + // BGearEntity m = new BGearEntity(); + // AGearEntity TT = new AGearEntity(); + // //极限件标志 + // int ChallengeFlag = 0; + // if (i == 0) + // { + // //为了同时上传AB消息而增加,后续可能不需要 + // UpAB(ref m); + + // m.A_B = "A芯包"; + // //芯包信息1 D3300~D3326 + // for (int j = 0; j < 27; j++) + // { + // m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB); + // } + // //芯包信息2 D3330~D3356 + // for (int j = 0; j < 27; j++) + // { + // m.list_Data2[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB); + // } + // //芯包信息3 D3360~D3386 + // for (int j = 0; j < 27; j++) + // { + // m.list_Data3[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB); + // } + + + + + + + // //A芯包信息1 D3240~D3262 + // for (int j = 0; j < 28; j++) + // { + // m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB); + // } + // //A芯包信息2（焊机相关次数） D3300~D3326 + // for (int j = 0; j < 19; j++) + // { + // m.list_Data2[i, j] = IntLib.GetIntFromByteArray(bArrays.Content, 400 + j * 4, DataFormat.CDAB); + // } + // //A芯包信息3(设定值) D3400~D3506 + // for (int j = 0; j < 54; j++) + // { + // m.list_Data3[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + j * 4, DataFormat.CDAB); + // } + + // //A芯包信息4(实际值) D3550~D3634 + // for (int j = 0; j < 47; j++) + // { + // m.list_Data4[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 900 + j * 4, DataFormat.CDAB); + // } + // for (int j = 0; j <1; j++) + // { + // m.list_pan[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content,1088 + j * 2, DataFormat.CDAB); + // } + + // } + // else + // { + // m.A_B = "B芯包"; + // //B芯包信息1 D3740~D3762 + // for (int j = 0; j < 28; j++) + // { + // m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 1280 + j * 2, DataFormat.CDAB); + // } + // //B芯包信息2（焊机相关次数） D3800~D3826 + // for (int j = 0; j < 19; j++) + // { + // m.list_Data2[i, j] = IntLib.GetIntFromByteArray(bArrays.Content, 1400 + j * 4, DataFormat.CDAB); + // } + // //B芯包信息3(设定值) D3900~D4006 + // for (int j = 0; j < 54; j++) + // { + // m.list_Data3[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 1600 + j * 4, DataFormat.CDAB); + // } + + // //B芯包信息4(实际值) D4050~D4134 + // for (int j = 0; j < 47; j++) + // { + // m.list_Data4[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 1900 + j * 4, DataFormat.CDAB); + // } + // for (int j = 0; j < 1; j++) + // { + // m.list_pan[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 1188 + j * 2, DataFormat.CDAB); + // } + // } + // //芯包扫码时间 + // //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + // //芯包条码 D3200~D3239 + // m.CSBYHCODEA = StringLib.GetStringFromByteArrayByEncoding(bytes1, 200 + 40 * i, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + // //m.CSBYHCODEA = "TEST"; + + // var EX = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetChallengeCode(m.CSBYHCODEA)); + // for (int j = 0; j < EX.Count; j++) + // { + // if (string.Compare(EX[j].ChallengeBarCode, m.CSBYHCODEA) == 0) + // { + // m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")"; + // ChallengeFlag = 1; + // } + // } + // //查询进站时间数据 + // var w = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetInTime(m.CSBYHCODEA)); + // //获取新一行数据 + // if (w.Count > 0) + // TT = w[w.Count - 1]; + // // + // //if (w.Count > 0) + // // TT = w[0]; + // if (TT.TestTime != null) + // m.ScanTime[0] = TT.TestTime; + // else + // m.ScanTime[0] = ""; + // //芯包出站时间 + // m.ScanTime[1] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + // //复投次数 + // m.RethrowNum = 0; + // if (w.Count > 0) + // { + // int cccc = w.Count; + // m.RethrowNum = cccc - 1; + // } + + // int Code_NG = 0;//条码有无标志 1为有，2为无 + // //判断有无条码 + // if (m.CSBYHCODEA != null && m.CSBYHCODEA != "" && m.CSBYHCODEA != "ERROR") + // Code_NG = 1; + // else + // Code_NG = 2; + + // //m.ChannelNo = m.MyNo[i]; + // //m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + // //不良代码判定 + // 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]); + + // //芯包重量1判定结果 + // if (m.list_Data1[i, 10] == 1) + // m.CSBYHWEIGHTRESULTA1 = "OK"; + // else if (m.list_Data1[i, 10] == 2) + // m.CSBYHWEIGHTRESULTA1 = "NG"; + // else + // m.CSBYHWEIGHTRESULTA1 = "OK"; + // //芯包侧厚判定结果 + // if (m.list_Data1[i, 11] == 1) + // m.CSBYHTHICKNESSTESTJUDGERESULTA = "OK"; + // else if (m.list_Data1[i, 11] == 2) + // m.CSBYHTHICKNESSTESTJUDGERESULTA = "NG"; + // else + // m.CSBYHTHICKNESSTESTJUDGERESULTA = "OK"; + // //芯包CCD极性检测结果 + // if (m.list_Data1[i, 12] == 1) + // m.CSBYHPOLARITYRESULTA = "OK"; + // else if (m.list_Data1[i, 12] == 2) + // m.CSBYHPOLARITYRESULTA = "NG"; + // else + // m.CSBYHPOLARITYRESULTA = "OK"; + // //电芯裁切粘连判定结果 + // if (m.list_Data1[i, 13] == 1) + // m.CSBYHCUTADHESIONJUDGERESULTA = "OK"; + // else if (m.list_Data1[i, 13] == 2) + // m.CSBYHCUTADHESIONJUDGERESULTA = "NG"; + // else + // m.CSBYHCUTADHESIONJUDGERESULTA = "OK"; + // //电芯裁切毛刺判定结果 + // if (m.list_Data1[i, 14] == 1) + // m.CSBYHCUTBURRJUDGERESULTA = "OK"; + // else if (m.list_Data1[i, 14] == 2) + // m.CSBYHCUTBURRJUDGERESULTA = "NG"; + // else + // m.CSBYHCUTBURRJUDGERESULTA = "OK"; + // //芯包铜焊印位置判定结果1 + // if (m.list_Data1[i, 15] == 1) + // { + // m.CSBYHSOLDERJUDGERESULTA = "OK"; + // } + // else if (m.list_Data1[i, 15] == 2) + // { + // m.CSBYHSOLDERJUDGERESULTA = "NG"; + // } + // else + // { + // m.CSBYHSOLDERJUDGERESULTA = "OK"; + // } + // //芯包铜焊印位置判定结果2 + // if (m.list_Data1[i, 26] == 1) + // { + // m.CSBYHSOLDERJUDGERESULTA2 = "OK"; + // } + // else if (m.list_Data1[i, 26] == 2) + // { + // m.CSBYHSOLDERJUDGERESULTA2 = "NG"; + // } + // else + // { + // m.CSBYHSOLDERJUDGERESULTA2 = "OK"; + // } + // //芯包正面极耳撕裂判定结果 + // if (m.list_Data1[i, 16] == 1) + // m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "OK"; + // else if (m.list_Data1[i, 16] == 2) + // m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "NG"; + // else + // m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "OK"; + // //芯包背面极耳撕裂判定结果 + // if (m.list_Data1[i, 17] == 1) + // m.CSBYHBACKEARCRACKLEJUDGERESULTA = "OK"; + // else if (m.list_Data1[i, 17] == 2) + // m.CSBYHBACKEARCRACKLEJUDGERESULTA = "NG"; + // else + // m.CSBYHBACKEARCRACKLEJUDGERESULTA = "OK"; + // //芯包正面极耳翻折检测结果 + // if (m.list_Data1[i, 18] == 1) + // m.CSBYHFRONTEARFLODINGRESULTA = "OK"; + // else if (m.list_Data1[i, 18] == 2) + // m.CSBYHFRONTEARFLODINGRESULTA = "NG"; + // else + // m.CSBYHFRONTEARFLODINGRESULTA = "OK"; + // //芯包背面极耳翻折检测结果 + // if (m.list_Data1[i, 19] == 1) + // m.CSBYHBACKEARFLODINGRESULTA = "OK"; + // else if (m.list_Data1[i, 19] == 2) + // m.CSBYHBACKEARFLODINGRESULTA = "NG"; + // else + // m.CSBYHBACKEARFLODINGRESULTA = "OK"; + + // //电芯测厚压力结果 + // if (m.list_Data1[i, 23] == 1) + // m.ThicknessPressureResult = "OK"; + // else if (m.list_Data1[i, 23] == 2) + // m.ThicknessPressureResult = "NG"; + // else + // m.ThicknessPressureResult = "OK"; + // //芯包焊前CCD检测结果 + // if (m.list_Data1[i, 24] == 1) + // m.PreweldResult = "OK"; + // else if (m.list_Data1[i, 24] == 2) + // m.PreweldResult = "NG"; + // else + // m.PreweldResult = "OK"; + // //芯包铝焊印位置判定结果1 + // if (m.list_Data1[i, 25] == 1) + // { + // m.AluminiumWeldPositionResult1 = "OK"; + // } + // else if (m.list_Data1[i, 25] == 2) + // { + // m.AluminiumWeldPositionResult1 = "NG"; + // } + // else + // { + // m.AluminiumWeldPositionResult1 = "OK"; + // } + // //芯包铝焊印位置判定结果2 + // if (m.list_Data1[i, 27] == 1) + // { + // m.AluminiumWeldPositionResult2 = "OK"; + // } + // else if (m.list_Data1[i, 27] == 2) + // { + // m.AluminiumWeldPositionResult2 = "NG"; + // } + // else + // { + // m.AluminiumWeldPositionResult2 = "OK"; + // } + + // m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + // //m.RingA = m.list_Data1[i, 0];//无环轨编号，不显示 + // m.CSBYHWEIGHTNOA1 = m.list_Data1[i, 1]; + // m.CSBYHTHICKNESSTESTSTATIONNOA = m.list_Data1[i, 2]; + // m.CSBYHTOOLNOA = m.list_Data1[i, 3]; + // m.CSBYHCUWELDINGSTATIONNOA1 = m.list_Data1[i, 4]; + // m.CSBYHCUWELDINGSTATIONNOA2 = m.list_Data1[i, 5]; + // m.CSBYHCUWELDINGSTATIONNOA3 = m.list_Data1[i, 6]; + // m.CSBYHALWELDINGSTATIONNOA1 = m.list_Data1[i, 7]; + // m.CSBYHALWELDINGSTATIONNOA2 = m.list_Data1[i, 8]; + // m.CSBYHALWELDINGSTATIONNOA3 = m.list_Data1[i, 9]; + // m.CSBYHCUTABCUTTERNOA = m.list_Data1[i, 21]; + // m.CSBYHALTABCUTTERNOA = m.list_Data1[i, 22]; + + // m.CSBYHCUWELDHEADCOUNTA1 = m.list_Data2[i, 0]; + // m.CSBYHCUWELDHEADCOUNTA2 = m.list_Data2[i, 2]; + // m.CSBYHCUWELDHEADCOUNTA3 = m.list_Data2[i, 4]; + // m.CSBYHCUWELDBASECOUNTA1 = m.list_Data2[i, 1]; + // m.CSBYHCUWELDBASECOUNTA2 = m.list_Data2[i, 3]; + // m.CSBYHCUWELDBASECOUNTA3 = m.list_Data2[i, 5]; + + // m.CSBYHALWELDHEADCOUNTA1 = m.list_Data2[i, 6]; + // m.CSBYHALWELDHEADCOUNTA2 = m.list_Data2[i, 8]; + // m.CSBYHALWELDHEADCOUNTA3 = m.list_Data2[i, 10]; + // m.CSBYHALWELDBASECOUNTA1 = m.list_Data2[i, 7]; + // m.CSBYHALWELDBASECOUNTA2 = m.list_Data2[i, 9]; + // m.CSBYHALWELDBASECOUNTA3 = m.list_Data2[i, 11]; + // m.CSBYHCUTABCUTTERCOUNTA = m.list_Data2[i, 12]; + // m.CSBYHALTABCUTTERCOUNTA = m.list_Data2[i, 13]; + // m.CopperWeldHeadLife = m.list_Data2[i, 14]; + // m.CopperWeldSeatLife = m.list_Data2[i, 15]; + // m.AluminiumWeldHeadLife = m.list_Data2[i, 16]; + // m.AluminiumWeldSeatLife = m.list_Data2[i, 17]; + // m.CuttingKnifeLife = m.list_Data2[i, 18]; + + // m.CSBYHPROCESSNAME = "超声波预焊接"; + // m.CSBYHSCHEDULE = CommonMethods.strClass; + // m.CSBYHINSTATIONTIME = m.ScanTime[0]; + // m.CSBYHOUTSTATIONTIME = m.ScanTime[1]; + + // m.CSBYHWEIGHTA1MAXSETTING = SaveTwoNum(m.list_Data3[i, 0]); + // m.CSBYHWEIGHTA1MINSETTING = SaveTwoNum(m.list_Data3[i, 1]); + // m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA = SaveTwoNum(m.list_Data3[i, 2]); + // m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA = SaveTwoNum(m.list_Data3[i, 3]); + // m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA = SaveTwoNum(m.list_Data3[i, 4]); + // m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA = SaveTwoNum(m.list_Data3[i, 5]); + // m.CSBYHCUWELDINGPRESSUREMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 6]);//压力最大 + // m.CSBYHCUWELDINGPRESSUREMINSETTING = SaveTwoNum(m.list_Data3[i, 7]);//压力最小值 + // m.CSBYHCUWELDINGPRESSUREMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 14]);//压力只有一个设定值，显示该值 + // m.CSBYHCUWELDINGPRESSUREMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 22]);//压力只有一个设定值，显示该值 + // m.CSBYHCUWELDINGPOWERMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 8]); + // m.CSBYHCUWELDINGPOWERMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 16]); + // m.CSBYHCUWELDINGPOWERMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 24]); + // m.CSBYHCUWELDINGPOWERMINSETTING1 = SaveTwoNum(m.list_Data3[i, 9]); + // m.CSBYHCUWELDINGPOWERMINSETTING2 = SaveTwoNum(m.list_Data3[i, 17]); + // m.CSBYHCUWELDINGPOWERMINSETTING3 = SaveTwoNum(m.list_Data3[i, 25]); + // m.CSBYHCUWELDINGENERGYMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 10]); + // m.CSBYHCUWELDINGENERGYMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 18]); + // m.CSBYHCUWELDINGENERGYMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 26]); + // m.CSBYHCUWELDINGENERGYMINSETTING1 = SaveTwoNum(m.list_Data3[i, 11]); + // m.CSBYHCUWELDINGENERGYMINSETTING2 = SaveTwoNum(m.list_Data3[i, 19]); + // m.CSBYHCUWELDINGENERGYMINSETTING3 = SaveTwoNum(m.list_Data3[i, 27]); + // m.CSBYHCUWELDINGAMPLITUDEMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 12]); + // m.CSBYHCUWELDINGAMPLITUDEMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 20]); + // m.CSBYHCUWELDINGAMPLITUDEMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 28]); + // m.CSBYHCUWELDINGAMPLITUDEMINSETTING1 = SaveTwoNum(m.list_Data3[i, 13]); + // m.CSBYHCUWELDINGAMPLITUDEMINSETTING2 = SaveTwoNum(m.list_Data3[i, 21]); + // m.CSBYHCUWELDINGAMPLITUDEMINSETTING3 = SaveTwoNum(m.list_Data3[i, 29]); + + // m.CSBYHALWELDINGPRESSUREMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 30]);// + // m.CSBYHALWELDINGPRESSUREMINSETTING = SaveTwoNum(m.list_Data3[i, 31]);// + // m.CSBYHALWELDINGPRESSUREMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 38]);// + // m.CSBYHALWELDINGPRESSUREMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 46]);// + // m.CSBYHALWELDINGPOWERMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 32]); + // m.CSBYHALWELDINGPOWERMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 40]); + // m.CSBYHALWELDINGPOWERMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 48]); + // m.CSBYHALWELDINGPOWERMINSETTING1 = SaveTwoNum(m.list_Data3[i, 33]); + // m.CSBYHALWELDINGPOWERMINSETTING2 = SaveTwoNum(m.list_Data3[i, 41]); + // m.CSBYHALWELDINGPOWERMINSETTING3 = SaveTwoNum(m.list_Data3[i, 49]); + // m.CSBYHALWELDINGENERGYMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 34]); + // m.CSBYHALWELDINGENERGYMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 42]); + // m.CSBYHALWELDINGENERGYMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 50]); + // m.CSBYHALWELDINGENERGYMINSETTING1 = SaveTwoNum(m.list_Data3[i, 35]); + // m.CSBYHALWELDINGENERGYMINSETTING2 = SaveTwoNum(m.list_Data3[i, 43]); + // m.CSBYHALWELDINGENERGYMINSETTING3 = SaveTwoNum(m.list_Data3[i, 51]); + // m.CSBYHALWELDINGAMPLITUDEMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 36]); + // m.CSBYHALWELDINGAMPLITUDEMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 44]); + // m.CSBYHALWELDINGAMPLITUDEMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 52]); + // m.CSBYHALWELDINGAMPLITUDEMINSETTING1 = SaveTwoNum(m.list_Data3[i, 37]); + // m.CSBYHALWELDINGAMPLITUDEMINSETTING2 = SaveTwoNum(m.list_Data3[i, 45]); + // m.CSBYHALWELDINGAMPLITUDEMINSETTING3 = SaveTwoNum(m.list_Data3[i, 53]); + // //m.pan = m.list_pan[i, 0]; + // m.CSBYHWEIGHTA1 = SaveTwoNum(m.list_Data4[i, 0]); + // m.CSBYHTHICKNESSTESTPRESSUREA = SaveTwoNum(m.list_Data4[i, 1]); + // m.CSBYHTHICKNESSTESTPRESSURESIZEA = SaveTwoNum(m.list_Data4[i, 2]); + // m.CSBYHCUTABLENGTHA = SaveTwoNum(m.list_Data4[i, 3]); + // m.CSBYHCUTABWIDTHA = SaveTwoNum(m.list_Data4[i, 4]); + // m.CSBYHALTABLENGTHA = SaveTwoNum(m.list_Data4[i, 5]); + // m.CSBYHALTABWIDTHA = SaveTwoNum(m.list_Data4[i, 6]); + // m.CSBYHCUTADHESIONRESULTA = SaveTwoNum(m.list_Data4[i, 7]); + // m.CSBYHCUTBURRRESULTA = SaveTwoNum(m.list_Data4[i, 8]); + // m.CSBYHTOPTOSOLDERDISTANCEA = SaveTwoNum(m.list_Data4[i, 9]); + // m.CSBYHTOPTOSOLDERDISTANCEA2 = SaveTwoNum(m.list_Data4[i, 45]); + // m.CSBYHSOLDERTOEARDISTANCEA = SaveTwoNum(m.list_Data4[i, 10]); + // m.CSBYHFRONTEARCRACKLERESULTA = SaveTwoNum(m.list_Data4[i, 11]); + // m.CSBYHBACKEARCRACKLERESULTA = SaveTwoNum(m.list_Data4[i, 12]); + // m.AluminumToWeld1 = SaveTwoNum(m.list_Data4[i, 44]); + // m.AluminumToWeld2 = SaveTwoNum(m.list_Data4[i, 46]); + + // m.CSBYHCUPRESSUREA1 = SaveTwoNum(m.list_Data4[i, 13]); + // m.CSBYHCUPOWERA1 = SaveTwoNum(m.list_Data4[i, 14]); + // m.CSBYHCUENERGYA1 = SaveTwoNum(m.list_Data4[i, 15]); + // m.CSBYHCUAMPLITUDEA1 = SaveTwoNum(m.list_Data4[i, 16]); + // m.CSBYHCUTIMEA1 = SaveTwoNum(m.list_Data4[i, 17]); + // m.CSBYHCUPRESSUREA2 = SaveTwoNum(m.list_Data4[i, 18]); + // m.CSBYHCUPOWERA2 = SaveTwoNum(m.list_Data4[i, 19]); + // m.CSBYHCUENERGYA2 = SaveTwoNum(m.list_Data4[i, 20]); + // m.CSBYHCUAMPLITUDEA2 = SaveTwoNum(m.list_Data4[i, 21]); + // m.CSBYHCUTIMEA2 = SaveTwoNum(m.list_Data4[i, 22]); + // m.CSBYHCUPRESSUREA3 = SaveTwoNum(m.list_Data4[i, 23]); + // m.CSBYHCUPOWERA3 = SaveTwoNum(m.list_Data4[i, 24]); + // m.CSBYHCUENERGYA3 = SaveTwoNum(m.list_Data4[i, 25]); + // m.CSBYHCUAMPLITUDEA3 = SaveTwoNum(m.list_Data4[i, 26]); + // m.CSBYHCUTIMEA3 = SaveTwoNum(m.list_Data4[i, 27]); + + // m.CSBYHALPRESSUREA1 = SaveTwoNum(m.list_Data4[i, 28]); + // m.CSBYHALPOWERA1 = SaveTwoNum(m.list_Data4[i, 29]); + // m.CSBYHALENERGYA1 = SaveTwoNum(m.list_Data4[i, 30]); + // m.CSBYHALAMPLITUDEA1 = SaveTwoNum(m.list_Data4[i, 31]); + // m.CSBYHALTIMEA1 = SaveTwoNum(m.list_Data4[i, 32]); + // m.CSBYHALPRESSUREA2 = SaveTwoNum(m.list_Data4[i, 33]); + // m.CSBYHALPOWERA2 = SaveTwoNum(m.list_Data4[i, 34]); + // m.CSBYHALENERGYA2 = SaveTwoNum(m.list_Data4[i, 35]); + // m.CSBYHALAMPLITUDEA2 = SaveTwoNum(m.list_Data4[i, 36]); + // m.CSBYHALTIMEA2 = SaveTwoNum(m.list_Data4[i, 37]); + // m.CSBYHALPRESSUREA3 = SaveTwoNum(m.list_Data4[i, 38]); + // m.CSBYHALPOWERA3 = SaveTwoNum(m.list_Data4[i, 39]); + // m.CSBYHALENERGYA3 = SaveTwoNum(m.list_Data4[i, 40]); + // m.CSBYHALAMPLITUDEA3 = SaveTwoNum(m.list_Data4[i, 41]); + // m.CSBYHALTIMEA3 = SaveTwoNum(m.list_Data4[i, 42]); + // m.ThicknessMeasureDisplacement = m.list_Data4[i, 43]; + + // //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置， + // //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折 + // MyRes[i] = JudgmentResult(Code_NG, m.list_Data1[i, 10], m.list_Data1[i, 11], + // m.list_Data1[i, 12], m.list_Data1[i, 13], m.list_Data1[i, 14], m.list_Data1[i, 15], + // 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.Result = MyRes[i]; + + // m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG; ; + + // m.Remark += NG_Type; + + // NG_Type = "";//清除上一次不良字符串 + // OK_NG = ""; //清除上一次结果 + + // list.Add(m); + + // string ur2 = CommonMethods.mesConfig.ResultProcessParamMesUrl; + // string siteCode1 = CommonMethods.mesConfig.siteCode; + // string lineCode1 = CommonMethods.mesConfig.lineCode; + // string equipNum1 = CommonMethods.mesConfig.equipNum; + // string materialCode1 = CommonMethods.mesConfig.MaterialCode; + // string userName1 = CommonMethods.mesConfig.mesUserName; + // MesUploadType unloadType = MesUploadType.DD; + // string Mesage = ""; + // //加判断无条码不上传mes 1为有条码 + // if (Code_NG == 1) + // { + // string MesMessage = ""; + // MesResType mesResType = MesResType.C; + // if (CommonMethods.mesConfig.isUpMes) + // { + // string url = CommonMethods.mesConfig.OutStationMesUrl; + // string siteCode = CommonMethods.mesConfig.siteCode; + // string lineCode = CommonMethods.mesConfig.lineCode; + // string equipNum = CommonMethods.mesConfig.equipNum; + // string materialCode = CommonMethods.mesConfig.MaterialCode; + // string userName = CommonMethods.mesConfig.mesUserName; + // int type = 1; + // //int type = 1; + // //string materialLotCodeLocator = ""; + + // bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, m, ref MesMessage, ref mesResType, NGcodeList); + // //bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,) + // if (MesMessage.Contains("发生一个或多个错误")) + // { + // MesMessage = "上传失败,"; + // } + // else + // { + // m.Flag = 1; + // } + // if (Res) + // { + // //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 + // { + // switch (mesResType) + // { + // case MesResType.A:// 停线，设备报警停机 + // //m.listRes[i] = 10; + // m.Result = MyRes[i] = 2; + // //m.Remark = MesMessage[i]; + // break; + // case MesResType.B://不停机，MEs NG品要排出，要给PLC发NG信号 + // //m.listRes[i] = 9; + // m.Result = MyRes[i] = 2; + // //m.Remark = MesMessage[i]; + // break; + // case MesResType.C://可忽略 + // //m.listRes[i] = 1; + // m.Result = MyRes[i] = 2; + // //m.Remark = MesMessage[i]; + // break; + // default: + // 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; + // } + + // bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage); + + + // if (m.Flag == 1) + // m.UpState = "已上传"; + // else + // m.UpState = "未上传"; + // } + // else + // { + // m.Result = MyRes[i]; + // m.Remark += "本地存储"; + // m.UpState = "未上传"; + // } + // if (CommonMethods.sysConfig.OKSwitching) + // { + // //调试发OK + // m.Result = MyRes[i] = 1; + // //m.Result = "OK"; + // } + // } + // 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.UpState = "未上传"; + // } + // //极限件发3给PLC + // if (ChallengeFlag == 1) + // { + // if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊前ccd") == 0) + // { + // MyRes[i] = 3; + // } + // if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊后ccd") == 0) + // { + // MyRes[i] = 4; + // } + // } + // } + // catch (Exception ex) + // { + // LogHelper.Instance.WriteError($"卷芯出站线程数据解析：{ex}", "SysErrorLog"); + // } + // } + + // #endregion + // JYResult result1 = null; + // JYResult result2 = null; + // if (pf.IsFeedbackPlc) + // { + // //result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC + // //result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC + // //if (CommonMethods.sysConfig.OKSwitching) + // { + // //调试发OK + // //MyRes[0] = 1; + // //MyRes[1] = 1; + // Thread.Sleep(500); + // result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC + // result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC + // } + // //else + // //{ + // // //将mes反馈的结果发给PLC + // // Thread.Sleep(500); + // // result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC + // // result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC + // //} + // } + // JYResult result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0 + // CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); + // LogHelper.Instance.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); + + // Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); }); + // //数据存储 - 异步处理 + // Task.Run(() => + // { + // SaveBlankingData(list); + // }); + + // sw2.Stop(); + // ////输出下料数据处理耗时： + // CommonMethods.AddDataMonitorLog(0, $"卷芯出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms"); + // } + //} + #endregion + //下料解析 外观检 private void BlankingStation(JYResult bArrays, object plcModel) { Group pf = plcModel as Group; @@ -963,20 +1613,25 @@ namespace JinYuan.ControlCenters sw2.Restart(); #region 数据变量定义 List list = new List();//实体 - int[] MyRes = new int[2];//AB反馈结果 - + //int[] MyRes = new int[2];//AB反馈结果 + int[] MyRes = new int[3];//三个卷芯反馈结果 #endregion //高低位转换 byte[] bytes = bArrays.Content.ByteReverse(); byte[] bytes1 = bArrays.Content; + + List listBarCode = GetList(3, "");//电芯条码 + //List listNum = GetList(1, "");//进站磁悬浮动子编号 + List listRes = GetList(3, 0);//出站电芯反馈结果 //反馈结果 #region 电芯解析 - - - //电芯解析 + //电芯解析 从3200 开始 + listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); #region 上传MES - //D3100起 - for (int i = 0; i < 2; i++) + //D3200起 + for (int i = 0; i < 3; i++) { try { @@ -984,72 +1639,21 @@ namespace JinYuan.ControlCenters AGearEntity TT = new AGearEntity(); //极限件标志 int ChallengeFlag = 0; - if (i == 0) + //芯包信息1 D3300~D3326 + //芯包信息2 D3330~D3356 + //芯包信息3 D3360~D3386 + for (int j = 0; j < 27; j++) { - //为了同时上传AB消息而增加,后续可能不需要 - UpAB(ref m); - - m.A_B = "A芯包"; - //A芯包信息1 D3240~D3262 - for (int j = 0; j < 28; j++) - { - m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB); - } - //A芯包信息2（焊机相关次数） D3300~D3326 - for (int j = 0; j < 19; j++) - { - m.list_Data2[i, j] = IntLib.GetIntFromByteArray(bArrays.Content, 400 + j * 4, DataFormat.CDAB); - } - //A芯包信息3(设定值) D3400~D3506 - for (int j = 0; j < 54; j++) - { - m.list_Data3[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + j * 4, DataFormat.CDAB); - } - - //A芯包信息4(实际值) D3550~D3634 - for (int j = 0; j < 47; j++) - { - m.list_Data4[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 900 + j * 4, DataFormat.CDAB); - } - for (int j = 0; j <1; j++) - { - m.list_pan[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content,1088 + j * 2, DataFormat.CDAB); - } - + m.CCD_Data[i,j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB); } - else + for (int j = 0; j < 3; j++) { - m.A_B = "B芯包"; - //B芯包信息1 D3740~D3762 - for (int j = 0; j < 28; j++) - { - m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 1280 + j * 2, DataFormat.CDAB); - } - //B芯包信息2（焊机相关次数） D3800~D3826 - for (int j = 0; j < 19; j++) - { - m.list_Data2[i, j] = IntLib.GetIntFromByteArray(bArrays.Content, 1400 + j * 4, DataFormat.CDAB); - } - //B芯包信息3(设定值) D3900~D4006 - for (int j = 0; j < 54; j++) - { - m.list_Data3[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 1600 + j * 4, DataFormat.CDAB); - } - - //B芯包信息4(实际值) D4050~D4134 - for (int j = 0; j < 47; j++) - { - m.list_Data4[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 1900 + j * 4, DataFormat.CDAB); - } - for (int j = 0; j < 1; j++) - { - m.list_pan[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 1188 + j * 2, DataFormat.CDAB); - } + m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB); } + //芯包扫码时间 - //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - //芯包条码 D3200~D3239 - m.CSBYHCODEA = StringLib.GetStringFromByteArrayByEncoding(bytes1, 200 + 40 * i, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + m.CSBYHCODEA = listBarCode[i]; //m.CSBYHCODEA = "TEST"; var EX = CommonMethods.db.QuerySqlList(CommonMethods.dBSQL.GetChallengeCode(m.CSBYHCODEA)); @@ -1099,279 +1703,47 @@ namespace JinYuan.ControlCenters 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]); - //芯包重量1判定结果 - if (m.list_Data1[i, 10] == 1) - m.CSBYHWEIGHTRESULTA1 = "OK"; - else if (m.list_Data1[i, 10] == 2) - m.CSBYHWEIGHTRESULTA1 = "NG"; - else - m.CSBYHWEIGHTRESULTA1 = "OK"; - //芯包侧厚判定结果 - if (m.list_Data1[i, 11] == 1) - m.CSBYHTHICKNESSTESTJUDGERESULTA = "OK"; - else if (m.list_Data1[i, 11] == 2) - m.CSBYHTHICKNESSTESTJUDGERESULTA = "NG"; - else - m.CSBYHTHICKNESSTESTJUDGERESULTA = "OK"; - //芯包CCD极性检测结果 - if (m.list_Data1[i, 12] == 1) - m.CSBYHPOLARITYRESULTA = "OK"; - else if (m.list_Data1[i, 12] == 2) - m.CSBYHPOLARITYRESULTA = "NG"; - else - m.CSBYHPOLARITYRESULTA = "OK"; - //电芯裁切粘连判定结果 - if (m.list_Data1[i, 13] == 1) - m.CSBYHCUTADHESIONJUDGERESULTA = "OK"; - else if (m.list_Data1[i, 13] == 2) - m.CSBYHCUTADHESIONJUDGERESULTA = "NG"; - else - m.CSBYHCUTADHESIONJUDGERESULTA = "OK"; - //电芯裁切毛刺判定结果 - if (m.list_Data1[i, 14] == 1) - m.CSBYHCUTBURRJUDGERESULTA = "OK"; - else if (m.list_Data1[i, 14] == 2) - m.CSBYHCUTBURRJUDGERESULTA = "NG"; - else - m.CSBYHCUTBURRJUDGERESULTA = "OK"; - //芯包铜焊印位置判定结果1 - if (m.list_Data1[i, 15] == 1) - { - m.CSBYHSOLDERJUDGERESULTA = "OK"; - } - else if (m.list_Data1[i, 15] == 2) - { - m.CSBYHSOLDERJUDGERESULTA = "NG"; - } - else - { - m.CSBYHSOLDERJUDGERESULTA = "OK"; - } - //芯包铜焊印位置判定结果2 - if (m.list_Data1[i, 26] == 1) - { - m.CSBYHSOLDERJUDGERESULTA2 = "OK"; - } - else if (m.list_Data1[i, 26] == 2) - { - m.CSBYHSOLDERJUDGERESULTA2 = "NG"; - } - else - { - m.CSBYHSOLDERJUDGERESULTA2 = "OK"; - } - //芯包正面极耳撕裂判定结果 - if (m.list_Data1[i, 16] == 1) - m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "OK"; - else if (m.list_Data1[i, 16] == 2) - m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "NG"; - else - m.CSBYHFRONTEARCRACKLEJUDGERESULTA = "OK"; - //芯包背面极耳撕裂判定结果 - if (m.list_Data1[i, 17] == 1) - m.CSBYHBACKEARCRACKLEJUDGERESULTA = "OK"; - else if (m.list_Data1[i, 17] == 2) - m.CSBYHBACKEARCRACKLEJUDGERESULTA = "NG"; - else - m.CSBYHBACKEARCRACKLEJUDGERESULTA = "OK"; - //芯包正面极耳翻折检测结果 - if (m.list_Data1[i, 18] == 1) - m.CSBYHFRONTEARFLODINGRESULTA = "OK"; - else if (m.list_Data1[i, 18] == 2) - m.CSBYHFRONTEARFLODINGRESULTA = "NG"; - else - m.CSBYHFRONTEARFLODINGRESULTA = "OK"; - //芯包背面极耳翻折检测结果 - if (m.list_Data1[i, 19] == 1) - m.CSBYHBACKEARFLODINGRESULTA = "OK"; - else if (m.list_Data1[i, 19] == 2) - m.CSBYHBACKEARFLODINGRESULTA = "NG"; - else - m.CSBYHBACKEARFLODINGRESULTA = "OK"; + //电芯CCD判定结果 + #region //电芯CCD判定结果 + m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 2 ? "NG" : "缺图"); + m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 2 ? "NG" : "缺图"); + m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 2 ? "NG" : "缺图"); + m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 2 ? "NG" : "缺图"); + m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 2 ? "NG" : "缺图"); + m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 2 ? "NG" : "缺图"); + m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 2 ? "NG" : "缺图"); + m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 2 ? "NG" : "缺图"); + m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 2 ? "NG" : "缺图"); + m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 2 ? "NG" : "缺图"); + m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 2 ? "NG" : "缺图"); + m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 2 ? "NG" : "缺图"); + m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 2 ? "NG" : "缺图"); + m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 2 ? "NG" : "缺图"); + m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 2 ? "NG" : "缺图"); + m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 2 ? "NG" : "缺图"); + m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 2 ? "NG" : "缺图"); + m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 2 ? "NG" : "缺图"); + m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 2 ? "NG" : "缺图"); + m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 2 ? "NG" : "缺图"); + m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 2 ? "NG" : "缺图"); + m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 2 ? "NG" : "缺图"); + m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 2 ? "NG" : "缺图"); + m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 2 ? "NG" : "缺图"); + m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 2 ? "NG" : "缺图"); + m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 2 ? "NG" : "缺图"); + m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 2 ? "NG" : "缺图"); + #endregion - //电芯测厚压力结果 - if (m.list_Data1[i, 23] == 1) - m.ThicknessPressureResult = "OK"; - else if (m.list_Data1[i, 23] == 2) - m.ThicknessPressureResult = "NG"; - else - m.ThicknessPressureResult = "OK"; - //芯包焊前CCD检测结果 - if (m.list_Data1[i, 24] == 1) - m.PreweldResult = "OK"; - else if (m.list_Data1[i, 24] == 2) - m.PreweldResult = "NG"; - else - m.PreweldResult = "OK"; - //芯包铝焊印位置判定结果1 - if (m.list_Data1[i, 25] == 1) - { - m.AluminiumWeldPositionResult1 = "OK"; - } - else if (m.list_Data1[i, 25] == 2) - { - m.AluminiumWeldPositionResult1 = "NG"; - } - else - { - m.AluminiumWeldPositionResult1 = "OK"; - } - //芯包铝焊印位置判定结果2 - if (m.list_Data1[i, 27] == 1) - { - m.AluminiumWeldPositionResult2 = "OK"; - } - else if (m.list_Data1[i, 27] == 2) - { - m.AluminiumWeldPositionResult2 = "NG"; - } - else - { - m.AluminiumWeldPositionResult2 = "OK"; - } - - m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - //m.RingA = m.list_Data1[i, 0];//无环轨编号，不显示 - m.CSBYHWEIGHTNOA1 = m.list_Data1[i, 1]; - m.CSBYHTHICKNESSTESTSTATIONNOA = m.list_Data1[i, 2]; - m.CSBYHTOOLNOA = m.list_Data1[i, 3]; - m.CSBYHCUWELDINGSTATIONNOA1 = m.list_Data1[i, 4]; - m.CSBYHCUWELDINGSTATIONNOA2 = m.list_Data1[i, 5]; - m.CSBYHCUWELDINGSTATIONNOA3 = m.list_Data1[i, 6]; - m.CSBYHALWELDINGSTATIONNOA1 = m.list_Data1[i, 7]; - m.CSBYHALWELDINGSTATIONNOA2 = m.list_Data1[i, 8]; - m.CSBYHALWELDINGSTATIONNOA3 = m.list_Data1[i, 9]; - m.CSBYHCUTABCUTTERNOA = m.list_Data1[i, 21]; - m.CSBYHALTABCUTTERNOA = m.list_Data1[i, 22]; - - m.CSBYHCUWELDHEADCOUNTA1 = m.list_Data2[i, 0]; - m.CSBYHCUWELDHEADCOUNTA2 = m.list_Data2[i, 2]; - m.CSBYHCUWELDHEADCOUNTA3 = m.list_Data2[i, 4]; - m.CSBYHCUWELDBASECOUNTA1 = m.list_Data2[i, 1]; - m.CSBYHCUWELDBASECOUNTA2 = m.list_Data2[i, 3]; - m.CSBYHCUWELDBASECOUNTA3 = m.list_Data2[i, 5]; - - m.CSBYHALWELDHEADCOUNTA1 = m.list_Data2[i, 6]; - m.CSBYHALWELDHEADCOUNTA2 = m.list_Data2[i, 8]; - m.CSBYHALWELDHEADCOUNTA3 = m.list_Data2[i, 10]; - m.CSBYHALWELDBASECOUNTA1 = m.list_Data2[i, 7]; - m.CSBYHALWELDBASECOUNTA2 = m.list_Data2[i, 9]; - m.CSBYHALWELDBASECOUNTA3 = m.list_Data2[i, 11]; - m.CSBYHCUTABCUTTERCOUNTA = m.list_Data2[i, 12]; - m.CSBYHALTABCUTTERCOUNTA = m.list_Data2[i, 13]; - m.CopperWeldHeadLife = m.list_Data2[i, 14]; - m.CopperWeldSeatLife = m.list_Data2[i, 15]; - m.AluminiumWeldHeadLife = m.list_Data2[i, 16]; - m.AluminiumWeldSeatLife = m.list_Data2[i, 17]; - m.CuttingKnifeLife = m.list_Data2[i, 18]; - - m.CSBYHPROCESSNAME = "超声波预焊接"; + 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]; - m.CSBYHWEIGHTA1MAXSETTING = SaveTwoNum(m.list_Data3[i, 0]); - m.CSBYHWEIGHTA1MINSETTING = SaveTwoNum(m.list_Data3[i, 1]); - m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA = SaveTwoNum(m.list_Data3[i, 2]); - m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA = SaveTwoNum(m.list_Data3[i, 3]); - m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA = SaveTwoNum(m.list_Data3[i, 4]); - m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA = SaveTwoNum(m.list_Data3[i, 5]); - m.CSBYHCUWELDINGPRESSUREMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 6]);//压力最大 - m.CSBYHCUWELDINGPRESSUREMINSETTING = SaveTwoNum(m.list_Data3[i, 7]);//压力最小值 - m.CSBYHCUWELDINGPRESSUREMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 14]);//压力只有一个设定值，显示该值 - m.CSBYHCUWELDINGPRESSUREMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 22]);//压力只有一个设定值，显示该值 - m.CSBYHCUWELDINGPOWERMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 8]); - m.CSBYHCUWELDINGPOWERMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 16]); - m.CSBYHCUWELDINGPOWERMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 24]); - m.CSBYHCUWELDINGPOWERMINSETTING1 = SaveTwoNum(m.list_Data3[i, 9]); - m.CSBYHCUWELDINGPOWERMINSETTING2 = SaveTwoNum(m.list_Data3[i, 17]); - m.CSBYHCUWELDINGPOWERMINSETTING3 = SaveTwoNum(m.list_Data3[i, 25]); - m.CSBYHCUWELDINGENERGYMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 10]); - m.CSBYHCUWELDINGENERGYMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 18]); - m.CSBYHCUWELDINGENERGYMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 26]); - m.CSBYHCUWELDINGENERGYMINSETTING1 = SaveTwoNum(m.list_Data3[i, 11]); - m.CSBYHCUWELDINGENERGYMINSETTING2 = SaveTwoNum(m.list_Data3[i, 19]); - m.CSBYHCUWELDINGENERGYMINSETTING3 = SaveTwoNum(m.list_Data3[i, 27]); - m.CSBYHCUWELDINGAMPLITUDEMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 12]); - m.CSBYHCUWELDINGAMPLITUDEMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 20]); - m.CSBYHCUWELDINGAMPLITUDEMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 28]); - m.CSBYHCUWELDINGAMPLITUDEMINSETTING1 = SaveTwoNum(m.list_Data3[i, 13]); - m.CSBYHCUWELDINGAMPLITUDEMINSETTING2 = SaveTwoNum(m.list_Data3[i, 21]); - m.CSBYHCUWELDINGAMPLITUDEMINSETTING3 = SaveTwoNum(m.list_Data3[i, 29]); - - m.CSBYHALWELDINGPRESSUREMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 30]);// - m.CSBYHALWELDINGPRESSUREMINSETTING = SaveTwoNum(m.list_Data3[i, 31]);// - m.CSBYHALWELDINGPRESSUREMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 38]);// - m.CSBYHALWELDINGPRESSUREMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 46]);// - m.CSBYHALWELDINGPOWERMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 32]); - m.CSBYHALWELDINGPOWERMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 40]); - m.CSBYHALWELDINGPOWERMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 48]); - m.CSBYHALWELDINGPOWERMINSETTING1 = SaveTwoNum(m.list_Data3[i, 33]); - m.CSBYHALWELDINGPOWERMINSETTING2 = SaveTwoNum(m.list_Data3[i, 41]); - m.CSBYHALWELDINGPOWERMINSETTING3 = SaveTwoNum(m.list_Data3[i, 49]); - m.CSBYHALWELDINGENERGYMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 34]); - m.CSBYHALWELDINGENERGYMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 42]); - m.CSBYHALWELDINGENERGYMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 50]); - m.CSBYHALWELDINGENERGYMINSETTING1 = SaveTwoNum(m.list_Data3[i, 35]); - m.CSBYHALWELDINGENERGYMINSETTING2 = SaveTwoNum(m.list_Data3[i, 43]); - m.CSBYHALWELDINGENERGYMINSETTING3 = SaveTwoNum(m.list_Data3[i, 51]); - m.CSBYHALWELDINGAMPLITUDEMAXSETTING1 = SaveTwoNum(m.list_Data3[i, 36]); - m.CSBYHALWELDINGAMPLITUDEMAXSETTING2 = SaveTwoNum(m.list_Data3[i, 44]); - m.CSBYHALWELDINGAMPLITUDEMAXSETTING3 = SaveTwoNum(m.list_Data3[i, 52]); - m.CSBYHALWELDINGAMPLITUDEMINSETTING1 = SaveTwoNum(m.list_Data3[i, 37]); - m.CSBYHALWELDINGAMPLITUDEMINSETTING2 = SaveTwoNum(m.list_Data3[i, 45]); - m.CSBYHALWELDINGAMPLITUDEMINSETTING3 = SaveTwoNum(m.list_Data3[i, 53]); - //m.pan = m.list_pan[i, 0]; - m.CSBYHWEIGHTA1 = SaveTwoNum(m.list_Data4[i, 0]); - m.CSBYHTHICKNESSTESTPRESSUREA = SaveTwoNum(m.list_Data4[i, 1]); - m.CSBYHTHICKNESSTESTPRESSURESIZEA = SaveTwoNum(m.list_Data4[i, 2]); - m.CSBYHCUTABLENGTHA = SaveTwoNum(m.list_Data4[i, 3]); - m.CSBYHCUTABWIDTHA = SaveTwoNum(m.list_Data4[i, 4]); - m.CSBYHALTABLENGTHA = SaveTwoNum(m.list_Data4[i, 5]); - m.CSBYHALTABWIDTHA = SaveTwoNum(m.list_Data4[i, 6]); - m.CSBYHCUTADHESIONRESULTA = SaveTwoNum(m.list_Data4[i, 7]); - m.CSBYHCUTBURRRESULTA = SaveTwoNum(m.list_Data4[i, 8]); - m.CSBYHTOPTOSOLDERDISTANCEA = SaveTwoNum(m.list_Data4[i, 9]); - m.CSBYHTOPTOSOLDERDISTANCEA2 = SaveTwoNum(m.list_Data4[i, 45]); - m.CSBYHSOLDERTOEARDISTANCEA = SaveTwoNum(m.list_Data4[i, 10]); - m.CSBYHFRONTEARCRACKLERESULTA = SaveTwoNum(m.list_Data4[i, 11]); - m.CSBYHBACKEARCRACKLERESULTA = SaveTwoNum(m.list_Data4[i, 12]); - m.AluminumToWeld1 = SaveTwoNum(m.list_Data4[i, 44]); - m.AluminumToWeld2 = SaveTwoNum(m.list_Data4[i, 46]); - - m.CSBYHCUPRESSUREA1 = SaveTwoNum(m.list_Data4[i, 13]); - m.CSBYHCUPOWERA1 = SaveTwoNum(m.list_Data4[i, 14]); - m.CSBYHCUENERGYA1 = SaveTwoNum(m.list_Data4[i, 15]); - m.CSBYHCUAMPLITUDEA1 = SaveTwoNum(m.list_Data4[i, 16]); - m.CSBYHCUTIMEA1 = SaveTwoNum(m.list_Data4[i, 17]); - m.CSBYHCUPRESSUREA2 = SaveTwoNum(m.list_Data4[i, 18]); - m.CSBYHCUPOWERA2 = SaveTwoNum(m.list_Data4[i, 19]); - m.CSBYHCUENERGYA2 = SaveTwoNum(m.list_Data4[i, 20]); - m.CSBYHCUAMPLITUDEA2 = SaveTwoNum(m.list_Data4[i, 21]); - m.CSBYHCUTIMEA2 = SaveTwoNum(m.list_Data4[i, 22]); - m.CSBYHCUPRESSUREA3 = SaveTwoNum(m.list_Data4[i, 23]); - m.CSBYHCUPOWERA3 = SaveTwoNum(m.list_Data4[i, 24]); - m.CSBYHCUENERGYA3 = SaveTwoNum(m.list_Data4[i, 25]); - m.CSBYHCUAMPLITUDEA3 = SaveTwoNum(m.list_Data4[i, 26]); - m.CSBYHCUTIMEA3 = SaveTwoNum(m.list_Data4[i, 27]); - - m.CSBYHALPRESSUREA1 = SaveTwoNum(m.list_Data4[i, 28]); - m.CSBYHALPOWERA1 = SaveTwoNum(m.list_Data4[i, 29]); - m.CSBYHALENERGYA1 = SaveTwoNum(m.list_Data4[i, 30]); - m.CSBYHALAMPLITUDEA1 = SaveTwoNum(m.list_Data4[i, 31]); - m.CSBYHALTIMEA1 = SaveTwoNum(m.list_Data4[i, 32]); - m.CSBYHALPRESSUREA2 = SaveTwoNum(m.list_Data4[i, 33]); - m.CSBYHALPOWERA2 = SaveTwoNum(m.list_Data4[i, 34]); - m.CSBYHALENERGYA2 = SaveTwoNum(m.list_Data4[i, 35]); - m.CSBYHALAMPLITUDEA2 = SaveTwoNum(m.list_Data4[i, 36]); - m.CSBYHALTIMEA2 = SaveTwoNum(m.list_Data4[i, 37]); - m.CSBYHALPRESSUREA3 = SaveTwoNum(m.list_Data4[i, 38]); - m.CSBYHALPOWERA3 = SaveTwoNum(m.list_Data4[i, 39]); - m.CSBYHALENERGYA3 = SaveTwoNum(m.list_Data4[i, 40]); - m.CSBYHALAMPLITUDEA3 = SaveTwoNum(m.list_Data4[i, 41]); - m.CSBYHALTIMEA3 = SaveTwoNum(m.list_Data4[i, 42]); - m.ThicknessMeasureDisplacement = m.list_Data4[i, 43]; - + m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]); + m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]); + m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]); + //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置， //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折 MyRes[i] = JudgmentResult(Code_NG, m.list_Data1[i, 10], m.list_Data1[i, 11], @@ -1381,8 +1753,8 @@ namespace JinYuan.ControlCenters m.Result = MyRes[i]; - m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG; ; - + m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG; + m.Remark += NG_Type; NG_Type = "";//清除上一次不良字符串 @@ -1429,12 +1801,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,"; } + ////芯包重量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 @@ -1460,17 +1832,17 @@ 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,"; } + ////芯包重量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 bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage); - + if (m.Flag == 1) m.UpState = "已上传"; @@ -1536,6 +1908,7 @@ namespace JinYuan.ControlCenters Thread.Sleep(500); result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC + result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[4].VarAddress, MyRes[2], Data_Type.Short);//判断结果写入PLC } //else //{ @@ -1546,8 +1919,8 @@ namespace JinYuan.ControlCenters //} } JYResult result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0 - CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); - LogHelper.Instance.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}"); + CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}"); + LogHelper.Instance.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}"); Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); }); //数据存储 - 异步处理 @@ -1561,7 +1934,6 @@ namespace JinYuan.ControlCenters CommonMethods.AddDataMonitorLog(0, $"卷芯出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms"); } } - /// /// 电池结果判断 /// @@ -1746,4 +2118,3 @@ namespace JinYuan.ControlCenters } #endregion #endregion -#endregion \ No newline at end of file diff --git a/JinYuan.Helper/SendDateMQTT.cs b/JinYuan.Helper/SendDateMQTT.cs index b3aae85..92098b5 100644 --- a/JinYuan.Helper/SendDateMQTT.cs +++ b/JinYuan.Helper/SendDateMQTT.cs @@ -72,7 +72,7 @@ namespace JinYuan.Helper HslCommunication.MQTT.MqttClient mqttClient = null; //10.22.160.144 - public string MQTTServerAddress = "10.22.161.1"; + public string MQTTServerAddress = "127.0.0.1";//"10.22.161.1"; public int MQTTServerPort = 2883; public string ClientId = "601UPW01"; //PPM主题 diff --git a/JinYuan.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs index 49eaeef..40ff192 100644 --- a/JinYuan.MES/MesDataProcess.cs +++ b/JinYuan.MES/MesDataProcess.cs @@ -970,1833 +970,1834 @@ namespace JinYuan.MES { bool res = false; string resJson = ""; - try - { - var nowDate = DateTime.Now; - string sNowDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff"); + #region 预焊机结果上传MES + //try + //{ + // var nowDate = DateTime.Now; + // string sNowDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff"); - var model = new ProductResultParameters - { - equipNum = equipNum, - type = unloadType.ToString(), - payload = "" - }; + // var model = new ProductResultParameters + // { + // equipNum = equipNum, + // type = unloadType.ToString(), + // payload = "" + // }; - string ZhongliangA = ""; - string ZhongliangB = ""; - string CeHouA = ""; - string CeHouB = ""; - string JiXingA = ""; - string JiXingB = ""; - string HanYingA = ""; - string HanYingB = ""; - string ZhengJiErSiLieA = ""; - string ZhengJiErSiLieB = ""; - string BeiJiErSiLieA = ""; - string BeiJiErSiLieB = ""; - string ZhengJiErFanA = ""; - string ZhengJiErFanB = ""; - string BeiJiErFanA = ""; - string BeiJiErFanB = ""; - for (int i = 0; i < 2; i++) - { - //芯包重量1判定结果 - if (m.list_Data1[i, 10] == 1) - { - if (i == 0) - ZhongliangA = "OK"; - else - ZhongliangB = "OK"; - } - else if (m.list_Data1[i, 10] == 2) - { - if (i == 0) - ZhongliangA = "NG"; - else - ZhongliangB = "NG"; - } - //芯包侧厚判定结果 - if (m.list_Data1[i, 11] == 1) - { - if (i == 0) - CeHouA = "OK"; - else - CeHouB = "OK"; - } - else if (m.list_Data1[i, 11] == 2) - { - if (i == 0) - CeHouA = "NG"; - else - CeHouB = "NG"; - } - //芯包CCD极性检测结果 - if (m.list_Data1[i, 12] == 1) - { - if (i == 0) - JiXingA = "OK"; - else - JiXingB = "OK"; - } - else if (m.list_Data1[i, 12] == 2) - { - if (i == 0) - JiXingA = "NG"; - else - JiXingB = "NG"; - } - //芯包焊印位置判定结果 - if (m.list_Data1[i, 15] == 1) - { - if (i == 0) - HanYingA = "OK"; - else - HanYingB = "OK"; - } - else if (m.list_Data1[i, 15] == 2) - { - if (i == 0) - HanYingA = "NG"; - else - HanYingB = "NG"; - } - //芯包正面极耳撕裂判定结果 - if (m.list_Data1[i, 16] == 1) - { - if (i == 0) - ZhengJiErSiLieA = "OK"; - else - ZhengJiErSiLieB = "OK"; - } - else if (m.list_Data1[i, 16] == 2) - { - if (i == 0) - ZhengJiErSiLieA = "NG"; - else - ZhengJiErSiLieB = "NG"; - } - //芯包背面极耳撕裂判定结果 - if (m.list_Data1[i, 17] == 1) - { - if (i == 0) - BeiJiErSiLieA = "OK"; - else - BeiJiErSiLieB = "OK"; - } - else if (m.list_Data1[i, 17] == 2) - { - if (i == 0) - BeiJiErSiLieA = "NG"; - else - BeiJiErSiLieB = "NG"; - } - //芯包正面极耳翻折检测结果 - if (m.list_Data1[i, 18] == 1) - { - if (i == 0) - ZhengJiErFanA = "OK"; - else - ZhengJiErFanB = "OK"; - } - else if (m.list_Data1[i, 18] == 2) - { - if (i == 0) - ZhengJiErFanA = "NG"; - else - ZhengJiErFanB = "NG"; - } - //芯包背面极耳翻折检测结果 - if (m.list_Data1[i, 19] == 1) - { - if (i == 0) - BeiJiErFanA = "OK"; - else - BeiJiErFanB = "OK"; - } - else if (m.list_Data1[i, 19] == 2) - { - if (i == 0) - BeiJiErFanA = "NG"; - else - BeiJiErFanB = "NG"; - } - } + // string ZhongliangA = ""; + // string ZhongliangB = ""; + // string CeHouA = ""; + // string CeHouB = ""; + // string JiXingA = ""; + // string JiXingB = ""; + // string HanYingA = ""; + // string HanYingB = ""; + // string ZhengJiErSiLieA = ""; + // string ZhengJiErSiLieB = ""; + // string BeiJiErSiLieA = ""; + // string BeiJiErSiLieB = ""; + // string ZhengJiErFanA = ""; + // string ZhengJiErFanB = ""; + // string BeiJiErFanA = ""; + // string BeiJiErFanB = ""; + // for (int i = 0; i < 2; i++) + // { + // //芯包重量1判定结果 + // if (m.list_Data1[i, 10] == 1) + // { + // if (i == 0) + // ZhongliangA = "OK"; + // else + // ZhongliangB = "OK"; + // } + // else if (m.list_Data1[i, 10] == 2) + // { + // if (i == 0) + // ZhongliangA = "NG"; + // else + // ZhongliangB = "NG"; + // } + // //芯包侧厚判定结果 + // if (m.list_Data1[i, 11] == 1) + // { + // if (i == 0) + // CeHouA = "OK"; + // else + // CeHouB = "OK"; + // } + // else if (m.list_Data1[i, 11] == 2) + // { + // if (i == 0) + // CeHouA = "NG"; + // else + // CeHouB = "NG"; + // } + // //芯包CCD极性检测结果 + // if (m.list_Data1[i, 12] == 1) + // { + // if (i == 0) + // JiXingA = "OK"; + // else + // JiXingB = "OK"; + // } + // else if (m.list_Data1[i, 12] == 2) + // { + // if (i == 0) + // JiXingA = "NG"; + // else + // JiXingB = "NG"; + // } + // //芯包焊印位置判定结果 + // if (m.list_Data1[i, 15] == 1) + // { + // if (i == 0) + // HanYingA = "OK"; + // else + // HanYingB = "OK"; + // } + // else if (m.list_Data1[i, 15] == 2) + // { + // if (i == 0) + // HanYingA = "NG"; + // else + // HanYingB = "NG"; + // } + // //芯包正面极耳撕裂判定结果 + // if (m.list_Data1[i, 16] == 1) + // { + // if (i == 0) + // ZhengJiErSiLieA = "OK"; + // else + // ZhengJiErSiLieB = "OK"; + // } + // else if (m.list_Data1[i, 16] == 2) + // { + // if (i == 0) + // ZhengJiErSiLieA = "NG"; + // else + // ZhengJiErSiLieB = "NG"; + // } + // //芯包背面极耳撕裂判定结果 + // if (m.list_Data1[i, 17] == 1) + // { + // if (i == 0) + // BeiJiErSiLieA = "OK"; + // else + // BeiJiErSiLieB = "OK"; + // } + // else if (m.list_Data1[i, 17] == 2) + // { + // if (i == 0) + // BeiJiErSiLieA = "NG"; + // else + // BeiJiErSiLieB = "NG"; + // } + // //芯包正面极耳翻折检测结果 + // if (m.list_Data1[i, 18] == 1) + // { + // if (i == 0) + // ZhengJiErFanA = "OK"; + // else + // ZhengJiErFanB = "OK"; + // } + // else if (m.list_Data1[i, 18] == 2) + // { + // if (i == 0) + // ZhengJiErFanA = "NG"; + // else + // ZhengJiErFanB = "NG"; + // } + // //芯包背面极耳翻折检测结果 + // if (m.list_Data1[i, 19] == 1) + // { + // if (i == 0) + // BeiJiErFanA = "OK"; + // else + // BeiJiErFanB = "OK"; + // } + // else if (m.list_Data1[i, 19] == 2) + // { + // if (i == 0) + // BeiJiErFanA = "NG"; + // else + // BeiJiErFanB = "NG"; + // } + // } - switch (unloadType) - { - case MesUploadType.DD: - var payload1 = new Payload1 - { - siteCode = siteCode, - lineCode = lineCode, - userName = userName, - materialCode = materialCode, - carCode = "", - collection = "JS", - recordDate = sNowDate, - qty = 1, - containerCode = "", + // switch (unloadType) + // { + // case MesUploadType.DD: + // var payload1 = new Payload1 + // { + // siteCode = siteCode, + // lineCode = lineCode, + // userName = userName, + // materialCode = materialCode, + // carCode = "", + // collection = "JS", + // recordDate = sNowDate, + // qty = 1, + // containerCode = "", - }; - payload1.identification = new IdentificationListItem - { - identification = m.CSBYHCODEA, - qualityStatus = m.CSBYHOUTSTATIONJUDGMENTRESULT, - }; + // }; + // payload1.identification = new IdentificationListItem + // { + // identification = m.CSBYHCODEA, + // qualityStatus = m.CSBYHOUTSTATIONJUDGMENTRESULT, + // }; - payload1.tagDataVOList = new List - { - new TagDataVOListItem - { - tagCode="CSBYH_CELL_TYPE", - tagValue = m.A_B, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包类型" - }, - new TagDataVOListItem - { - tagCode="CSBYH_IN_STATION_TIME", - tagValue = m.CSBYHINSTATIONTIME, - tagTime = m.ScanTime[0], - tagCalculateResult = "Y", - tagRemark = "进站时间" - }, - new TagDataVOListItem - { - tagCode="CSBYH_OUT_STATION_TIME", - tagValue = m.CSBYHOUTSTATIONTIME, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "出站时间" - }, - new TagDataVOListItem - { - tagCode="CSBYH_WEIGHT_NO_A1", - tagValue = m.CSBYHWEIGHTNOA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包称重工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_WEIGHT_A1_MAX_SETTING", - tagValue = m.CSBYHWEIGHTA1MAXSETTING.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包重量设定值最大值（g）" - }, - new TagDataVOListItem - { - tagCode="CSBYH_WEIGHT_A1_MIN_SETTING", - tagValue = m.CSBYHWEIGHTA1MINSETTING.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包重量设定值最小值（g）" - }, - new TagDataVOListItem - { - tagCode="CSBYH_WEIGHT_A1", - tagValue = m.CSBYHWEIGHTA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包重量（g)" - }, + // payload1.tagDataVOList = new List + // { + // new TagDataVOListItem + // { + // tagCode="CSBYH_CELL_TYPE", + // tagValue = m.A_B, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包类型" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_IN_STATION_TIME", + // tagValue = m.CSBYHINSTATIONTIME, + // tagTime = m.ScanTime[0], + // tagCalculateResult = "Y", + // tagRemark = "进站时间" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_OUT_STATION_TIME", + // tagValue = m.CSBYHOUTSTATIONTIME, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "出站时间" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_WEIGHT_NO_A1", + // tagValue = m.CSBYHWEIGHTNOA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包称重工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_WEIGHT_A1_MAX_SETTING", + // tagValue = m.CSBYHWEIGHTA1MAXSETTING.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包重量设定值最大值（g）" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_WEIGHT_A1_MIN_SETTING", + // tagValue = m.CSBYHWEIGHTA1MINSETTING.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包重量设定值最小值（g）" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_WEIGHT_A1", + // tagValue = m.CSBYHWEIGHTA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包重量（g)" + // }, - new TagDataVOListItem - { - tagCode="CSBYH_WEIGHT_RESULT_A1", - tagValue = m.CSBYHWEIGHTRESULTA1, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包重量判定结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_STATION_NO_A", - tagValue = m.CSBYHTHICKNESSTESTSTATIONNOA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包测厚工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SETTING_A", - tagValue = m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包测厚压力（Kg)设定最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SETTING_A", - tagValue = m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包测厚压力（Kg)设定最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_PRESSURE_A", - tagValue = m.CSBYHTHICKNESSTESTPRESSUREA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包测厚压力实际值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_PRESSURE_SIZE_A", - tagValue = m.CSBYHTHICKNESSTESTPRESSURESIZEA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包侧厚尺寸（mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SIZE_A", - tagValue = m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包侧厚最大尺寸（mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SIZE_A", - tagValue = m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包侧厚最小尺寸（mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_THICKNESS_TEST_JUDGE_RESULT_A", - tagValue = m.CSBYHTHICKNESSTESTJUDGERESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包测厚判定结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_POLARITY_RESULT_A", - tagValue = m.CSBYHPOLARITYRESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包极性检测结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_TOOLNO_A", - tagValue = m.CSBYHTOOLNOA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包治具号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_PRESSURE_MAX_SETTING", - tagValue = m.CSBYHCUWELDINGPRESSUREMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接压力(Psi)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_PRESSURE_MIN_SETTING", - tagValue = m.CSBYHCUWELDINGPRESSUREMINSETTING.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接压力(Psi)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_POWER_MAX_SETTING", - tagValue = m.CSBYHCUWELDINGPOWERMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接功率(W)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_POWER_MIN_SETTING", - tagValue = m.CSBYHCUWELDINGPOWERMINSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接功率(W)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_ENERGY_MAX_SETTING", - tagValue = m.CSBYHCUWELDINGENERGYMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接能量(J)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_ENERGY_MIN_SETTING", - tagValue = m.CSBYHCUWELDINGENERGYMINSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接能量(J)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_AMPLITUDE_MAX_SETTING", - tagValue = m.CSBYHCUWELDINGAMPLITUDEMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接振幅(μm)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_AMPLITUDE_MIN_SETTING", - tagValue = m.CSBYHCUWELDINGAMPLITUDEMINSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜极耳预焊焊接振幅(μm)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_STATION_NO_A", - tagValue = m.CSBYHCUWELDINGSTATIONNOA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊接1工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_STATION_NO_A2", - tagValue = m.CSBYHCUWELDINGSTATIONNOA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊接2工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_STATION_NO_A3", - tagValue = m.CSBYHCUWELDINGSTATIONNOA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊接3工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_PRESSURE_A1", - tagValue = m.CSBYHCUPRESSUREA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接压力(Psi)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_POWER_A1", - tagValue = m.CSBYHCUPOWERA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接功率(W)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_ENERGY_A1", - tagValue = m.CSBYHCUENERGYA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接能量(J)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_AMPLITUDE_A1", - tagValue = m.CSBYHCUAMPLITUDEA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接振幅(μm)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_TIME_A1", - tagValue = m.CSBYHCUTIMEA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接时间(ms)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_PRESSURE_A2", - tagValue = m.CSBYHCUPRESSUREA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接压力(Psi)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_POWER_A2", - tagValue = m.CSBYHCUPOWERA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接功率A(W)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_ENERGY_A2", - tagValue = m.CSBYHCUENERGYA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接能量(J)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_AMPLITUDE_A2", - tagValue = m.CSBYHCUENERGYA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接振幅(μm)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_TIME_A2", - tagValue = m.CSBYHCUTIMEA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接时间(ms)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_PRESSURE_A3", - tagValue = m.CSBYHCUPRESSUREA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接压力(Psi)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_POWER_A3", - tagValue = m.CSBYHCUPOWERA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接功率A(W)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_ENERGY_A3", - tagValue = m.CSBYHCUENERGYA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接能量(J)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_AMPLITUDE_A3", - tagValue = m.CSBYHCUAMPLITUDEA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接振幅(μm)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_TIME_A3", - tagValue = m.CSBYHCUTIMEA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜极耳预焊焊接时间(ms)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELD_HEAD_COUNT_A", - tagValue = m.CSBYHCUWELDHEADCOUNTA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊1焊头次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELD_HEAD_COUNT_A2", - tagValue = m.CSBYHCUWELDHEADCOUNTA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊2焊头次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELD_HEAD_COUNT_A3", - tagValue = m.CSBYHCUWELDHEADCOUNTA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊3焊头次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELD_BASE_COUNT_A", - tagValue = m.CSBYHCUWELDBASECOUNTA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊1焊座次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELD_BASE_COUNT_A2", - tagValue = m.CSBYHCUWELDBASECOUNTA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊2焊座次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELD_BASE_COUNT_A3", - tagValue = m.CSBYHCUWELDBASECOUNTA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊3焊座次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_PRESSURE_MAX_SETTING", - tagValue = m.CSBYHALWELDINGPRESSUREMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接压力(Psi)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_PRESSURE_MIN_SETTING", - tagValue = m.CSBYHALWELDINGPRESSUREMINSETTING.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接压力(Psi)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_POWER_MAX_SETTING", - tagValue = m.CSBYHALWELDINGPOWERMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接功率(W)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_POWER_MIN_SETTING", - tagValue = m.CSBYHALWELDINGPOWERMINSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接功率(W)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_ENERGY_MAX_SETTING", - tagValue = m.CSBYHALWELDINGENERGYMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接能量(J)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_ENERGY_MIN_SETTING", - tagValue = m.CSBYHALWELDINGENERGYMINSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接能量(J)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_AMPLITUDE_MAX_SETTING", - tagValue = m.CSBYHALWELDINGAMPLITUDEMAXSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接振幅(μm)设定值最大值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_AMPLITUDE_MIN_SETTING", - tagValue = m.CSBYHALWELDINGAMPLITUDEMINSETTING1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝极耳预焊焊接振幅(μm)设定值最小值" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_STATION_NO_A", - tagValue = m.CSBYHALWELDINGSTATIONNOA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊接1工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_STATION_NO_A2", - tagValue = m.CSBYHALWELDINGSTATIONNOA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊接2工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_STATION_NO_A3", - tagValue = m.CSBYHALWELDINGSTATIONNOA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊接3工位号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_PRESSURE_A1", - tagValue = m.CSBYHALPRESSUREA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接压力(Psi)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_POWER_A1", - tagValue = m.CSBYHALPOWERA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接功率(W)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_ENERGY_A1", - tagValue = m.CSBYHALENERGYA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接能量(J)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_AMPLITUDE_A1", - tagValue = m.CSBYHALAMPLITUDEA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接振幅(μm)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_TIME_A1", - tagValue = m.CSBYHALTIMEA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接时间(ms)实际值1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_PRESSURE_A2", - tagValue = m.CSBYHALPRESSUREA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接压力(Psi)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_POWER_A2", - tagValue = m.CSBYHALPOWERA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接功率(W)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_ENERGY_A2", - tagValue = m.CSBYHALENERGYA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接能量(J)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_AMPLITUDE_A2", - tagValue = m.CSBYHALAMPLITUDEA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接振幅(μm)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_TIME_A2", - tagValue = m.CSBYHALTIMEA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接时间(ms)实际值2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_PRESSURE_A3", - tagValue = m.CSBYHALPRESSUREA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接压力(Psi)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_POWER_A3", - tagValue = m.CSBYHALPOWERA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接功率(W)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_ENERGY_A3", - tagValue = m.CSBYHALENERGYA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接能量(J)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_AMPLITUDE_A3", - tagValue = m.CSBYHALAMPLITUDEA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接振幅(μm)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_TIME_A3", - tagValue = m.CSBYHALTIMEA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝极耳预焊焊接时间(ms)实际值3" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELD_HEAD_COUNT_A", - tagValue = m.CSBYHALWELDHEADCOUNTA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊1焊头次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELD_HEAD_COUNT_A2", - tagValue = m.CSBYHALWELDHEADCOUNTA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊2焊头次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELD_HEAD_COUNT_A3", - tagValue = m.CSBYHALWELDHEADCOUNTA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊3焊头次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELD_BASE_COUNT_A", - tagValue = m.CSBYHALWELDBASECOUNTA1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊1焊座次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELD_BASE_COUNT_A2", - tagValue = m.CSBYHALWELDBASECOUNTA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊2焊座次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELD_BASE_COUNT_A3", - tagValue = m.CSBYHALWELDBASECOUNTA3.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊3焊座次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CUTABCUTTERNO_A", - tagValue = m.CSBYHCUTABCUTTERNOA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铜极耳切刀编号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_ALTABCUTTERNO_A", - tagValue = m.CSBYHALTABCUTTERNOA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铝极耳切刀编号" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CUTABCUTTERCOUNTA", - tagValue = m.CSBYHCUTABCUTTERCOUNTA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铜极耳切刀使用次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_ALTABCUTTERCOUNTA", - tagValue = m.CSBYHALTABCUTTERCOUNTA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铝极耳切刀使用次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CUTABLENGTHA", - tagValue = m.CSBYHCUTABLENGTHA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铜极极耳长度(mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CUTABWIDTHA", - tagValue = m.CSBYHCUTABWIDTHA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铜极极耳宽度(mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_ALTABLENGTHA", - tagValue = m.CSBYHALTABLENGTHA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铝极极耳长度(mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_ALTABWIDTHA", - tagValue = m.CSBYHALTABWIDTHA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯铝极极耳宽度(mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_TOP_WELDING_DISTANCE1", - tagValue = m.CSBYHTOPTOSOLDERDISTANCEA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜顶部到焊印间距1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_POSITION_RESULT1", - tagValue = m.CSBYHSOLDERJUDGERESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊印位置判定结果1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_TOP_WELDING_DISTANCE2", - tagValue = m.CSBYHTOPTOSOLDERDISTANCEA2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜顶部到焊印间距2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_POSITION_RESULT2", - tagValue = m.CSBYHSOLDERJUDGERESULTA2, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铜焊印位置判定结果2" - }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_WEIGHT_RESULT_A1", + // tagValue = m.CSBYHWEIGHTRESULTA1, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包重量判定结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_STATION_NO_A", + // tagValue = m.CSBYHTHICKNESSTESTSTATIONNOA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包测厚工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SETTING_A", + // tagValue = m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包测厚压力（Kg)设定最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SETTING_A", + // tagValue = m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包测厚压力（Kg)设定最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_A", + // tagValue = m.CSBYHTHICKNESSTESTPRESSUREA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包测厚压力实际值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_SIZE_A", + // tagValue = m.CSBYHTHICKNESSTESTPRESSURESIZEA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包侧厚尺寸（mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SIZE_A", + // tagValue = m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包侧厚最大尺寸（mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SIZE_A", + // tagValue = m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包侧厚最小尺寸（mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_THICKNESS_TEST_JUDGE_RESULT_A", + // tagValue = m.CSBYHTHICKNESSTESTJUDGERESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包测厚判定结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_POLARITY_RESULT_A", + // tagValue = m.CSBYHPOLARITYRESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包极性检测结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_TOOLNO_A", + // tagValue = m.CSBYHTOOLNOA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包治具号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_PRESSURE_MAX_SETTING", + // tagValue = m.CSBYHCUWELDINGPRESSUREMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接压力(Psi)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_PRESSURE_MIN_SETTING", + // tagValue = m.CSBYHCUWELDINGPRESSUREMINSETTING.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接压力(Psi)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_POWER_MAX_SETTING", + // tagValue = m.CSBYHCUWELDINGPOWERMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接功率(W)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_POWER_MIN_SETTING", + // tagValue = m.CSBYHCUWELDINGPOWERMINSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接功率(W)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_ENERGY_MAX_SETTING", + // tagValue = m.CSBYHCUWELDINGENERGYMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接能量(J)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_ENERGY_MIN_SETTING", + // tagValue = m.CSBYHCUWELDINGENERGYMINSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接能量(J)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_AMPLITUDE_MAX_SETTING", + // tagValue = m.CSBYHCUWELDINGAMPLITUDEMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接振幅(μm)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_AMPLITUDE_MIN_SETTING", + // tagValue = m.CSBYHCUWELDINGAMPLITUDEMINSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜极耳预焊焊接振幅(μm)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_STATION_NO_A", + // tagValue = m.CSBYHCUWELDINGSTATIONNOA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊接1工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_STATION_NO_A2", + // tagValue = m.CSBYHCUWELDINGSTATIONNOA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊接2工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_STATION_NO_A3", + // tagValue = m.CSBYHCUWELDINGSTATIONNOA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊接3工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_PRESSURE_A1", + // tagValue = m.CSBYHCUPRESSUREA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接压力(Psi)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_POWER_A1", + // tagValue = m.CSBYHCUPOWERA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接功率(W)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_ENERGY_A1", + // tagValue = m.CSBYHCUENERGYA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接能量(J)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_AMPLITUDE_A1", + // tagValue = m.CSBYHCUAMPLITUDEA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接振幅(μm)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_TIME_A1", + // tagValue = m.CSBYHCUTIMEA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接时间(ms)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_PRESSURE_A2", + // tagValue = m.CSBYHCUPRESSUREA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接压力(Psi)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_POWER_A2", + // tagValue = m.CSBYHCUPOWERA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接功率A(W)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_ENERGY_A2", + // tagValue = m.CSBYHCUENERGYA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接能量(J)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_AMPLITUDE_A2", + // tagValue = m.CSBYHCUENERGYA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接振幅(μm)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_TIME_A2", + // tagValue = m.CSBYHCUTIMEA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接时间(ms)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_PRESSURE_A3", + // tagValue = m.CSBYHCUPRESSUREA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接压力(Psi)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_POWER_A3", + // tagValue = m.CSBYHCUPOWERA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接功率A(W)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_ENERGY_A3", + // tagValue = m.CSBYHCUENERGYA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接能量(J)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_AMPLITUDE_A3", + // tagValue = m.CSBYHCUAMPLITUDEA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接振幅(μm)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_TIME_A3", + // tagValue = m.CSBYHCUTIMEA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜极耳预焊焊接时间(ms)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELD_HEAD_COUNT_A", + // tagValue = m.CSBYHCUWELDHEADCOUNTA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊1焊头次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELD_HEAD_COUNT_A2", + // tagValue = m.CSBYHCUWELDHEADCOUNTA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊2焊头次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELD_HEAD_COUNT_A3", + // tagValue = m.CSBYHCUWELDHEADCOUNTA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊3焊头次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELD_BASE_COUNT_A", + // tagValue = m.CSBYHCUWELDBASECOUNTA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊1焊座次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELD_BASE_COUNT_A2", + // tagValue = m.CSBYHCUWELDBASECOUNTA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊2焊座次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELD_BASE_COUNT_A3", + // tagValue = m.CSBYHCUWELDBASECOUNTA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊3焊座次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_PRESSURE_MAX_SETTING", + // tagValue = m.CSBYHALWELDINGPRESSUREMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接压力(Psi)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_PRESSURE_MIN_SETTING", + // tagValue = m.CSBYHALWELDINGPRESSUREMINSETTING.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接压力(Psi)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_POWER_MAX_SETTING", + // tagValue = m.CSBYHALWELDINGPOWERMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接功率(W)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_POWER_MIN_SETTING", + // tagValue = m.CSBYHALWELDINGPOWERMINSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接功率(W)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_ENERGY_MAX_SETTING", + // tagValue = m.CSBYHALWELDINGENERGYMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接能量(J)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_ENERGY_MIN_SETTING", + // tagValue = m.CSBYHALWELDINGENERGYMINSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接能量(J)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_AMPLITUDE_MAX_SETTING", + // tagValue = m.CSBYHALWELDINGAMPLITUDEMAXSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接振幅(μm)设定值最大值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_AMPLITUDE_MIN_SETTING", + // tagValue = m.CSBYHALWELDINGAMPLITUDEMINSETTING1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝极耳预焊焊接振幅(μm)设定值最小值" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_STATION_NO_A", + // tagValue = m.CSBYHALWELDINGSTATIONNOA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊接1工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_STATION_NO_A2", + // tagValue = m.CSBYHALWELDINGSTATIONNOA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊接2工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_STATION_NO_A3", + // tagValue = m.CSBYHALWELDINGSTATIONNOA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊接3工位号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_PRESSURE_A1", + // tagValue = m.CSBYHALPRESSUREA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接压力(Psi)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_POWER_A1", + // tagValue = m.CSBYHALPOWERA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接功率(W)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_ENERGY_A1", + // tagValue = m.CSBYHALENERGYA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接能量(J)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_AMPLITUDE_A1", + // tagValue = m.CSBYHALAMPLITUDEA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接振幅(μm)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_TIME_A1", + // tagValue = m.CSBYHALTIMEA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接时间(ms)实际值1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_PRESSURE_A2", + // tagValue = m.CSBYHALPRESSUREA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接压力(Psi)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_POWER_A2", + // tagValue = m.CSBYHALPOWERA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接功率(W)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_ENERGY_A2", + // tagValue = m.CSBYHALENERGYA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接能量(J)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_AMPLITUDE_A2", + // tagValue = m.CSBYHALAMPLITUDEA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接振幅(μm)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_TIME_A2", + // tagValue = m.CSBYHALTIMEA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接时间(ms)实际值2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_PRESSURE_A3", + // tagValue = m.CSBYHALPRESSUREA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接压力(Psi)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_POWER_A3", + // tagValue = m.CSBYHALPOWERA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接功率(W)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_ENERGY_A3", + // tagValue = m.CSBYHALENERGYA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接能量(J)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_AMPLITUDE_A3", + // tagValue = m.CSBYHALAMPLITUDEA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接振幅(μm)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_TIME_A3", + // tagValue = m.CSBYHALTIMEA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝极耳预焊焊接时间(ms)实际值3" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELD_HEAD_COUNT_A", + // tagValue = m.CSBYHALWELDHEADCOUNTA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊1焊头次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELD_HEAD_COUNT_A2", + // tagValue = m.CSBYHALWELDHEADCOUNTA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊2焊头次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELD_HEAD_COUNT_A3", + // tagValue = m.CSBYHALWELDHEADCOUNTA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊3焊头次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELD_BASE_COUNT_A", + // tagValue = m.CSBYHALWELDBASECOUNTA1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊1焊座次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELD_BASE_COUNT_A2", + // tagValue = m.CSBYHALWELDBASECOUNTA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊2焊座次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELD_BASE_COUNT_A3", + // tagValue = m.CSBYHALWELDBASECOUNTA3.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊3焊座次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CUTABCUTTERNO_A", + // tagValue = m.CSBYHCUTABCUTTERNOA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铜极耳切刀编号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_ALTABCUTTERNO_A", + // tagValue = m.CSBYHALTABCUTTERNOA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铝极耳切刀编号" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CUTABCUTTERCOUNTA", + // tagValue = m.CSBYHCUTABCUTTERCOUNTA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铜极耳切刀使用次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_ALTABCUTTERCOUNTA", + // tagValue = m.CSBYHALTABCUTTERCOUNTA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铝极耳切刀使用次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CUTABLENGTHA", + // tagValue = m.CSBYHCUTABLENGTHA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铜极极耳长度(mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CUTABWIDTHA", + // tagValue = m.CSBYHCUTABWIDTHA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铜极极耳宽度(mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_ALTABLENGTHA", + // tagValue = m.CSBYHALTABLENGTHA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铝极极耳长度(mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_ALTABWIDTHA", + // tagValue = m.CSBYHALTABWIDTHA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯铝极极耳宽度(mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_TOP_WELDING_DISTANCE1", + // tagValue = m.CSBYHTOPTOSOLDERDISTANCEA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜顶部到焊印间距1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_POSITION_RESULT1", + // tagValue = m.CSBYHSOLDERJUDGERESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊印位置判定结果1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_TOP_WELDING_DISTANCE2", + // tagValue = m.CSBYHTOPTOSOLDERDISTANCEA2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜顶部到焊印间距2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_POSITION_RESULT2", + // tagValue = m.CSBYHSOLDERJUDGERESULTA2, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铜焊印位置判定结果2" + // }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_TOP_WELDING_DISTANCE1", - tagValue = m.AluminumToWeld1.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝顶部到焊印间距1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_POSITION_RESULT1", - tagValue = m.AluminiumWeldPositionResult1, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊印位置判定结果1" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_TOP_WELDING_DISTANCE2", - tagValue = m.AluminumToWeld2.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝顶部到焊印间距2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_POSITION_RESULT2", - tagValue = m.AluminiumWeldPositionResult2, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包铝焊印位置判定结果2" - }, - new TagDataVOListItem - { - tagCode="CSBYH_FRONT_EAR_CRACKLE_RESULT_A", - tagValue = m.CSBYHFRONTEARCRACKLERESULTA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包正面极耳撕裂裂纹检测结果（mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_FRONT_EAR_CRACKLE_JUDGE_RESULT_A", - tagValue = m.CSBYHFRONTEARCRACKLEJUDGERESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包正面极耳撕裂判定结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_BACK_EAR_CRACKLE_RESULT_A", - tagValue = m.CSBYHBACKEARCRACKLERESULTA.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包背面极耳撕裂裂纹检测结果（mm)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_BACK_EAR_CRACKLE_JUDGE_RESULT_A", - tagValue = m.CSBYHBACKEARCRACKLEJUDGERESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包背面极耳撕裂判定结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_FRONT_EAR_FLODING_RESULT_A", - tagValue = m.CSBYHFRONTEARFLODINGRESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包正面极耳翻折检测结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_BACK_EAR_FLODING_RESULT_A", - tagValue = m.CSBYHBACKEARFLODINGRESULTA, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包背面极耳翻折检测结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_SCHEDULE", - tagValue = m.CSBYHSCHEDULE, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯班次" - }, - new TagDataVOListItem - { - tagCode="CSBYH_OUT_STATION_JUDGMENT_RESULT", - tagValue = m.CSBYHOUTSTATIONJUDGMENTRESULT, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "芯包出站判定结果" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_HEAD_WARNING_LIFE", - tagValue = m.CopperWeldHeadLife.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜焊头预警寿命(次)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CU_WELDING_SEAT_WARNING_LIFE", - tagValue = m.CopperWeldSeatLife.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铜焊座预警寿命(次)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_HEAD_WARNING_LIFE", - tagValue = m.AluminiumWeldHeadLife.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝焊头预警寿命(次)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_AL_WELDING_SEAT_WARNING_LIFE", - tagValue = m.AluminiumWeldSeatLife.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "铝焊座预警寿命(次)" - }, - new TagDataVOListItem - { - tagCode="CSBYH_CUTTING_KNIFE_USING_LIFE", - tagValue = m.CuttingKnifeLife.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "裁切刀使用寿命(次)" - }, - new TagDataVOListItem - { - tagCode="RESUBMISSION_NUMBER_YH", - tagValue = m.RethrowNum.ToString(), - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "复投次数" - }, - new TagDataVOListItem - { - tagCode="CSBYH_PROCESS_NAME", - tagValue = m.CSBYHPROCESSNAME, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯工序名" - }, - new TagDataVOListItem - { - tagCode="CSBYH_ABNORMAL_INFORMATION", - tagValue = m.Remark, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯异常反馈信息" - }, - new TagDataVOListItem - { - tagCode="CSBYH_QUALITY_STATUS", - tagValue = m.CSBYHOUTSTATIONJUDGMENTRESULT, - tagTime = m.TestTime, - tagCalculateResult = "Y", - tagRemark = "电芯质量状态" - }, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CODE_A", - // tagValue = m.listBatCode[0], - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A芯包条码" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CODE_B", - // tagValue = m.listBatCode[1], - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包条码" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_A_SCANNING_TIME", - // tagValue = m.ScanTime[0], - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A芯包扫码时间" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_A_SCANNING_TIME", - // tagValue = m.ScanTime[0], - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包扫码时间" - //}, - //new TagDataVOListItem - //{ - // tagCode="", - // tagValue = "无", - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A环轨编号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_ADHESION_JUDGE_RESULT_A", - // tagValue = m.list_Data1[0, 13].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A电芯裁切粘连判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_BURR_JUDGE_RESULT_A", - // tagValue = m.list_Data1[0, 14].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A电芯裁切毛刺判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_SOLDER_JUDGE_RESULT_A", - // tagValue = HanYingA, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A芯包焊印位置判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_ADHESION_RESULT_A", - // tagValue = m.list_Data4[0, 7].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A电芯裁切粘连结果（mm2）" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_BURR_RESULT_A", - // tagValue = m.list_Data4[0, 8].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A电芯裁切毛刺结果（mm）" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_TOP_TO_SOLDER_DISTANCE_A", - // tagValue = m.list_Data4[0, 9].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A芯包顶部到焊印间距（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_SOLDER_TO_EAR_DISTANCE_A", - // tagValue = m.list_Data4[0, 10].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "A芯包焊印边缘到极耳边缘间距（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_WEIGHT_NO_B1", - // tagValue = m.list_Data1[1, 1].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包称重1工位号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_WEIGHT_RESULT_B1", - // tagValue = ZhongliangB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包重量1判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="", - // tagValue = "无", - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B环轨编号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_STATION_NO_B", - // tagValue = m.list_Data1[1, 2].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚工位号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_JUDGE_RESULT_B", - // tagValue = CeHouB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_POLARITY_RESULT_B", - // tagValue = JiXingB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包极性检测结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_TOOLNO_B", - // tagValue = m.list_Data1[1, 3].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包治具号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_WELDING_STATION_NO_B", - // tagValue = m.list_Data1[1, 4].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊接工位号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_WELD_HEAD_COUNT_B", - // tagValue = m.list_Data2[1, 0].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊头次数" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_WELD_BASE_COUNT_B", - // tagValue = m.list_Data2[1, 1].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊座次数" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_WELDING_STATION_NO_B", - // tagValue = m.list_Data1[1, 7].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊接工位号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_WELD_HEAD_COUNT_B", - // tagValue = m.list_Data2[1, 6].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊头次数" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_WELD_BASE_COUNT_B", - // tagValue = m.list_Data2[1, 7].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊座次数" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUTABCUTTERCOUNTB", - // tagValue = m.list_Data2[1, 12].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铜极耳切刀使用次数" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_ALTABCUTTERCOUNTB", - // tagValue = m.list_Data2[1, 13].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铝极耳切刀使用次数" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_ADHESION_JUDGE_RESULT_B", - // tagValue = m.list_Data1[1, 13].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯裁切粘连判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_BURR_JUDGE_RESULT_B", - // tagValue = m.list_Data1[1, 14].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯裁切毛刺判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_SOLDER_JUDGE_RESULT_B", - // tagValue = HanYingB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包焊印位置判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_FRONT_EAR_CRACKLE_JUDGE_RESULT_B", - // tagValue = ZhengJiErSiLieB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包正面极耳撕裂判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_BACK_EAR_CRACKLE_JUDGE_RESULT_B", - // tagValue = BeiJiErSiLieB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包背面极耳撕裂判定结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_FRONT_EAR_FLODING_RESULT_B", - // tagValue = ZhengJiErFanB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包正面极耳翻折检测结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_BACK_EAR_FLODING_RESULT_B", - // tagValue = BeiJiErFanB, - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包背面极耳翻折检测结果" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUTABCUTTERNO_B", - // tagValue = m.list_Data1[1,21].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铜极耳切刀编号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_ALTABCUTTERNO_B", - // tagValue = m.list_Data1[1,22].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铝极耳切刀编号" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_WEIGHT_B1_MAX_SETTING", - // tagValue = m.list_Data3[1, 0].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包重量1设定值最大值（g）" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_WEIGHT_B1_MIN_SETTING", - // tagValue = m.list_Data3[1, 1].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包重量1设定值最小值（g）" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_WEIGHT_B1", - // tagValue = m.list_Data4[1, 0].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包重量1（g)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SETTING_B", - // tagValue = m.list_Data3[1, 2].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚压力（Kg)设定最大值" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SETTING_B", - // tagValue = m.list_Data3[1, 3].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚压力（Kg)设定最小值" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_B", - // tagValue = m.list_Data4[1, 1].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚压力实际值" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_SIZE_B", - // tagValue = m.list_Data4[1, 2].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚尺寸（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SIZE_B", - // tagValue = m.list_Data3[1, 4].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚最大尺寸（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SIZE_B", - // tagValue = m.list_Data3[1, 5].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包侧厚最小尺寸（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_PRESSURE_B1", - // tagValue = m.list_Data4[1, 13].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接压力(Psi)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_POWER_B1", - // tagValue = m.list_Data4[1, 14].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊接功率(W)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_ENERGY_B1", - // tagValue = m.list_Data4[1, 15].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接能量(J)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_AMPLITUDE_B1", - // tagValue = m.list_Data4[1, 16].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接振幅(%)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_TIME_B1", - // tagValue = m.list_Data4[1, 17].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接时间(ms)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_PRESSURE_B2", - // tagValue = m.list_Data4[1, 18].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接压力(Psi)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_POWER_B2", - // tagValue = m.list_Data4[1, 19].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊接功率B(W)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_ENERGY_B2", - // tagValue = m.list_Data4[1, 20].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接能量(J)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_AMPLITUDE_B2", - // tagValue = m.list_Data4[1, 21].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接振幅(%)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_TIME_B2", - // tagValue = m.list_Data4[1, 22].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接时间(ms)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_PRESSURE_B3", - // tagValue = m.list_Data4[1, 23].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接压力(Psi)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_POWER_B3", - // tagValue = m.list_Data4[1, 24].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊接功率A(W)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_ENERGY_B3", - // tagValue = m.list_Data4[1, 25].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接能量(J)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_AMPLITUDE_B3", - // tagValue = m.list_Data4[1, 26].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接振幅(%)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CU_TIME_B3", - // tagValue = m.list_Data4[1, 27].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铜焊焊接时间(ms)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_PRESSURE_B1", - // tagValue = m.list_Data4[1, 28].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接压力(Psi)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_POWER_B1", - // tagValue = m.list_Data4[1, 29].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊接功率(W)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_ENERGY_B1", - // tagValue = m.list_Data4[1, 30].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接能量(J)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_AMPLITUDE_B1", - // tagValue = m.list_Data4[1, 31].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接振幅(%)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_TIME_B1", - // tagValue = m.list_Data4[1, 32].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接时间(ms)实际值1" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_PRESSURE_B2", - // tagValue = m.list_Data4[1, 33].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接压力(Psi)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_POWER_B2", - // tagValue = m.list_Data4[1, 34].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊接功率(W)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_ENERGY_B2", - // tagValue = m.list_Data4[1, 35].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接能量(J)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_AMPLITUDE_B2", - // tagValue = m.list_Data4[1, 36].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接振幅(%)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_TIME_B2", - // tagValue = m.list_Data4[1, 37].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接时间(ms)实际值2" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_PRESSURE_B3", - // tagValue = m.list_Data4[1, 38].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接压力(Psi)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_POWER_B3", - // tagValue = m.list_Data4[1, 39].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊接功率(W)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_ENERGY_B3", - // tagValue = m.list_Data4[1, 40].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接能量(J)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_AMPLITUDE_B3", - // tagValue = m.list_Data4[1, 41].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接振幅(%)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_AL_TIME_B3", - // tagValue = m.list_Data4[1, 42].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包铝焊焊接时间(ms)实际值3" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUTABLENGTHB", - // tagValue = m.list_Data4[1, 3].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铜极极耳长度(mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUTABWIDTHB", - // tagValue = m.list_Data4[1, 4].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铜极极耳宽度(mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_ALTABLENGTHB", - // tagValue = m.list_Data4[1, 5].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铝极极耳长度(mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_ALTABWIDTHB", - // tagValue = m.list_Data4[1, 6].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯铝极极耳宽度(mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_ADHESION_RESULT_B", - // tagValue = m.list_Data4[1, 7].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯裁切粘连结果（mm2）" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_CUT_BURR_RESULT_B", - // tagValue = m.list_Data4[1, 8].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B电芯裁切毛刺结果（mm）" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_TOP_TO_SOLDER_DISTANCE_B", - // tagValue = m.list_Data4[1, 9].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包顶部到焊印间距（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_SOLDER_TO_EAR_DISTANCE_B", - // tagValue = m.list_Data4[1, 10].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包焊印边缘到极耳边缘间距（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_FRONT_EAR_CRACKLE_RESULT_B", - // tagValue = m.list_Data4[1, 11].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包正面极耳撕裂裂纹检测结果（mm)" - //}, - //new TagDataVOListItem - //{ - // tagCode="CSBYH_BACK_EAR_CRACKLE_RESULT_B", - // tagValue = m.list_Data4[1, 12].ToString(), - // tagTime = m.TestTime, - // tagCalculateResult = "Y", - // tagRemark = "B芯包背面极耳撕裂裂纹检测结果（mm)" - //} + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_TOP_WELDING_DISTANCE1", + // tagValue = m.AluminumToWeld1.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝顶部到焊印间距1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_POSITION_RESULT1", + // tagValue = m.AluminiumWeldPositionResult1, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊印位置判定结果1" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_TOP_WELDING_DISTANCE2", + // tagValue = m.AluminumToWeld2.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝顶部到焊印间距2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_POSITION_RESULT2", + // tagValue = m.AluminiumWeldPositionResult2, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包铝焊印位置判定结果2" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_FRONT_EAR_CRACKLE_RESULT_A", + // tagValue = m.CSBYHFRONTEARCRACKLERESULTA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包正面极耳撕裂裂纹检测结果（mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_FRONT_EAR_CRACKLE_JUDGE_RESULT_A", + // tagValue = m.CSBYHFRONTEARCRACKLEJUDGERESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包正面极耳撕裂判定结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_BACK_EAR_CRACKLE_RESULT_A", + // tagValue = m.CSBYHBACKEARCRACKLERESULTA.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包背面极耳撕裂裂纹检测结果（mm)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_BACK_EAR_CRACKLE_JUDGE_RESULT_A", + // tagValue = m.CSBYHBACKEARCRACKLEJUDGERESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包背面极耳撕裂判定结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_FRONT_EAR_FLODING_RESULT_A", + // tagValue = m.CSBYHFRONTEARFLODINGRESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包正面极耳翻折检测结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_BACK_EAR_FLODING_RESULT_A", + // tagValue = m.CSBYHBACKEARFLODINGRESULTA, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包背面极耳翻折检测结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_SCHEDULE", + // tagValue = m.CSBYHSCHEDULE, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯班次" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_OUT_STATION_JUDGMENT_RESULT", + // tagValue = m.CSBYHOUTSTATIONJUDGMENTRESULT, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "芯包出站判定结果" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_HEAD_WARNING_LIFE", + // tagValue = m.CopperWeldHeadLife.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜焊头预警寿命(次)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CU_WELDING_SEAT_WARNING_LIFE", + // tagValue = m.CopperWeldSeatLife.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铜焊座预警寿命(次)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_HEAD_WARNING_LIFE", + // tagValue = m.AluminiumWeldHeadLife.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝焊头预警寿命(次)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_AL_WELDING_SEAT_WARNING_LIFE", + // tagValue = m.AluminiumWeldSeatLife.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "铝焊座预警寿命(次)" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_CUTTING_KNIFE_USING_LIFE", + // tagValue = m.CuttingKnifeLife.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "裁切刀使用寿命(次)" + // }, + // new TagDataVOListItem + // { + // tagCode="RESUBMISSION_NUMBER_YH", + // tagValue = m.RethrowNum.ToString(), + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "复投次数" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_PROCESS_NAME", + // tagValue = m.CSBYHPROCESSNAME, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯工序名" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_ABNORMAL_INFORMATION", + // tagValue = m.Remark, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯异常反馈信息" + // }, + // new TagDataVOListItem + // { + // tagCode="CSBYH_QUALITY_STATUS", + // tagValue = m.CSBYHOUTSTATIONJUDGMENTRESULT, + // tagTime = m.TestTime, + // tagCalculateResult = "Y", + // tagRemark = "电芯质量状态" + // }, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CODE_A", + // // tagValue = m.listBatCode[0], + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A芯包条码" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CODE_B", + // // tagValue = m.listBatCode[1], + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包条码" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_A_SCANNING_TIME", + // // tagValue = m.ScanTime[0], + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A芯包扫码时间" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_A_SCANNING_TIME", + // // tagValue = m.ScanTime[0], + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包扫码时间" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="", + // // tagValue = "无", + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A环轨编号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_ADHESION_JUDGE_RESULT_A", + // // tagValue = m.list_Data1[0, 13].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A电芯裁切粘连判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_BURR_JUDGE_RESULT_A", + // // tagValue = m.list_Data1[0, 14].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A电芯裁切毛刺判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_SOLDER_JUDGE_RESULT_A", + // // tagValue = HanYingA, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A芯包焊印位置判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_ADHESION_RESULT_A", + // // tagValue = m.list_Data4[0, 7].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A电芯裁切粘连结果（mm2）" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_BURR_RESULT_A", + // // tagValue = m.list_Data4[0, 8].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A电芯裁切毛刺结果（mm）" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_TOP_TO_SOLDER_DISTANCE_A", + // // tagValue = m.list_Data4[0, 9].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A芯包顶部到焊印间距（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_SOLDER_TO_EAR_DISTANCE_A", + // // tagValue = m.list_Data4[0, 10].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "A芯包焊印边缘到极耳边缘间距（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_WEIGHT_NO_B1", + // // tagValue = m.list_Data1[1, 1].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包称重1工位号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_WEIGHT_RESULT_B1", + // // tagValue = ZhongliangB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包重量1判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="", + // // tagValue = "无", + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B环轨编号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_STATION_NO_B", + // // tagValue = m.list_Data1[1, 2].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚工位号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_JUDGE_RESULT_B", + // // tagValue = CeHouB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_POLARITY_RESULT_B", + // // tagValue = JiXingB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包极性检测结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_TOOLNO_B", + // // tagValue = m.list_Data1[1, 3].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包治具号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_WELDING_STATION_NO_B", + // // tagValue = m.list_Data1[1, 4].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊接工位号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_WELD_HEAD_COUNT_B", + // // tagValue = m.list_Data2[1, 0].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊头次数" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_WELD_BASE_COUNT_B", + // // tagValue = m.list_Data2[1, 1].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊座次数" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_WELDING_STATION_NO_B", + // // tagValue = m.list_Data1[1, 7].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊接工位号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_WELD_HEAD_COUNT_B", + // // tagValue = m.list_Data2[1, 6].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊头次数" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_WELD_BASE_COUNT_B", + // // tagValue = m.list_Data2[1, 7].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊座次数" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUTABCUTTERCOUNTB", + // // tagValue = m.list_Data2[1, 12].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铜极耳切刀使用次数" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_ALTABCUTTERCOUNTB", + // // tagValue = m.list_Data2[1, 13].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铝极耳切刀使用次数" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_ADHESION_JUDGE_RESULT_B", + // // tagValue = m.list_Data1[1, 13].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯裁切粘连判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_BURR_JUDGE_RESULT_B", + // // tagValue = m.list_Data1[1, 14].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯裁切毛刺判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_SOLDER_JUDGE_RESULT_B", + // // tagValue = HanYingB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包焊印位置判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_FRONT_EAR_CRACKLE_JUDGE_RESULT_B", + // // tagValue = ZhengJiErSiLieB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包正面极耳撕裂判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_BACK_EAR_CRACKLE_JUDGE_RESULT_B", + // // tagValue = BeiJiErSiLieB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包背面极耳撕裂判定结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_FRONT_EAR_FLODING_RESULT_B", + // // tagValue = ZhengJiErFanB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包正面极耳翻折检测结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_BACK_EAR_FLODING_RESULT_B", + // // tagValue = BeiJiErFanB, + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包背面极耳翻折检测结果" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUTABCUTTERNO_B", + // // tagValue = m.list_Data1[1,21].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铜极耳切刀编号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_ALTABCUTTERNO_B", + // // tagValue = m.list_Data1[1,22].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铝极耳切刀编号" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_WEIGHT_B1_MAX_SETTING", + // // tagValue = m.list_Data3[1, 0].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包重量1设定值最大值（g）" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_WEIGHT_B1_MIN_SETTING", + // // tagValue = m.list_Data3[1, 1].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包重量1设定值最小值（g）" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_WEIGHT_B1", + // // tagValue = m.list_Data4[1, 0].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包重量1（g)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SETTING_B", + // // tagValue = m.list_Data3[1, 2].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚压力（Kg)设定最大值" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SETTING_B", + // // tagValue = m.list_Data3[1, 3].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚压力（Kg)设定最小值" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_B", + // // tagValue = m.list_Data4[1, 1].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚压力实际值" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_SIZE_B", + // // tagValue = m.list_Data4[1, 2].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚尺寸（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MAX_SIZE_B", + // // tagValue = m.list_Data3[1, 4].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚最大尺寸（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_THICKNESS_TEST_PRESSURE_MIN_SIZE_B", + // // tagValue = m.list_Data3[1, 5].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包侧厚最小尺寸（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_PRESSURE_B1", + // // tagValue = m.list_Data4[1, 13].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接压力(Psi)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_POWER_B1", + // // tagValue = m.list_Data4[1, 14].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊接功率(W)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_ENERGY_B1", + // // tagValue = m.list_Data4[1, 15].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接能量(J)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_AMPLITUDE_B1", + // // tagValue = m.list_Data4[1, 16].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接振幅(%)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_TIME_B1", + // // tagValue = m.list_Data4[1, 17].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接时间(ms)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_PRESSURE_B2", + // // tagValue = m.list_Data4[1, 18].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接压力(Psi)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_POWER_B2", + // // tagValue = m.list_Data4[1, 19].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊接功率B(W)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_ENERGY_B2", + // // tagValue = m.list_Data4[1, 20].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接能量(J)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_AMPLITUDE_B2", + // // tagValue = m.list_Data4[1, 21].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接振幅(%)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_TIME_B2", + // // tagValue = m.list_Data4[1, 22].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接时间(ms)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_PRESSURE_B3", + // // tagValue = m.list_Data4[1, 23].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接压力(Psi)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_POWER_B3", + // // tagValue = m.list_Data4[1, 24].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊接功率A(W)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_ENERGY_B3", + // // tagValue = m.list_Data4[1, 25].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接能量(J)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_AMPLITUDE_B3", + // // tagValue = m.list_Data4[1, 26].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接振幅(%)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CU_TIME_B3", + // // tagValue = m.list_Data4[1, 27].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铜焊焊接时间(ms)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_PRESSURE_B1", + // // tagValue = m.list_Data4[1, 28].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接压力(Psi)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_POWER_B1", + // // tagValue = m.list_Data4[1, 29].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊接功率(W)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_ENERGY_B1", + // // tagValue = m.list_Data4[1, 30].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接能量(J)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_AMPLITUDE_B1", + // // tagValue = m.list_Data4[1, 31].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接振幅(%)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_TIME_B1", + // // tagValue = m.list_Data4[1, 32].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接时间(ms)实际值1" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_PRESSURE_B2", + // // tagValue = m.list_Data4[1, 33].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接压力(Psi)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_POWER_B2", + // // tagValue = m.list_Data4[1, 34].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊接功率(W)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_ENERGY_B2", + // // tagValue = m.list_Data4[1, 35].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接能量(J)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_AMPLITUDE_B2", + // // tagValue = m.list_Data4[1, 36].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接振幅(%)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_TIME_B2", + // // tagValue = m.list_Data4[1, 37].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接时间(ms)实际值2" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_PRESSURE_B3", + // // tagValue = m.list_Data4[1, 38].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接压力(Psi)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_POWER_B3", + // // tagValue = m.list_Data4[1, 39].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊接功率(W)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_ENERGY_B3", + // // tagValue = m.list_Data4[1, 40].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接能量(J)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_AMPLITUDE_B3", + // // tagValue = m.list_Data4[1, 41].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接振幅(%)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_AL_TIME_B3", + // // tagValue = m.list_Data4[1, 42].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包铝焊焊接时间(ms)实际值3" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUTABLENGTHB", + // // tagValue = m.list_Data4[1, 3].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铜极极耳长度(mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUTABWIDTHB", + // // tagValue = m.list_Data4[1, 4].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铜极极耳宽度(mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_ALTABLENGTHB", + // // tagValue = m.list_Data4[1, 5].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铝极极耳长度(mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_ALTABWIDTHB", + // // tagValue = m.list_Data4[1, 6].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯铝极极耳宽度(mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_ADHESION_RESULT_B", + // // tagValue = m.list_Data4[1, 7].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯裁切粘连结果（mm2）" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_CUT_BURR_RESULT_B", + // // tagValue = m.list_Data4[1, 8].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B电芯裁切毛刺结果（mm）" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_TOP_TO_SOLDER_DISTANCE_B", + // // tagValue = m.list_Data4[1, 9].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包顶部到焊印间距（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_SOLDER_TO_EAR_DISTANCE_B", + // // tagValue = m.list_Data4[1, 10].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包焊印边缘到极耳边缘间距（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_FRONT_EAR_CRACKLE_RESULT_B", + // // tagValue = m.list_Data4[1, 11].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包正面极耳撕裂裂纹检测结果（mm)" + // //}, + // //new TagDataVOListItem + // //{ + // // tagCode="CSBYH_BACK_EAR_CRACKLE_RESULT_B", + // // tagValue = m.list_Data4[1, 12].ToString(), + // // tagTime = m.TestTime, + // // tagCalculateResult = "Y", + // // tagRemark = "B芯包背面极耳撕裂裂纹检测结果（mm)" + // //} - }; + // }; - model.payload = JsonConvert.SerializeObject(payload1); - //payload1= JsonConvert.SerializeObject(payload1); - break; + // model.payload = JsonConvert.SerializeObject(payload1); + // //payload1= JsonConvert.SerializeObject(payload1); + // break; - } + // } - var postcontent = JsonConvert.SerializeObject(model); - var sw = new Stopwatch(); - sw.Start(); - string result = MESApiHelper.WepPostAPIAsync(url, postcontent); - sw.Stop(); + // var postcontent = JsonConvert.SerializeObject(model); + // var sw = new Stopwatch(); + // sw.Start(); + // string result = MESApiHelper.WepPostAPIAsync(url, postcontent); + // sw.Stop(); - if (string.IsNullOrEmpty(result)) - { - string resData = result == "" ? "" : result; - resJson = $"{nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用产品结果加工参数接口:{url},请求数据为:{postcontent},\n{nowDate.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resData}"; - TxtHelper.WriteTxt($@"D:\APILog\Logs\MesLogs\{nowDate.ToString("yyyyMMdd")}\产品结果加工参数\{nowDate.ToString("HH")}.txt", resJson); - return res; - } + // if (string.IsNullOrEmpty(result)) + // { + // string resData = result == "" ? "" : result; + // resJson = $"{nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用产品结果加工参数接口:{url},请求数据为:{postcontent},\n{nowDate.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resData}"; + // TxtHelper.WriteTxt($@"D:\APILog\Logs\MesLogs\{nowDate.ToString("yyyyMMdd")}\产品结果加工参数\{nowDate.ToString("HH")}.txt", resJson); + // return res; + // } - var res1 = ReturnMesMsg(result); - if (!res1.success) - { - var resData = res1 == null ? "" : JsonConvert.SerializeObject(res1); - Mesage = res1.message; - resJson = $"{nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用产品结果加工参数接口:{url},请求数据为:{postcontent},\n{nowDate.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resData}"; - TxtHelper.WriteTxt($@"D:\APILog\Logs\MesLogs\{nowDate.ToString("yyyyMMdd")}\产品结果加工参数\{nowDate.ToString("HH")}.txt", resJson); - } - else - { - res = true; - Mesage = res1.message; - resJson = $"{nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用产品结果加工参数接口:{url},请求数据为:{postcontent},\n{nowDate.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{JsonConvert.SerializeObject(result)}"; - TxtHelper.WriteTxt($@"D:\APILog\Logs\MesLogs\{nowDate.ToString("yyyyMMdd")}\产品结果加工参数\{nowDate.ToString("HH")}.txt", resJson); - } - - } - catch (Exception ex) - { - resJson = $"产品结果加工参数接口发生异常：{ex.Message}"; - LogHelper.Instance.WriteEX("产品结果加工参数接口", ex); - } + // var res1 = ReturnMesMsg(result); + // if (!res1.success) + // { + // var resData = res1 == null ? "" : JsonConvert.SerializeObject(res1); + // Mesage = res1.message; + // resJson = $"{nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用产品结果加工参数接口:{url},请求数据为:{postcontent},\n{nowDate.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resData}"; + // TxtHelper.WriteTxt($@"D:\APILog\Logs\MesLogs\{nowDate.ToString("yyyyMMdd")}\产品结果加工参数\{nowDate.ToString("HH")}.txt", resJson); + // } + // else + // { + // res = true; + // Mesage = res1.message; + // resJson = $"{nowDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用产品结果加工参数接口:{url},请求数据为:{postcontent},\n{nowDate.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{JsonConvert.SerializeObject(result)}"; + // TxtHelper.WriteTxt($@"D:\APILog\Logs\MesLogs\{nowDate.ToString("yyyyMMdd")}\产品结果加工参数\{nowDate.ToString("HH")}.txt", resJson); + // } + //} + //catch (Exception ex) + //{ + // resJson = $"产品结果加工参数接口发生异常：{ex.Message}"; + // LogHelper.Instance.WriteEX("产品结果加工参数接口", ex); + //} + #endregion return res; } #endregion diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs index b8a9a30..d41a0a9 100644 --- a/JinYuan.Models/BGearEntity.cs +++ b/JinYuan.Models/BGearEntity.cs @@ -8,20 +8,21 @@ namespace JinYuan.Models /// public class BGearEntity { - public int[] MyNo = new int[2];//AB序号 - public short[] listRes = new short[2];//AB反馈结果 - public string[] ScanTime = new string[2];//AB芯包扫码时间 - public string[] listBatCode = new string[2];//AB芯包条码 - public string[] judgment_result = new string[2];//AB芯包出站判定结果 + public int[] MyNo = new int[3];//AB序号 + public short[] listRes = new short[3];//AB反馈结果 + public string[] ScanTime = new string[3];//AB芯包扫码时间 + public string[] listBatCode = new string[3];//芯包条码 + public string[] judgment_result = new string[3];//AB芯包出站判定结果 - public short[,] list_Data1 = new short[2, 28];//芯包信息1 - public int[,] list_Data2 = new int[2, 19];//芯包信息2（焊机相关次数） - public float[,] list_Data3 = new float[2, 54];//芯包信息3(设定值) - public float[,] list_Data4 = new float[2, 47];//芯包信息4(实际值) - public short[,] NG_Data1 = new short[2, 5];//NG芯包信息1 - public float[,] NG_Data2 = new float[2, 9];//NG芯包信息2 + public short[,] list_Data1 = new short[3, 28];//芯包信息1 + public int[,] list_Data2 = new int[3, 19];//芯包信息2（焊机相关次数） + public float[,] list_Data3 = new float[3, 54];//芯包信息3(设定值) + public float[,] list_Data4 = new float[3, 47];//芯包信息4(实际值) - public short[,] list_pan = new short[2, 1];//物流线托盘码 + 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 /// /// 时间 /// @@ -44,203 +45,82 @@ namespace JinYuan.Models /// /// 区分A和B /// - public string A_B { get; set; } + // public string A_B { get; set; } + /// + /// 电芯1_CCD1结果 1 OK，0 NG，2 缺图 + /// + public int CCD1 { get; set; } + public int CCD2 { get; set; } + public int CCD3 { get; set; } + public int CCD4 { get; set; } + public int CCD5 { get; set; } + public int CCD6 { get; set; } + public int CCD7 { get; set; } + public int CCD8 { get; set; } + public int CCD9 { get; set; } + public int CCD10 { get; set; } + public int CCD11 { get; set; } + public int CCD12 { get; set; } + public int CCD13 { get; set; } + public int CCD14 { get; set; } + public int CCD15 { get; set; } + public int CCD16 { get; set; } + public int CCD17 { get; set; } + public int CCD18 { get; set; } + public int CCD19 { get; set; } + public int CCD20 { get; set; } + public int CCD21 { get; set; } + public int CCD22 { get; set; } + public int CCD23 { get; set; } + public int CCD24 { get; set; } + public int CCD25 { get; set; } + public int CCD26 { get; set; } + public int CCD27 { get; set; } + /// + /// 电芯1_厚度数据1 + /// + public float Thickness1 { get; set; } + public float Thickness2 { get; set; } + public float Thickness3 { get; set; } + /// + /// 电芯_CCD1结果 1 OK，0 NG，2 缺图 + /// + public string CCDResult1 { get; set; } + public string CCDResult2 { get; set; } + public string CCDResult3 { get; set; } + public string CCDResult4 { get; set; } + public string CCDResult5 { get; set; } + public string CCDResult6 { get; set; } + public string CCDResult7 { get; set; } + public string CCDResult8 { get; set; } + public string CCDResult9 { get; set; } + public string CCDResult10 { get; set; } + public string CCDResult11 { get; set; } + public string CCDResult12 { get; set; } + public string CCDResult13 { get; set; } + public string CCDResult14 { get; set; } + public string CCDResult15 { get; set; } + public string CCDResult16 { get; set; } + public string CCDResult17 { get; set; } + public string CCDResult18 { get; set; } + public string CCDResult19 { get; set; } + public string CCDResult20 { get; set; } + public string CCDResult21 { get; set; } + public string CCDResult22 { get; set; } + public string CCDResult23 { get; set; } + public string CCDResult24 { get; set; } + public string CCDResult25 { get; set; } + public string CCDResult26 { get; set; } + public string CCDResult27 { get; set; } + /// /// 芯包条码 /// public string CSBYHCODEA { 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工序名 /// @@ -258,400 +138,9 @@ namespace JinYuan.Models /// 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 int RethrowNum { get; set; } /// /// 标志 /// @@ -660,6 +149,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; } + + // /// + // /// 电芯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 int Flag { get; set; } + // /// + // /// 备注 + // /// + // public string Remark { get; set; } } } diff --git a/LargeSquareOne/App.config b/LargeSquareOne/App.config index 2269be6..7030cc9 100644 --- a/LargeSquareOne/App.config +++ b/LargeSquareOne/App.config @@ -6,7 +6,7 @@ - + diff --git a/LargeSquareOne/Config/Configure.ini b/LargeSquareOne/Config/Configure.ini index c2ea79a..266e612 100644 --- a/LargeSquareOne/Config/Configure.ini +++ b/LargeSquareOne/Config/Configure.ini @@ -7,7 +7,7 @@ лؽʱ=1 ʾ=1 ˢģʽ=False -MES/MESģʽл=True +MES/MESģʽл=False ȡMES=True ̺߳ʱ־=False Ƿȡ=1 diff --git a/LargeSquareOne/FrmDataMonitor.Designer.cs b/LargeSquareOne/FrmDataMonitor.Designer.cs index eb6dd82..d6a871c 100644 --- a/LargeSquareOne/FrmDataMonitor.Designer.cs +++ b/LargeSquareOne/FrmDataMonitor.Designer.cs @@ -67,146 +67,41 @@ this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column33 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column137 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column138 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column96 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column97 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column98 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column99 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column145 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column146 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column142 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column143 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column144 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column23 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column100 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column101 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column42 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column40 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column41 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column36 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column105 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column106 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column108 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column109 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column103 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column104 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column105 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column106 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column107 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column108 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column109 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column110 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column111 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column30 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column31 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column39 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column37 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column38 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column43 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column148 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column44 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column45 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column92 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column93 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column94 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column95 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column98 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column54 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column55 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column56 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column57 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column58 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column59 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column60 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column61 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column62 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column63 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column64 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column65 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column66 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column67 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column68 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column77 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column78 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column79 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column80 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column81 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column82 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column83 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column84 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column85 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column86 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column87 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column88 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column89 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column90 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column91 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column46 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column114 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column115 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column48 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column47 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column49 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column116 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column117 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column50 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column118 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column119 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column51 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column120 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column121 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column52 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column122 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column123 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column53 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column124 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column125 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column69 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column140 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column141 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column71 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column70 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column126 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column72 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column127 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column128 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column73 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column129 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column130 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column74 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column131 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column132 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column75 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column133 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column134 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column76 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column135 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column136 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tableLayoutPanel1.SuspendLayout(); @@ -240,7 +135,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.37666F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 477F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 886); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1370, 749); this.tableLayoutPanel1.TabIndex = 0; // // groupBoxEX3 @@ -259,7 +154,7 @@ this.groupBoxEX3.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX3.Name = "groupBoxEX3"; this.groupBoxEX3.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX3.Size = new System.Drawing.Size(343, 182); + this.groupBoxEX3.Size = new System.Drawing.Size(206, 120); this.groupBoxEX3.TabIndex = 14; this.groupBoxEX3.TabStop = false; this.groupBoxEX3.Text = "操作设置"; @@ -329,7 +224,7 @@ // this.btSatrt.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.btSatrt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btSatrt.Location = new System.Drawing.Point(42, 105); + this.btSatrt.Location = new System.Drawing.Point(42, 4); this.btSatrt.Margin = new System.Windows.Forms.Padding(2); this.btSatrt.Name = "btSatrt"; this.btSatrt.Padding = new System.Windows.Forms.Padding(2); @@ -345,11 +240,11 @@ this.groupBoxEX2.Controls.Add(this.lVConfigRange); this.groupBoxEX2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX2.ForeColor = System.Drawing.Color.White; - this.groupBoxEX2.Location = new System.Drawing.Point(2, 188); + this.groupBoxEX2.Location = new System.Drawing.Point(2, 126); this.groupBoxEX2.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX2.Name = "groupBoxEX2"; this.groupBoxEX2.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX2.Size = new System.Drawing.Size(343, 218); + this.groupBoxEX2.Size = new System.Drawing.Size(206, 143); this.groupBoxEX2.TabIndex = 13; this.groupBoxEX2.TabStop = false; this.groupBoxEX2.Text = "参数"; @@ -371,7 +266,7 @@ this.lVConfigRange.Margin = new System.Windows.Forms.Padding(2); this.lVConfigRange.Name = "lVConfigRange"; this.lVConfigRange.OwnerDraw = true; - this.lVConfigRange.Size = new System.Drawing.Size(339, 195); + this.lVConfigRange.Size = new System.Drawing.Size(202, 120); this.lVConfigRange.TabIndex = 2; this.lVConfigRange.UseCompatibleStateImageBehavior = false; this.lVConfigRange.View = System.Windows.Forms.View.Details; @@ -410,12 +305,12 @@ this.groupBoxEX4.Controls.Add(this.dgvFeedingData); this.groupBoxEX4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX4.ForeColor = System.Drawing.Color.White; - this.groupBoxEX4.Location = new System.Drawing.Point(349, 2); + this.groupBoxEX4.Location = new System.Drawing.Point(212, 2); this.groupBoxEX4.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX4.Name = "groupBoxEX4"; this.groupBoxEX4.Padding = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.SetRowSpan(this.groupBoxEX4, 2); - this.groupBoxEX4.Size = new System.Drawing.Size(1569, 404); + this.groupBoxEX4.Size = new System.Drawing.Size(1156, 267); this.groupBoxEX4.TabIndex = 15; this.groupBoxEX4.TabStop = false; this.groupBoxEX4.Text = "进站"; @@ -475,7 +370,7 @@ this.dgvFeedingData.RowHeadersWidth = 60; this.dgvFeedingData.RowTemplate.Height = 23; this.dgvFeedingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvFeedingData.Size = new System.Drawing.Size(1565, 381); + this.dgvFeedingData.Size = new System.Drawing.Size(1152, 244); this.dgvFeedingData.TabIndex = 10; this.dgvFeedingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvFeedingData_CellContentClick); this.dgvFeedingData.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvFeedingData_RowPrePaint); @@ -542,11 +437,11 @@ this.groupBoxEX1.Controls.Add(this.rtb_Info); this.groupBoxEX1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX1.ForeColor = System.Drawing.Color.White; - this.groupBoxEX1.Location = new System.Drawing.Point(2, 410); + this.groupBoxEX1.Location = new System.Drawing.Point(2, 273); this.groupBoxEX1.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX1.Name = "groupBoxEX1"; this.groupBoxEX1.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX1.Size = new System.Drawing.Size(343, 474); + this.groupBoxEX1.Size = new System.Drawing.Size(206, 474); this.groupBoxEX1.TabIndex = 12; this.groupBoxEX1.TabStop = false; this.groupBoxEX1.Text = "日志记录"; @@ -561,7 +456,7 @@ this.rtb_Info.Margin = new System.Windows.Forms.Padding(2); this.rtb_Info.Name = "rtb_Info"; this.rtb_Info.ReadOnly = true; - this.rtb_Info.Size = new System.Drawing.Size(339, 451); + this.rtb_Info.Size = new System.Drawing.Size(202, 451); this.rtb_Info.TabIndex = 1; this.rtb_Info.Text = ""; // @@ -573,11 +468,11 @@ this.groupBoxEX5.Controls.Add(this.dgvBlankingData); this.groupBoxEX5.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxEX5.ForeColor = System.Drawing.Color.White; - this.groupBoxEX5.Location = new System.Drawing.Point(349, 410); + this.groupBoxEX5.Location = new System.Drawing.Point(212, 273); this.groupBoxEX5.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEX5.Name = "groupBoxEX5"; this.groupBoxEX5.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxEX5.Size = new System.Drawing.Size(1569, 474); + this.groupBoxEX5.Size = new System.Drawing.Size(1156, 474); this.groupBoxEX5.TabIndex = 16; this.groupBoxEX5.TabStop = false; this.groupBoxEX5.Text = "出站"; @@ -606,146 +501,41 @@ this.dataGridViewTextBoxColumn2, this.Column32, this.Column33, - this.Column137, this.dataGridViewTextBoxColumn5, this.Column29, this.Column3, this.Column138, - this.Column7, - this.Column10, - this.Column24, - this.Column11, this.Column25, this.Column96, this.Column97, + this.Column98, this.Column99, - this.Column145, - this.Column146, - this.Column147, - this.Column26, - this.Column142, - this.Column143, - this.Column144, - this.Column27, - this.Column28, - this.Column21, - this.Column23, this.Column100, this.Column101, - this.Column42, - this.Column40, - this.Column41, - this.Column6, - this.Column9, - this.Column12, - this.Column13, - this.Column8, - this.Column36, - this.Column14, - this.Column105, - this.Column106, - this.Column15, - this.Column108, - this.Column109, - this.Column16, this.Column103, this.Column104, - this.Column17, + this.Column105, + this.Column106, this.Column107, + this.Column108, + this.Column109, this.Column110, - this.Column18, this.Column111, this.Column112, - this.Column19, - this.Column20, - this.Column30, - this.Column31, - this.Column34, - this.Column35, - this.Column39, - this.Column37, - this.Column38, - this.Column43, - this.Column148, - this.Column44, - this.Column45, - this.Column92, - this.Column93, - this.Column94, - this.Column95, - this.Column98, - this.Column54, - this.Column55, - this.Column56, - this.Column57, - this.Column58, - this.Column59, - this.Column60, - this.Column61, - this.Column62, - this.Column63, - this.Column64, - this.Column65, - this.Column66, - this.Column67, - this.Column68, - this.Column77, - this.Column78, - this.Column79, - this.Column80, - this.Column81, - this.Column82, - this.Column83, - this.Column84, - this.Column85, - this.Column86, - this.Column87, - this.Column88, - this.Column89, - this.Column90, - this.Column91, - this.Column46, + this.Column113, this.Column114, this.Column115, - this.Column48, - this.Column47, - this.Column113, - this.Column49, this.Column116, this.Column117, - this.Column50, this.Column118, this.Column119, - this.Column51, this.Column120, this.Column121, - this.Column52, this.Column122, this.Column123, - this.Column53, - this.Column124, - this.Column125, - this.Column69, - this.Column140, - this.Column141, - this.Column71, - this.Column70, - this.Column126, - this.Column72, - this.Column127, - this.Column128, - this.Column73, - this.Column129, - this.Column130, - this.Column74, - this.Column131, - this.Column132, - this.Column75, - this.Column133, - this.Column134, - this.Column76, - this.Column135, - this.Column136, + this.Column147, + this.Column34, + this.Column35, this.Column102, this.Column22}); dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -777,7 +567,7 @@ this.dgvBlankingData.RowHeadersWidth = 60; this.dgvBlankingData.RowTemplate.Height = 23; this.dgvBlankingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvBlankingData.Size = new System.Drawing.Size(1565, 451); + this.dgvBlankingData.Size = new System.Drawing.Size(1152, 451); this.dgvBlankingData.TabIndex = 10; this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick); // @@ -826,13 +616,6 @@ this.Column33.ReadOnly = true; this.Column33.Width = 150; // - // Column137 - // - this.Column137.DataPropertyName = "A_B"; - this.Column137.HeaderText = "芯包"; - this.Column137.Name = "Column137"; - this.Column137.ReadOnly = true; - // // dataGridViewTextBoxColumn5 // this.dataGridViewTextBoxColumn5.DataPropertyName = "CSBYHCODEA"; @@ -867,81 +650,201 @@ this.Column138.Name = "Column138"; this.Column138.ReadOnly = true; // - // Column7 - // - this.Column7.DataPropertyName = "CSBYHWEIGHTRESULTA1"; - this.Column7.HeaderText = "芯包重量判定结果"; - this.Column7.MinimumWidth = 8; - this.Column7.Name = "Column7"; - this.Column7.ReadOnly = true; - this.Column7.Width = 150; - // - // Column10 - // - this.Column10.DataPropertyName = "CSBYHTHICKNESSTESTJUDGERESULTA"; - this.Column10.HeaderText = "测厚位移判定结果"; - this.Column10.MinimumWidth = 8; - this.Column10.Name = "Column10"; - this.Column10.ReadOnly = true; - this.Column10.Width = 150; - // - // Column24 - // - this.Column24.DataPropertyName = "ThicknessPressureResult"; - this.Column24.HeaderText = "测厚压力判定结果"; - this.Column24.Name = "Column24"; - this.Column24.ReadOnly = true; - // - // Column11 - // - this.Column11.DataPropertyName = "CSBYHPOLARITYRESULTA"; - this.Column11.HeaderText = "芯包极性检测结果"; - this.Column11.MinimumWidth = 8; - this.Column11.Name = "Column11"; - this.Column11.ReadOnly = true; - this.Column11.Width = 150; - // // Column25 // - this.Column25.DataPropertyName = "PreweldResult"; - this.Column25.HeaderText = "焊前CCD检测结果"; + this.Column25.DataPropertyName = "CCDResult1"; + this.Column25.HeaderText = "CCD1判定结果"; this.Column25.Name = "Column25"; this.Column25.ReadOnly = true; // // Column96 // - this.Column96.DataPropertyName = "CopperWeldHeadLife"; - this.Column96.HeaderText = "铜焊头预警寿命(次)"; + this.Column96.DataPropertyName = "CCDResult2"; + this.Column96.HeaderText = "CCD2判定结果"; this.Column96.Name = "Column96"; this.Column96.ReadOnly = true; // // Column97 // - this.Column97.DataPropertyName = "CopperWeldSeatLife"; - this.Column97.HeaderText = "铜焊座预警寿命(次)"; + this.Column97.DataPropertyName = "CCDResult3"; + this.Column97.HeaderText = "CCD3判定结果"; this.Column97.Name = "Column97"; this.Column97.ReadOnly = true; // + // Column98 + // + this.Column98.DataPropertyName = "CCDResult4"; + this.Column98.HeaderText = "CCD4判定结果"; + this.Column98.Name = "Column98"; + this.Column98.ReadOnly = true; + // // Column99 // - this.Column99.DataPropertyName = "AluminiumWeldHeadLife"; - this.Column99.HeaderText = "铝焊头预警寿命(次)"; + this.Column99.DataPropertyName = "CCDResult5"; + this.Column99.HeaderText = "CCD5判定结果"; this.Column99.Name = "Column99"; this.Column99.ReadOnly = true; // - // Column145 + // Column100 // - this.Column145.DataPropertyName = "AluminiumWeldSeatLife"; - this.Column145.HeaderText = "铝焊座预警寿命(次)"; - this.Column145.Name = "Column145"; - this.Column145.ReadOnly = true; + this.Column100.DataPropertyName = "CCDResult6"; + this.Column100.HeaderText = "CCD6判定结果"; + this.Column100.Name = "Column100"; + this.Column100.ReadOnly = true; // - // Column146 + // Column101 // - this.Column146.DataPropertyName = "CuttingKnifeLife"; - this.Column146.HeaderText = "裁切刀使用寿命(次)"; - this.Column146.Name = "Column146"; - this.Column146.ReadOnly = true; + this.Column101.DataPropertyName = "CCDResult7"; + this.Column101.HeaderText = "CCD7判定结果"; + this.Column101.Name = "Column101"; + this.Column101.ReadOnly = true; + // + // Column103 + // + this.Column103.DataPropertyName = "CCDResult8"; + this.Column103.HeaderText = "CCD8判定结果"; + this.Column103.Name = "Column103"; + this.Column103.ReadOnly = true; + // + // Column104 + // + this.Column104.DataPropertyName = "CCDResult9"; + this.Column104.HeaderText = "CCD9判定结果"; + this.Column104.Name = "Column104"; + this.Column104.ReadOnly = true; + // + // Column105 + // + this.Column105.DataPropertyName = "CCDResult10"; + this.Column105.HeaderText = "CCD10判定结果"; + this.Column105.Name = "Column105"; + this.Column105.ReadOnly = true; + // + // Column106 + // + this.Column106.DataPropertyName = "CCDResult11"; + this.Column106.HeaderText = "CCD11判定结果"; + this.Column106.Name = "Column106"; + this.Column106.ReadOnly = true; + // + // Column107 + // + this.Column107.DataPropertyName = "CCDResult12"; + this.Column107.HeaderText = "CCD12判定结果"; + this.Column107.Name = "Column107"; + this.Column107.ReadOnly = true; + // + // Column108 + // + this.Column108.DataPropertyName = "CCDResult13"; + this.Column108.HeaderText = "CCD13判定结果"; + this.Column108.Name = "Column108"; + this.Column108.ReadOnly = true; + // + // Column109 + // + this.Column109.DataPropertyName = "CCDResult14"; + this.Column109.HeaderText = "CCD14判定结果"; + this.Column109.Name = "Column109"; + this.Column109.ReadOnly = true; + // + // Column110 + // + this.Column110.DataPropertyName = "CCDResult15"; + this.Column110.HeaderText = "CCD15判定结果"; + this.Column110.Name = "Column110"; + this.Column110.ReadOnly = true; + // + // Column111 + // + this.Column111.DataPropertyName = "CCDResult16"; + this.Column111.HeaderText = "CCD16判定结果"; + this.Column111.Name = "Column111"; + this.Column111.ReadOnly = true; + // + // Column112 + // + this.Column112.DataPropertyName = "CCDResult17"; + this.Column112.HeaderText = "CCD17判定结果"; + this.Column112.Name = "Column112"; + this.Column112.ReadOnly = true; + // + // Column113 + // + this.Column113.DataPropertyName = "CCDResult18"; + this.Column113.HeaderText = "CCD18判定结果"; + this.Column113.Name = "Column113"; + this.Column113.ReadOnly = true; + // + // Column114 + // + this.Column114.DataPropertyName = "CCDResult19"; + this.Column114.HeaderText = "CCD19判定结果"; + this.Column114.Name = "Column114"; + this.Column114.ReadOnly = true; + // + // Column115 + // + this.Column115.DataPropertyName = "CCDResult20"; + this.Column115.HeaderText = "CCD19判定结果"; + this.Column115.Name = "Column115"; + this.Column115.ReadOnly = true; + // + // Column116 + // + this.Column116.DataPropertyName = "CCDResult21"; + this.Column116.HeaderText = "CCD19判定结果"; + this.Column116.Name = "Column116"; + this.Column116.ReadOnly = true; + // + // Column117 + // + this.Column117.DataPropertyName = "CCDResult22"; + this.Column117.HeaderText = "CCD22判定结果"; + this.Column117.Name = "Column117"; + this.Column117.ReadOnly = true; + // + // Column118 + // + this.Column118.DataPropertyName = "CCDResult23"; + this.Column118.HeaderText = "CCD23判定结果"; + this.Column118.Name = "Column118"; + this.Column118.ReadOnly = true; + // + // Column119 + // + this.Column119.DataPropertyName = "CCDResult23"; + this.Column119.HeaderText = "CCD23判定结果"; + this.Column119.Name = "Column119"; + this.Column119.ReadOnly = true; + // + // Column120 + // + this.Column120.DataPropertyName = "CCDResult24"; + this.Column120.HeaderText = "CCD24判定结果"; + this.Column120.Name = "Column120"; + this.Column120.ReadOnly = true; + // + // Column121 + // + this.Column121.DataPropertyName = "CCDResult25"; + this.Column121.HeaderText = "CCD25判定结果"; + this.Column121.Name = "Column121"; + this.Column121.ReadOnly = true; + // + // Column122 + // + this.Column122.DataPropertyName = "CCDResult26"; + this.Column122.HeaderText = "CCD26判定结果"; + this.Column122.Name = "Column122"; + this.Column122.ReadOnly = true; + // + // Column123 + // + this.Column123.DataPropertyName = "CCDResult27"; + this.Column123.HeaderText = "CCD27判定结果"; + this.Column123.Name = "Column123"; + this.Column123.ReadOnly = true; // // Column147 // @@ -950,334 +853,10 @@ this.Column147.Name = "Column147"; this.Column147.ReadOnly = true; // - // Column26 - // - this.Column26.DataPropertyName = "CSBYHSOLDERJUDGERESULTA"; - this.Column26.HeaderText = "芯包铜焊印位置判定结果1"; - this.Column26.MinimumWidth = 8; - this.Column26.Name = "Column26"; - this.Column26.ReadOnly = true; - this.Column26.Width = 200; - // - // Column142 - // - this.Column142.DataPropertyName = "CSBYHSOLDERJUDGERESULTA2"; - this.Column142.HeaderText = "芯包铜焊印位置判定结果2"; - this.Column142.Name = "Column142"; - this.Column142.ReadOnly = true; - // - // Column143 - // - this.Column143.DataPropertyName = "AluminiumWeldPositionResult1"; - this.Column143.HeaderText = "芯包铝焊印位置判定结果1"; - this.Column143.Name = "Column143"; - this.Column143.ReadOnly = true; - // - // Column144 - // - this.Column144.DataPropertyName = "AluminiumWeldPositionResult2"; - this.Column144.HeaderText = "芯包铝焊印位置判定结果2"; - this.Column144.Name = "Column144"; - this.Column144.ReadOnly = true; - // - // Column27 - // - this.Column27.DataPropertyName = "CSBYHFRONTEARCRACKLEJUDGERESULTA"; - this.Column27.HeaderText = "芯包正面极耳撕裂判定结果"; - this.Column27.MinimumWidth = 8; - this.Column27.Name = "Column27"; - this.Column27.ReadOnly = true; - this.Column27.Width = 250; - // - // Column28 - // - this.Column28.DataPropertyName = "CSBYHBACKEARCRACKLEJUDGERESULTA"; - this.Column28.HeaderText = "芯包背面极耳撕裂判定结果"; - this.Column28.MinimumWidth = 8; - this.Column28.Name = "Column28"; - this.Column28.ReadOnly = true; - this.Column28.Width = 250; - // - // Column21 - // - this.Column21.DataPropertyName = "CSBYHFRONTEARFLODINGRESULTA"; - this.Column21.HeaderText = "芯包正面极耳翻折检测结果"; - this.Column21.MinimumWidth = 8; - this.Column21.Name = "Column21"; - this.Column21.ReadOnly = true; - this.Column21.Width = 250; - // - // Column23 - // - this.Column23.DataPropertyName = "CSBYHBACKEARFLODINGRESULTA"; - this.Column23.HeaderText = "芯包背面极耳翻折检测结果"; - this.Column23.MinimumWidth = 8; - this.Column23.Name = "Column23"; - this.Column23.ReadOnly = true; - this.Column23.Width = 250; - // - // Column100 - // - this.Column100.DataPropertyName = "CSBYHFRONTEARCRACKLERESULTA"; - this.Column100.HeaderText = "芯包正面极耳撕裂裂纹检测结果（mm)"; - this.Column100.MinimumWidth = 8; - this.Column100.Name = "Column100"; - this.Column100.ReadOnly = true; - this.Column100.Width = 250; - // - // Column101 - // - this.Column101.DataPropertyName = "CSBYHBACKEARCRACKLERESULTA"; - this.Column101.HeaderText = "芯包背面极耳撕裂裂纹检测结果（mm)"; - this.Column101.MinimumWidth = 8; - this.Column101.Name = "Column101"; - this.Column101.ReadOnly = true; - this.Column101.Width = 250; - // - // Column42 - // - this.Column42.DataPropertyName = "CSBYHTHICKNESSTESTPRESSUREA"; - this.Column42.HeaderText = "芯包测厚压力实际值"; - this.Column42.MinimumWidth = 8; - this.Column42.Name = "Column42"; - this.Column42.ReadOnly = true; - this.Column42.Width = 150; - // - // Column40 - // - this.Column40.DataPropertyName = "CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA"; - this.Column40.HeaderText = "芯包测厚压力（Kg)设定最大值"; - this.Column40.MinimumWidth = 8; - this.Column40.Name = "Column40"; - this.Column40.ReadOnly = true; - this.Column40.Width = 250; - // - // Column41 - // - this.Column41.DataPropertyName = "CSBYHTHICKNESSTESTPRESSUREMINSETTINGA"; - this.Column41.HeaderText = "芯包测厚压力（Kg)设定最小值"; - this.Column41.MinimumWidth = 8; - this.Column41.Name = "Column41"; - this.Column41.ReadOnly = true; - this.Column41.Width = 250; - // - // Column6 - // - this.Column6.DataPropertyName = "CSBYHWEIGHTNOA1"; - this.Column6.HeaderText = "芯包称重1工位号"; - this.Column6.MinimumWidth = 8; - this.Column6.Name = "Column6"; - this.Column6.ReadOnly = true; - this.Column6.Width = 150; - // - // Column9 - // - this.Column9.DataPropertyName = "CSBYHTHICKNESSTESTSTATIONNOA"; - this.Column9.HeaderText = "芯包测厚工位号"; - this.Column9.MinimumWidth = 8; - this.Column9.Name = "Column9"; - this.Column9.ReadOnly = true; - this.Column9.Width = 150; - // - // Column12 - // - this.Column12.DataPropertyName = "CSBYHTOOLNOA"; - this.Column12.HeaderText = "芯包治具号"; - this.Column12.MinimumWidth = 8; - this.Column12.Name = "Column12"; - this.Column12.ReadOnly = true; - this.Column12.Width = 150; - // - // Column13 - // - this.Column13.DataPropertyName = "CSBYHCUWELDINGSTATIONNOA1"; - this.Column13.HeaderText = "芯包铜焊接工位号1"; - this.Column13.MinimumWidth = 8; - this.Column13.Name = "Column13"; - this.Column13.ReadOnly = true; - this.Column13.Width = 150; - // - // Column8 - // - this.Column8.DataPropertyName = "CSBYHCUWELDINGSTATIONNOA2"; - this.Column8.HeaderText = "芯包铜焊接工位号2"; - this.Column8.Name = "Column8"; - this.Column8.ReadOnly = true; - this.Column8.Width = 150; - // - // Column36 - // - this.Column36.DataPropertyName = "CSBYHCUWELDINGSTATIONNOA3"; - this.Column36.HeaderText = "芯包铜焊接工位号3"; - this.Column36.Name = "Column36"; - this.Column36.ReadOnly = true; - this.Column36.Width = 150; - // - // Column14 - // - this.Column14.DataPropertyName = "CSBYHCUWELDHEADCOUNTA1"; - this.Column14.HeaderText = "芯包铜焊焊头次数1"; - this.Column14.MinimumWidth = 8; - this.Column14.Name = "Column14"; - this.Column14.ReadOnly = true; - this.Column14.Width = 150; - // - // Column105 - // - this.Column105.DataPropertyName = "CSBYHCUWELDHEADCOUNTA2"; - this.Column105.HeaderText = "芯包铜焊焊头次数2"; - this.Column105.Name = "Column105"; - this.Column105.ReadOnly = true; - this.Column105.Width = 150; - // - // Column106 - // - this.Column106.DataPropertyName = "CSBYHCUWELDHEADCOUNTA3"; - this.Column106.HeaderText = "芯包铜焊焊头次数3"; - this.Column106.Name = "Column106"; - this.Column106.ReadOnly = true; - this.Column106.Width = 150; - // - // Column15 - // - this.Column15.DataPropertyName = "CSBYHCUWELDBASECOUNTA1"; - this.Column15.HeaderText = "芯包铜焊焊座次数1"; - this.Column15.MinimumWidth = 8; - this.Column15.Name = "Column15"; - this.Column15.ReadOnly = true; - this.Column15.Width = 150; - // - // Column108 - // - this.Column108.DataPropertyName = "CSBYHCUWELDBASECOUNTA2"; - this.Column108.HeaderText = "芯包铜焊焊座次数2"; - this.Column108.Name = "Column108"; - this.Column108.ReadOnly = true; - this.Column108.Width = 150; - // - // Column109 - // - this.Column109.DataPropertyName = "CSBYHCUWELDBASECOUNTA3"; - this.Column109.HeaderText = "芯包铜焊焊座次数3"; - this.Column109.Name = "Column109"; - this.Column109.ReadOnly = true; - this.Column109.Width = 150; - // - // Column16 - // - this.Column16.DataPropertyName = "CSBYHALWELDINGSTATIONNOA1"; - this.Column16.HeaderText = "芯包铝焊接工位号1"; - this.Column16.MinimumWidth = 8; - this.Column16.Name = "Column16"; - this.Column16.ReadOnly = true; - this.Column16.Width = 150; - // - // Column103 - // - this.Column103.DataPropertyName = "CSBYHALWELDINGSTATIONNOA2"; - this.Column103.HeaderText = "芯包铝焊接工位号2"; - this.Column103.Name = "Column103"; - this.Column103.ReadOnly = true; - this.Column103.Width = 150; - // - // Column104 - // - this.Column104.DataPropertyName = "CSBYHALWELDINGSTATIONNOA3"; - this.Column104.HeaderText = "芯包铝焊接工位号3"; - this.Column104.Name = "Column104"; - this.Column104.ReadOnly = true; - this.Column104.Width = 150; - // - // Column17 - // - this.Column17.DataPropertyName = "CSBYHALWELDHEADCOUNTA1"; - this.Column17.HeaderText = "芯包铝焊焊头次数1"; - this.Column17.MinimumWidth = 8; - this.Column17.Name = "Column17"; - this.Column17.ReadOnly = true; - this.Column17.Width = 150; - // - // Column107 - // - this.Column107.DataPropertyName = "CSBYHALWELDHEADCOUNTA2"; - this.Column107.HeaderText = "芯包铝焊焊头次数2"; - this.Column107.Name = "Column107"; - this.Column107.ReadOnly = true; - this.Column107.Width = 150; - // - // Column110 - // - this.Column110.DataPropertyName = "CSBYHALWELDHEADCOUNTA3"; - this.Column110.HeaderText = "芯包铝焊焊头次数3"; - this.Column110.Name = "Column110"; - this.Column110.ReadOnly = true; - this.Column110.Width = 150; - // - // Column18 - // - this.Column18.DataPropertyName = "CSBYHALWELDBASECOUNTA1"; - this.Column18.HeaderText = "芯包铝焊焊座次数1"; - this.Column18.MinimumWidth = 8; - this.Column18.Name = "Column18"; - this.Column18.ReadOnly = true; - this.Column18.Width = 150; - // - // Column111 - // - this.Column111.DataPropertyName = "CSBYHALWELDBASECOUNTA2"; - this.Column111.HeaderText = "芯包铝焊焊座次数2"; - this.Column111.Name = "Column111"; - this.Column111.ReadOnly = true; - this.Column111.Width = 150; - // - // Column112 - // - this.Column112.DataPropertyName = "CSBYHALWELDBASECOUNTA3"; - this.Column112.HeaderText = "芯包铝焊焊座次数3"; - this.Column112.Name = "Column112"; - this.Column112.ReadOnly = true; - this.Column112.Width = 150; - // - // Column19 - // - this.Column19.DataPropertyName = "CSBYHCUTABCUTTERCOUNTA"; - this.Column19.HeaderText = "电芯铜极耳切刀使用次数"; - this.Column19.MinimumWidth = 8; - this.Column19.Name = "Column19"; - this.Column19.ReadOnly = true; - this.Column19.Width = 200; - // - // Column20 - // - this.Column20.DataPropertyName = "CSBYHALTABCUTTERCOUNTA"; - this.Column20.HeaderText = "电芯铝极耳切刀使用次数"; - this.Column20.MinimumWidth = 8; - this.Column20.Name = "Column20"; - this.Column20.ReadOnly = true; - this.Column20.Width = 200; - // - // Column30 - // - this.Column30.DataPropertyName = "CSBYHCUTABCUTTERNOA"; - this.Column30.HeaderText = "电芯铜极耳切刀编号"; - this.Column30.MinimumWidth = 8; - this.Column30.Name = "Column30"; - this.Column30.ReadOnly = true; - this.Column30.Width = 150; - // - // Column31 - // - this.Column31.DataPropertyName = "CSBYHALTABCUTTERNOA"; - this.Column31.HeaderText = "电芯铝极耳切刀编号"; - this.Column31.MinimumWidth = 8; - this.Column31.Name = "Column31"; - this.Column31.ReadOnly = true; - this.Column31.Width = 150; - // // Column34 // this.Column34.DataPropertyName = "CSBYHINSTATIONTIME"; - this.Column34.HeaderText = "电芯A/B进站时间"; + this.Column34.HeaderText = "电芯进站时间"; this.Column34.MinimumWidth = 8; this.Column34.Name = "Column34"; this.Column34.ReadOnly = true; @@ -1286,736 +865,12 @@ // Column35 // this.Column35.DataPropertyName = "CSBYHOUTSTATIONTIME"; - this.Column35.HeaderText = "电芯A/B出站时间"; + this.Column35.HeaderText = "电芯出站时间"; this.Column35.MinimumWidth = 8; this.Column35.Name = "Column35"; this.Column35.ReadOnly = true; this.Column35.Width = 150; // - // Column39 - // - this.Column39.DataPropertyName = "CSBYHWEIGHTA1"; - this.Column39.HeaderText = "芯包重量1（g）"; - this.Column39.MinimumWidth = 8; - this.Column39.Name = "Column39"; - this.Column39.ReadOnly = true; - this.Column39.Width = 150; - // - // Column37 - // - this.Column37.DataPropertyName = "CSBYHWEIGHTA1MAXSETTING"; - this.Column37.HeaderText = "芯包重量1设定值最大值（g）"; - this.Column37.MinimumWidth = 8; - this.Column37.Name = "Column37"; - this.Column37.ReadOnly = true; - this.Column37.Width = 250; - // - // Column38 - // - this.Column38.DataPropertyName = "CSBYHWEIGHTA1MINSETTING"; - this.Column38.HeaderText = "芯包重量1设定值最小值（g）"; - this.Column38.MinimumWidth = 8; - this.Column38.Name = "Column38"; - this.Column38.ReadOnly = true; - this.Column38.Width = 250; - // - // Column43 - // - this.Column43.DataPropertyName = "CSBYHTHICKNESSTESTPRESSURESIZEA"; - this.Column43.HeaderText = "芯包测厚尺寸1（mm)"; - this.Column43.MinimumWidth = 8; - this.Column43.Name = "Column43"; - this.Column43.ReadOnly = true; - this.Column43.Width = 150; - // - // Column148 - // - this.Column148.DataPropertyName = "ThicknessMeasureDisplacement"; - this.Column148.HeaderText = "芯包测厚尺寸2（mm)"; - this.Column148.Name = "Column148"; - this.Column148.ReadOnly = true; - // - // Column44 - // - this.Column44.DataPropertyName = "CSBYHTHICKNESSTESTPRESSUREMAXSIZEA"; - this.Column44.HeaderText = "芯包测厚最大尺寸（mm)"; - this.Column44.MinimumWidth = 8; - this.Column44.Name = "Column44"; - this.Column44.ReadOnly = true; - this.Column44.Width = 200; - // - // Column45 - // - this.Column45.DataPropertyName = "CSBYHTHICKNESSTESTPRESSUREMINSIZEA"; - this.Column45.HeaderText = "芯包测厚最小尺寸（mm)"; - this.Column45.MinimumWidth = 8; - this.Column45.Name = "Column45"; - this.Column45.ReadOnly = true; - this.Column45.Width = 200; - // - // Column92 - // - this.Column92.DataPropertyName = "CSBYHCUTABLENGTHA"; - this.Column92.HeaderText = "电芯铜极极耳长度(mm)"; - this.Column92.MinimumWidth = 8; - this.Column92.Name = "Column92"; - this.Column92.ReadOnly = true; - this.Column92.Width = 200; - // - // Column93 - // - this.Column93.DataPropertyName = "CSBYHCUTABWIDTHA"; - this.Column93.HeaderText = "电芯铜极极耳宽度(mm)"; - this.Column93.MinimumWidth = 8; - this.Column93.Name = "Column93"; - this.Column93.ReadOnly = true; - this.Column93.Width = 200; - // - // Column94 - // - this.Column94.DataPropertyName = "CSBYHALTABLENGTHA"; - this.Column94.HeaderText = "电芯铝极极耳长度(mm)"; - this.Column94.MinimumWidth = 8; - this.Column94.Name = "Column94"; - this.Column94.ReadOnly = true; - this.Column94.Width = 200; - // - // Column95 - // - this.Column95.DataPropertyName = "CSBYHALTABWIDTHA"; - this.Column95.HeaderText = "电芯铝极极耳宽度(mm)"; - this.Column95.MinimumWidth = 8; - this.Column95.Name = "Column95"; - this.Column95.ReadOnly = true; - this.Column95.Width = 200; - // - // Column98 - // - this.Column98.DataPropertyName = "CSBYHTOPTOSOLDERDISTANCEA"; - this.Column98.HeaderText = "芯包顶部到焊印间距（mm)"; - this.Column98.MinimumWidth = 8; - this.Column98.Name = "Column98"; - this.Column98.ReadOnly = true; - this.Column98.Width = 250; - // - // Column54 - // - this.Column54.DataPropertyName = "CSBYHCUPRESSUREA1"; - this.Column54.HeaderText = "芯包铜焊1压力(Psi)实际值"; - this.Column54.MinimumWidth = 8; - this.Column54.Name = "Column54"; - this.Column54.ReadOnly = true; - this.Column54.Width = 250; - // - // Column55 - // - this.Column55.DataPropertyName = "CSBYHCUPOWERA1"; - this.Column55.HeaderText = "芯包铜焊1功率(W)实际值"; - this.Column55.MinimumWidth = 8; - this.Column55.Name = "Column55"; - this.Column55.ReadOnly = true; - this.Column55.Width = 250; - // - // Column56 - // - this.Column56.DataPropertyName = "CSBYHCUENERGYA1"; - this.Column56.HeaderText = "芯包铜焊1能量(J)实际值"; - this.Column56.MinimumWidth = 8; - this.Column56.Name = "Column56"; - this.Column56.ReadOnly = true; - this.Column56.Width = 200; - // - // Column57 - // - this.Column57.DataPropertyName = "CSBYHCUAMPLITUDEA1"; - this.Column57.HeaderText = "芯包铜焊1振幅(%)实际值"; - this.Column57.MinimumWidth = 8; - this.Column57.Name = "Column57"; - this.Column57.ReadOnly = true; - this.Column57.Width = 200; - // - // Column58 - // - this.Column58.DataPropertyName = "CSBYHCUTIMEA1"; - this.Column58.HeaderText = "芯包铜焊1时间(ms)实际值"; - this.Column58.MinimumWidth = 8; - this.Column58.Name = "Column58"; - this.Column58.ReadOnly = true; - this.Column58.Width = 250; - // - // Column59 - // - this.Column59.DataPropertyName = "CSBYHCUPRESSUREA2"; - this.Column59.HeaderText = "芯包铜焊2压力(Psi)实际值"; - this.Column59.MinimumWidth = 8; - this.Column59.Name = "Column59"; - this.Column59.ReadOnly = true; - this.Column59.Width = 250; - // - // Column60 - // - this.Column60.DataPropertyName = "CSBYHCUPOWERA2"; - this.Column60.HeaderText = "芯包铜焊2功率A(W)实际值"; - this.Column60.MinimumWidth = 8; - this.Column60.Name = "Column60"; - this.Column60.ReadOnly = true; - this.Column60.Width = 250; - // - // Column61 - // - this.Column61.DataPropertyName = "CSBYHCUENERGYA2"; - this.Column61.HeaderText = "芯包铜焊2能量(J)实际值"; - this.Column61.MinimumWidth = 8; - this.Column61.Name = "Column61"; - this.Column61.ReadOnly = true; - this.Column61.Width = 200; - // - // Column62 - // - this.Column62.DataPropertyName = "CSBYHCUAMPLITUDEA2"; - this.Column62.HeaderText = "芯包铜焊2振幅(%)实际值"; - this.Column62.MinimumWidth = 8; - this.Column62.Name = "Column62"; - this.Column62.ReadOnly = true; - this.Column62.Width = 200; - // - // Column63 - // - this.Column63.DataPropertyName = "CSBYHCUTIMEA2"; - this.Column63.HeaderText = "芯包铜焊2时间(ms)实际值"; - this.Column63.MinimumWidth = 8; - this.Column63.Name = "Column63"; - this.Column63.ReadOnly = true; - this.Column63.Width = 250; - // - // Column64 - // - this.Column64.DataPropertyName = "CSBYHCUPRESSUREA3"; - this.Column64.HeaderText = "芯包铜焊焊3压力(Psi)实际值"; - this.Column64.MinimumWidth = 8; - this.Column64.Name = "Column64"; - this.Column64.ReadOnly = true; - this.Column64.Width = 250; - // - // Column65 - // - this.Column65.DataPropertyName = "CSBYHCUPOWERA3"; - this.Column65.HeaderText = "芯包铜焊3功率A(W)实际值"; - this.Column65.MinimumWidth = 8; - this.Column65.Name = "Column65"; - this.Column65.ReadOnly = true; - this.Column65.Width = 250; - // - // Column66 - // - this.Column66.DataPropertyName = "CSBYHCUENERGYA3"; - this.Column66.HeaderText = "芯包铜焊3能量(J)实际值"; - this.Column66.MinimumWidth = 8; - this.Column66.Name = "Column66"; - this.Column66.ReadOnly = true; - this.Column66.Width = 200; - // - // Column67 - // - this.Column67.DataPropertyName = "CSBYHCUAMPLITUDEA3"; - this.Column67.HeaderText = "芯包铜焊3振幅(%)实际值"; - this.Column67.MinimumWidth = 8; - this.Column67.Name = "Column67"; - this.Column67.ReadOnly = true; - this.Column67.Width = 200; - // - // Column68 - // - this.Column68.DataPropertyName = "CSBYHCUTIMEA3"; - this.Column68.HeaderText = "芯包铜焊3时间(ms)实际值"; - this.Column68.MinimumWidth = 8; - this.Column68.Name = "Column68"; - this.Column68.ReadOnly = true; - this.Column68.Width = 250; - // - // Column77 - // - this.Column77.DataPropertyName = "CSBYHALPRESSUREA1"; - this.Column77.HeaderText = "芯包铝焊1压力(Psi)实际值"; - this.Column77.MinimumWidth = 8; - this.Column77.Name = "Column77"; - this.Column77.ReadOnly = true; - this.Column77.Width = 250; - // - // Column78 - // - this.Column78.DataPropertyName = "CSBYHALPOWERA1"; - this.Column78.HeaderText = "芯包铝焊1功率(W)实际值"; - this.Column78.MinimumWidth = 8; - this.Column78.Name = "Column78"; - this.Column78.ReadOnly = true; - this.Column78.Width = 250; - // - // Column79 - // - this.Column79.DataPropertyName = "CSBYHALENERGYA1"; - this.Column79.HeaderText = "芯包铝焊1能量(J)实际值"; - this.Column79.MinimumWidth = 8; - this.Column79.Name = "Column79"; - this.Column79.ReadOnly = true; - this.Column79.Width = 200; - // - // Column80 - // - this.Column80.DataPropertyName = "CSBYHALAMPLITUDEA1"; - this.Column80.HeaderText = "芯包铝焊1振幅(%)实际值"; - this.Column80.MinimumWidth = 8; - this.Column80.Name = "Column80"; - this.Column80.ReadOnly = true; - this.Column80.Width = 200; - // - // Column81 - // - this.Column81.DataPropertyName = "CSBYHALTIMEA1"; - this.Column81.HeaderText = "芯包铝焊1时间(ms)实际值"; - this.Column81.MinimumWidth = 8; - this.Column81.Name = "Column81"; - this.Column81.ReadOnly = true; - this.Column81.Width = 250; - // - // Column82 - // - this.Column82.DataPropertyName = "CSBYHALPRESSUREA2"; - this.Column82.HeaderText = "芯包铝焊2压力(Psi)实际值"; - this.Column82.MinimumWidth = 8; - this.Column82.Name = "Column82"; - this.Column82.ReadOnly = true; - this.Column82.Width = 250; - // - // Column83 - // - this.Column83.DataPropertyName = "CSBYHALPOWERA2"; - this.Column83.HeaderText = "芯包铝焊2功率(W)实际值"; - this.Column83.MinimumWidth = 8; - this.Column83.Name = "Column83"; - this.Column83.ReadOnly = true; - this.Column83.Width = 250; - // - // Column84 - // - this.Column84.DataPropertyName = "CSBYHALENERGYA2"; - this.Column84.HeaderText = "芯包铝焊2能量(J)实际值"; - this.Column84.MinimumWidth = 8; - this.Column84.Name = "Column84"; - this.Column84.ReadOnly = true; - this.Column84.Width = 200; - // - // Column85 - // - this.Column85.DataPropertyName = "CSBYHALAMPLITUDEA2"; - this.Column85.HeaderText = "芯包铝焊2振幅(%)实际值"; - this.Column85.MinimumWidth = 8; - this.Column85.Name = "Column85"; - this.Column85.ReadOnly = true; - this.Column85.Width = 200; - // - // Column86 - // - this.Column86.DataPropertyName = "CSBYHALTIMEA2"; - this.Column86.HeaderText = "芯包铝焊2时间(ms)实际值"; - this.Column86.MinimumWidth = 8; - this.Column86.Name = "Column86"; - this.Column86.ReadOnly = true; - this.Column86.Width = 250; - // - // Column87 - // - this.Column87.DataPropertyName = "CSBYHALPRESSUREA3"; - this.Column87.HeaderText = "芯包铝焊3压力(Psi)实际值"; - this.Column87.MinimumWidth = 8; - this.Column87.Name = "Column87"; - this.Column87.ReadOnly = true; - this.Column87.Width = 250; - // - // Column88 - // - this.Column88.DataPropertyName = "CSBYHALPOWERA3"; - this.Column88.HeaderText = "芯包铝焊3功率(W)实际值"; - this.Column88.MinimumWidth = 8; - this.Column88.Name = "Column88"; - this.Column88.ReadOnly = true; - this.Column88.Width = 250; - // - // Column89 - // - this.Column89.DataPropertyName = "CSBYHALENERGYA3"; - this.Column89.HeaderText = "芯包铝焊3能量(J)实际值"; - this.Column89.MinimumWidth = 8; - this.Column89.Name = "Column89"; - this.Column89.ReadOnly = true; - this.Column89.Width = 200; - // - // Column90 - // - this.Column90.DataPropertyName = "CSBYHALAMPLITUDEA3"; - this.Column90.HeaderText = "芯包铝焊3振幅(%)实际值"; - this.Column90.MinimumWidth = 8; - this.Column90.Name = "Column90"; - this.Column90.ReadOnly = true; - this.Column90.Width = 200; - // - // Column91 - // - this.Column91.DataPropertyName = "CSBYHALTIMEA3"; - this.Column91.HeaderText = "芯包铝焊3时间(ms)实际值"; - this.Column91.MinimumWidth = 8; - this.Column91.Name = "Column91"; - this.Column91.ReadOnly = true; - this.Column91.Width = 250; - // - // Column46 - // - this.Column46.DataPropertyName = "CSBYHCUWELDINGPRESSUREMAXSETTING1"; - this.Column46.HeaderText = "铜焊1压力(Psi)设定值"; - this.Column46.MinimumWidth = 8; - this.Column46.Name = "Column46"; - this.Column46.ReadOnly = true; - this.Column46.Width = 150; - // - // Column114 - // - this.Column114.DataPropertyName = "CSBYHCUWELDINGPRESSUREMAXSETTING2"; - this.Column114.HeaderText = "铜焊2压力(Psi)设定值"; - this.Column114.Name = "Column114"; - this.Column114.ReadOnly = true; - this.Column114.Width = 150; - // - // Column115 - // - this.Column115.DataPropertyName = "CSBYHCUWELDINGPRESSUREMAXSETTING3"; - this.Column115.HeaderText = "铜焊3压力(Psi)设定值"; - this.Column115.Name = "Column115"; - this.Column115.ReadOnly = true; - this.Column115.Width = 150; - // - // Column48 - // - this.Column48.DataPropertyName = "CSBYHCUWELDINGPOWERMAXSETTING1"; - this.Column48.HeaderText = "铜焊1功率(%)设定值最大值"; - this.Column48.MinimumWidth = 8; - this.Column48.Name = "Column48"; - this.Column48.ReadOnly = true; - this.Column48.Width = 250; - // - // Column47 - // - this.Column47.DataPropertyName = "CSBYHCUWELDINGPOWERMAXSETTING2"; - this.Column47.HeaderText = "铜焊2功率(%)设定值最大值"; - this.Column47.Name = "Column47"; - this.Column47.ReadOnly = true; - this.Column47.Width = 250; - // - // Column113 - // - this.Column113.DataPropertyName = "CSBYHCUWELDINGPOWERMAXSETTING3"; - this.Column113.HeaderText = "铜焊3功率(%)设定值最大值"; - this.Column113.Name = "Column113"; - this.Column113.ReadOnly = true; - this.Column113.Width = 250; - // - // Column49 - // - this.Column49.DataPropertyName = "CSBYHCUWELDINGPOWERMINSETTING1"; - this.Column49.HeaderText = "铜焊1功率(%)设定值最小值"; - this.Column49.MinimumWidth = 8; - this.Column49.Name = "Column49"; - this.Column49.ReadOnly = true; - this.Column49.Width = 250; - // - // Column116 - // - this.Column116.DataPropertyName = "CSBYHCUWELDINGPOWERMINSETTING2"; - this.Column116.HeaderText = "铜焊2功率(%)设定值最小值"; - this.Column116.Name = "Column116"; - this.Column116.ReadOnly = true; - this.Column116.Width = 250; - // - // Column117 - // - this.Column117.DataPropertyName = "CSBYHCUWELDINGPOWERMINSETTING3"; - this.Column117.HeaderText = "铜焊3功率(%)设定值最小值"; - this.Column117.Name = "Column117"; - this.Column117.ReadOnly = true; - this.Column117.Width = 250; - // - // Column50 - // - this.Column50.DataPropertyName = "CSBYHCUWELDINGENERGYMAXSETTING1"; - this.Column50.HeaderText = "铜焊1能量(%)设定值最大值"; - this.Column50.MinimumWidth = 8; - this.Column50.Name = "Column50"; - this.Column50.ReadOnly = true; - this.Column50.Width = 250; - // - // Column118 - // - this.Column118.DataPropertyName = "CSBYHCUWELDINGENERGYMAXSETTING2"; - this.Column118.HeaderText = "铜焊2能量(%)设定值最大值"; - this.Column118.Name = "Column118"; - this.Column118.ReadOnly = true; - this.Column118.Width = 250; - // - // Column119 - // - this.Column119.DataPropertyName = "CSBYHCUWELDINGENERGYMAXSETTING3"; - this.Column119.HeaderText = "铜焊3能量(%)设定值最大值"; - this.Column119.Name = "Column119"; - this.Column119.ReadOnly = true; - this.Column119.Width = 250; - // - // Column51 - // - this.Column51.DataPropertyName = "CSBYHCUWELDINGENERGYMINSETTING1"; - this.Column51.HeaderText = "铜焊1能量(%)设定值最小值"; - this.Column51.MinimumWidth = 8; - this.Column51.Name = "Column51"; - this.Column51.ReadOnly = true; - this.Column51.Width = 250; - // - // Column120 - // - this.Column120.DataPropertyName = "CSBYHCUWELDINGENERGYMINSETTING2"; - this.Column120.HeaderText = "铜焊2能量(%)设定值最小值"; - this.Column120.Name = "Column120"; - this.Column120.ReadOnly = true; - this.Column120.Width = 250; - // - // Column121 - // - this.Column121.DataPropertyName = "CSBYHCUWELDINGENERGYMINSETTING3"; - this.Column121.HeaderText = "铜焊3能量(%)设定值最小值"; - this.Column121.Name = "Column121"; - this.Column121.ReadOnly = true; - this.Column121.Width = 250; - // - // Column52 - // - this.Column52.DataPropertyName = "CSBYHCUWELDINGAMPLITUDEMAXSETTING1"; - this.Column52.HeaderText = "铜焊1振幅(%)设定值最大值"; - this.Column52.MinimumWidth = 8; - this.Column52.Name = "Column52"; - this.Column52.ReadOnly = true; - this.Column52.Width = 250; - // - // Column122 - // - this.Column122.DataPropertyName = "CSBYHCUWELDINGAMPLITUDEMAXSETTING2"; - this.Column122.HeaderText = "铜焊2振幅(%)设定值最大值"; - this.Column122.Name = "Column122"; - this.Column122.ReadOnly = true; - this.Column122.Width = 250; - // - // Column123 - // - this.Column123.DataPropertyName = "CSBYHCUWELDINGAMPLITUDEMAXSETTING3"; - this.Column123.HeaderText = "铜焊3振幅(%)设定值最大值"; - this.Column123.Name = "Column123"; - this.Column123.ReadOnly = true; - this.Column123.Width = 250; - // - // Column53 - // - this.Column53.DataPropertyName = "CSBYHCUWELDINGAMPLITUDEMINSETTING1"; - this.Column53.HeaderText = "铜焊1振幅(%)设定值最小值"; - this.Column53.MinimumWidth = 8; - this.Column53.Name = "Column53"; - this.Column53.ReadOnly = true; - this.Column53.Width = 250; - // - // Column124 - // - this.Column124.DataPropertyName = "CSBYHCUWELDINGAMPLITUDEMINSETTING2"; - this.Column124.HeaderText = "铜焊2振幅(%)设定值最小值"; - this.Column124.Name = "Column124"; - this.Column124.ReadOnly = true; - this.Column124.Width = 250; - // - // Column125 - // - this.Column125.DataPropertyName = "CSBYHCUWELDINGAMPLITUDEMINSETTING3"; - this.Column125.HeaderText = "铜焊3振幅(%)设定值最小值"; - this.Column125.Name = "Column125"; - this.Column125.ReadOnly = true; - this.Column125.Width = 250; - // - // Column69 - // - this.Column69.DataPropertyName = "CSBYHALWELDINGPRESSUREMAXSETTING1"; - this.Column69.HeaderText = "铝焊接压力(Psi)设定值1"; - this.Column69.MinimumWidth = 8; - this.Column69.Name = "Column69"; - this.Column69.ReadOnly = true; - this.Column69.Width = 150; - // - // Column140 - // - this.Column140.DataPropertyName = "CSBYHALWELDINGPRESSUREMAXSETTING2"; - this.Column140.HeaderText = "铝焊接压力(Psi)设定值2"; - this.Column140.Name = "Column140"; - this.Column140.ReadOnly = true; - // - // Column141 - // - this.Column141.DataPropertyName = "CSBYHALWELDINGPRESSUREMAXSETTING3"; - this.Column141.HeaderText = "铝焊接压力(Psi)设定值3"; - this.Column141.Name = "Column141"; - this.Column141.ReadOnly = true; - // - // Column71 - // - this.Column71.DataPropertyName = "CSBYHALWELDINGPOWERMAXSETTING1"; - this.Column71.HeaderText = "铝焊1功率(%)设定值最大值"; - this.Column71.MinimumWidth = 8; - this.Column71.Name = "Column71"; - this.Column71.ReadOnly = true; - this.Column71.Width = 250; - // - // Column70 - // - this.Column70.DataPropertyName = "CSBYHALWELDINGPOWERMAXSETTING2"; - this.Column70.HeaderText = "铝焊2功率(%)设定值最大值"; - this.Column70.Name = "Column70"; - this.Column70.ReadOnly = true; - this.Column70.Width = 250; - // - // Column126 - // - this.Column126.DataPropertyName = "CSBYHALWELDINGPOWERMAXSETTING3"; - this.Column126.HeaderText = "铝焊3功率(%)设定值最大值"; - this.Column126.Name = "Column126"; - this.Column126.ReadOnly = true; - this.Column126.Width = 250; - // - // Column72 - // - this.Column72.DataPropertyName = "CSBYHALWELDINGPOWERMINSETTING1"; - this.Column72.HeaderText = "铝焊1功率(%)设定值最小值"; - this.Column72.MinimumWidth = 8; - this.Column72.Name = "Column72"; - this.Column72.ReadOnly = true; - this.Column72.Width = 250; - // - // Column127 - // - this.Column127.DataPropertyName = "CSBYHALWELDINGPOWERMINSETTING2"; - this.Column127.HeaderText = "铝焊2功率(%)设定值最小值"; - this.Column127.Name = "Column127"; - this.Column127.ReadOnly = true; - this.Column127.Width = 250; - // - // Column128 - // - this.Column128.DataPropertyName = "CSBYHALWELDINGPOWERMINSETTING3"; - this.Column128.HeaderText = "铝焊3功率(%)设定值最小值"; - this.Column128.Name = "Column128"; - this.Column128.ReadOnly = true; - this.Column128.Width = 250; - // - // Column73 - // - this.Column73.DataPropertyName = "CSBYHALWELDINGENERGYMAXSETTING1"; - this.Column73.HeaderText = "铝焊1能量(%)设定值最大值"; - this.Column73.MinimumWidth = 8; - this.Column73.Name = "Column73"; - this.Column73.ReadOnly = true; - this.Column73.Width = 250; - // - // Column129 - // - this.Column129.DataPropertyName = "CSBYHALWELDINGENERGYMAXSETTING2"; - this.Column129.HeaderText = "铝焊2能量(%)设定值最大值"; - this.Column129.Name = "Column129"; - this.Column129.ReadOnly = true; - this.Column129.Width = 250; - // - // Column130 - // - this.Column130.DataPropertyName = "CSBYHALWELDINGENERGYMAXSETTING3"; - this.Column130.HeaderText = "铝焊3能量(%)设定值最大值"; - this.Column130.Name = "Column130"; - this.Column130.ReadOnly = true; - this.Column130.Width = 250; - // - // Column74 - // - this.Column74.DataPropertyName = "CSBYHALWELDINGENERGYMINSETTING1"; - this.Column74.HeaderText = "铝焊1能量(%)设定值最小值"; - this.Column74.MinimumWidth = 8; - this.Column74.Name = "Column74"; - this.Column74.ReadOnly = true; - this.Column74.Width = 250; - // - // Column131 - // - this.Column131.DataPropertyName = "CSBYHALWELDINGENERGYMINSETTING2"; - this.Column131.HeaderText = "铝焊2能量(%)设定值最小值"; - this.Column131.Name = "Column131"; - this.Column131.ReadOnly = true; - this.Column131.Width = 250; - // - // Column132 - // - this.Column132.DataPropertyName = "CSBYHALWELDINGENERGYMINSETTING3"; - this.Column132.HeaderText = "铝焊3能量(%)设定值最小值"; - this.Column132.Name = "Column132"; - this.Column132.ReadOnly = true; - this.Column132.Width = 250; - // - // Column75 - // - this.Column75.DataPropertyName = "CSBYHALWELDINGAMPLITUDEMAXSETTING1"; - this.Column75.HeaderText = "铝焊1振幅(%)设定值最大值"; - this.Column75.MinimumWidth = 8; - this.Column75.Name = "Column75"; - this.Column75.ReadOnly = true; - this.Column75.Width = 250; - // - // Column133 - // - this.Column133.DataPropertyName = "CSBYHALWELDINGAMPLITUDEMAXSETTING2"; - this.Column133.HeaderText = "铝焊2振幅(%)设定值最大值"; - this.Column133.Name = "Column133"; - this.Column133.ReadOnly = true; - this.Column133.Width = 250; - // - // Column134 - // - this.Column134.DataPropertyName = "CSBYHALWELDINGAMPLITUDEMAXSETTING3"; - this.Column134.HeaderText = "铝焊3振幅(%)设定值最大值"; - this.Column134.Name = "Column134"; - this.Column134.ReadOnly = true; - this.Column134.Width = 250; - // - // Column76 - // - this.Column76.DataPropertyName = "CSBYHALWELDINGAMPLITUDEMINSETTING1"; - this.Column76.HeaderText = "铝焊1振幅(%)设定值最小值"; - this.Column76.MinimumWidth = 8; - this.Column76.Name = "Column76"; - this.Column76.ReadOnly = true; - this.Column76.Width = 250; - // - // Column135 - // - this.Column135.DataPropertyName = "CSBYHALWELDINGAMPLITUDEMINSETTING2"; - this.Column135.HeaderText = "铝焊2振幅(%)设定值最小值"; - this.Column135.Name = "Column135"; - this.Column135.ReadOnly = true; - this.Column135.Width = 250; - // - // Column136 - // - this.Column136.DataPropertyName = "CSBYHALWELDINGAMPLITUDEMINSETTING3"; - this.Column136.HeaderText = "铝焊3振幅(%)设定值最小值"; - this.Column136.Name = "Column136"; - this.Column136.ReadOnly = true; - this.Column136.Width = 250; - // // Column102 // this.Column102.DataPropertyName = "Flag"; @@ -2040,7 +895,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(1920, 886); + this.ClientSize = new System.Drawing.Size(1370, 749); this.Controls.Add(this.tableLayoutPanel1); this.DoubleBuffered = true; this.Font = new System.Drawing.Font("微软雅黑", 10.5F); @@ -2094,146 +949,41 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn Column32; private System.Windows.Forms.DataGridViewTextBoxColumn Column33; - private System.Windows.Forms.DataGridViewTextBoxColumn Column137; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column138; - private System.Windows.Forms.DataGridViewTextBoxColumn Column7; - private System.Windows.Forms.DataGridViewTextBoxColumn Column10; - private System.Windows.Forms.DataGridViewTextBoxColumn Column24; - private System.Windows.Forms.DataGridViewTextBoxColumn Column11; private System.Windows.Forms.DataGridViewTextBoxColumn Column25; private System.Windows.Forms.DataGridViewTextBoxColumn Column96; private System.Windows.Forms.DataGridViewTextBoxColumn Column97; + private System.Windows.Forms.DataGridViewTextBoxColumn Column98; private System.Windows.Forms.DataGridViewTextBoxColumn Column99; - private System.Windows.Forms.DataGridViewTextBoxColumn Column145; - private System.Windows.Forms.DataGridViewTextBoxColumn Column146; - private System.Windows.Forms.DataGridViewTextBoxColumn Column147; - private System.Windows.Forms.DataGridViewTextBoxColumn Column26; - private System.Windows.Forms.DataGridViewTextBoxColumn Column142; - private System.Windows.Forms.DataGridViewTextBoxColumn Column143; - private System.Windows.Forms.DataGridViewTextBoxColumn Column144; - private System.Windows.Forms.DataGridViewTextBoxColumn Column27; - private System.Windows.Forms.DataGridViewTextBoxColumn Column28; - private System.Windows.Forms.DataGridViewTextBoxColumn Column21; - private System.Windows.Forms.DataGridViewTextBoxColumn Column23; private System.Windows.Forms.DataGridViewTextBoxColumn Column100; private System.Windows.Forms.DataGridViewTextBoxColumn Column101; - private System.Windows.Forms.DataGridViewTextBoxColumn Column42; - private System.Windows.Forms.DataGridViewTextBoxColumn Column40; - private System.Windows.Forms.DataGridViewTextBoxColumn Column41; - private System.Windows.Forms.DataGridViewTextBoxColumn Column6; - private System.Windows.Forms.DataGridViewTextBoxColumn Column9; - private System.Windows.Forms.DataGridViewTextBoxColumn Column12; - private System.Windows.Forms.DataGridViewTextBoxColumn Column13; - private System.Windows.Forms.DataGridViewTextBoxColumn Column8; - private System.Windows.Forms.DataGridViewTextBoxColumn Column36; - private System.Windows.Forms.DataGridViewTextBoxColumn Column14; - private System.Windows.Forms.DataGridViewTextBoxColumn Column105; - private System.Windows.Forms.DataGridViewTextBoxColumn Column106; - private System.Windows.Forms.DataGridViewTextBoxColumn Column15; - private System.Windows.Forms.DataGridViewTextBoxColumn Column108; - private System.Windows.Forms.DataGridViewTextBoxColumn Column109; - private System.Windows.Forms.DataGridViewTextBoxColumn Column16; private System.Windows.Forms.DataGridViewTextBoxColumn Column103; private System.Windows.Forms.DataGridViewTextBoxColumn Column104; - private System.Windows.Forms.DataGridViewTextBoxColumn Column17; + private System.Windows.Forms.DataGridViewTextBoxColumn Column105; + private System.Windows.Forms.DataGridViewTextBoxColumn Column106; private System.Windows.Forms.DataGridViewTextBoxColumn Column107; + private System.Windows.Forms.DataGridViewTextBoxColumn Column108; + private System.Windows.Forms.DataGridViewTextBoxColumn Column109; private System.Windows.Forms.DataGridViewTextBoxColumn Column110; - private System.Windows.Forms.DataGridViewTextBoxColumn Column18; private System.Windows.Forms.DataGridViewTextBoxColumn Column111; private System.Windows.Forms.DataGridViewTextBoxColumn Column112; - private System.Windows.Forms.DataGridViewTextBoxColumn Column19; - private System.Windows.Forms.DataGridViewTextBoxColumn Column20; - private System.Windows.Forms.DataGridViewTextBoxColumn Column30; - private System.Windows.Forms.DataGridViewTextBoxColumn Column31; - private System.Windows.Forms.DataGridViewTextBoxColumn Column34; - private System.Windows.Forms.DataGridViewTextBoxColumn Column35; - private System.Windows.Forms.DataGridViewTextBoxColumn Column39; - private System.Windows.Forms.DataGridViewTextBoxColumn Column37; - private System.Windows.Forms.DataGridViewTextBoxColumn Column38; - private System.Windows.Forms.DataGridViewTextBoxColumn Column43; - private System.Windows.Forms.DataGridViewTextBoxColumn Column148; - private System.Windows.Forms.DataGridViewTextBoxColumn Column44; - private System.Windows.Forms.DataGridViewTextBoxColumn Column45; - private System.Windows.Forms.DataGridViewTextBoxColumn Column92; - private System.Windows.Forms.DataGridViewTextBoxColumn Column93; - private System.Windows.Forms.DataGridViewTextBoxColumn Column94; - private System.Windows.Forms.DataGridViewTextBoxColumn Column95; - private System.Windows.Forms.DataGridViewTextBoxColumn Column98; - private System.Windows.Forms.DataGridViewTextBoxColumn Column54; - private System.Windows.Forms.DataGridViewTextBoxColumn Column55; - private System.Windows.Forms.DataGridViewTextBoxColumn Column56; - private System.Windows.Forms.DataGridViewTextBoxColumn Column57; - private System.Windows.Forms.DataGridViewTextBoxColumn Column58; - private System.Windows.Forms.DataGridViewTextBoxColumn Column59; - private System.Windows.Forms.DataGridViewTextBoxColumn Column60; - private System.Windows.Forms.DataGridViewTextBoxColumn Column61; - private System.Windows.Forms.DataGridViewTextBoxColumn Column62; - private System.Windows.Forms.DataGridViewTextBoxColumn Column63; - private System.Windows.Forms.DataGridViewTextBoxColumn Column64; - private System.Windows.Forms.DataGridViewTextBoxColumn Column65; - private System.Windows.Forms.DataGridViewTextBoxColumn Column66; - private System.Windows.Forms.DataGridViewTextBoxColumn Column67; - private System.Windows.Forms.DataGridViewTextBoxColumn Column68; - private System.Windows.Forms.DataGridViewTextBoxColumn Column77; - private System.Windows.Forms.DataGridViewTextBoxColumn Column78; - private System.Windows.Forms.DataGridViewTextBoxColumn Column79; - private System.Windows.Forms.DataGridViewTextBoxColumn Column80; - private System.Windows.Forms.DataGridViewTextBoxColumn Column81; - private System.Windows.Forms.DataGridViewTextBoxColumn Column82; - private System.Windows.Forms.DataGridViewTextBoxColumn Column83; - private System.Windows.Forms.DataGridViewTextBoxColumn Column84; - private System.Windows.Forms.DataGridViewTextBoxColumn Column85; - private System.Windows.Forms.DataGridViewTextBoxColumn Column86; - private System.Windows.Forms.DataGridViewTextBoxColumn Column87; - private System.Windows.Forms.DataGridViewTextBoxColumn Column88; - private System.Windows.Forms.DataGridViewTextBoxColumn Column89; - private System.Windows.Forms.DataGridViewTextBoxColumn Column90; - private System.Windows.Forms.DataGridViewTextBoxColumn Column91; - private System.Windows.Forms.DataGridViewTextBoxColumn Column46; + private System.Windows.Forms.DataGridViewTextBoxColumn Column113; private System.Windows.Forms.DataGridViewTextBoxColumn Column114; private System.Windows.Forms.DataGridViewTextBoxColumn Column115; - private System.Windows.Forms.DataGridViewTextBoxColumn Column48; - private System.Windows.Forms.DataGridViewTextBoxColumn Column47; - private System.Windows.Forms.DataGridViewTextBoxColumn Column113; - private System.Windows.Forms.DataGridViewTextBoxColumn Column49; private System.Windows.Forms.DataGridViewTextBoxColumn Column116; private System.Windows.Forms.DataGridViewTextBoxColumn Column117; - private System.Windows.Forms.DataGridViewTextBoxColumn Column50; private System.Windows.Forms.DataGridViewTextBoxColumn Column118; private System.Windows.Forms.DataGridViewTextBoxColumn Column119; - private System.Windows.Forms.DataGridViewTextBoxColumn Column51; private System.Windows.Forms.DataGridViewTextBoxColumn Column120; private System.Windows.Forms.DataGridViewTextBoxColumn Column121; - private System.Windows.Forms.DataGridViewTextBoxColumn Column52; private System.Windows.Forms.DataGridViewTextBoxColumn Column122; private System.Windows.Forms.DataGridViewTextBoxColumn Column123; - private System.Windows.Forms.DataGridViewTextBoxColumn Column53; - private System.Windows.Forms.DataGridViewTextBoxColumn Column124; - private System.Windows.Forms.DataGridViewTextBoxColumn Column125; - private System.Windows.Forms.DataGridViewTextBoxColumn Column69; - private System.Windows.Forms.DataGridViewTextBoxColumn Column140; - private System.Windows.Forms.DataGridViewTextBoxColumn Column141; - private System.Windows.Forms.DataGridViewTextBoxColumn Column71; - private System.Windows.Forms.DataGridViewTextBoxColumn Column70; - private System.Windows.Forms.DataGridViewTextBoxColumn Column126; - private System.Windows.Forms.DataGridViewTextBoxColumn Column72; - private System.Windows.Forms.DataGridViewTextBoxColumn Column127; - private System.Windows.Forms.DataGridViewTextBoxColumn Column128; - private System.Windows.Forms.DataGridViewTextBoxColumn Column73; - private System.Windows.Forms.DataGridViewTextBoxColumn Column129; - private System.Windows.Forms.DataGridViewTextBoxColumn Column130; - private System.Windows.Forms.DataGridViewTextBoxColumn Column74; - private System.Windows.Forms.DataGridViewTextBoxColumn Column131; - private System.Windows.Forms.DataGridViewTextBoxColumn Column132; - private System.Windows.Forms.DataGridViewTextBoxColumn Column75; - private System.Windows.Forms.DataGridViewTextBoxColumn Column133; - private System.Windows.Forms.DataGridViewTextBoxColumn Column134; - private System.Windows.Forms.DataGridViewTextBoxColumn Column76; - private System.Windows.Forms.DataGridViewTextBoxColumn Column135; - private System.Windows.Forms.DataGridViewTextBoxColumn Column136; + private System.Windows.Forms.DataGridViewTextBoxColumn Column147; + private System.Windows.Forms.DataGridViewTextBoxColumn Column34; + private System.Windows.Forms.DataGridViewTextBoxColumn Column35; private System.Windows.Forms.DataGridViewTextBoxColumn Column102; private System.Windows.Forms.DataGridViewTextBoxColumn Column22; } diff --git a/LargeSquareOne/FrmDataMonitor.resx b/LargeSquareOne/FrmDataMonitor.resx index db3a5e5..f75e132 100644 --- a/LargeSquareOne/FrmDataMonitor.resx +++ b/LargeSquareOne/FrmDataMonitor.resx @@ -150,9 +150,6 @@ True - - True - True @@ -165,18 +162,6 @@ True - - True - - - True - - - True - - - True - True @@ -186,390 +171,15 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -584,7 +194,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE - DQAAAk1TRnQBSQFMAgEBAwEAATgBAgE4AQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + DQAAAk1TRnQBSQFMAgEBAwEAAUABAgFAAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1 ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2 diff --git a/LargeSquareOne/FrmMain.cs b/LargeSquareOne/FrmMain.cs index 64e41a2..26b5dff 100644 --- a/LargeSquareOne/FrmMain.cs +++ b/LargeSquareOne/FrmMain.cs @@ -659,9 +659,21 @@ namespace LargeSquareOne } break; case FormNames.数据分析: - new FrmMsgBoxOutWithAck(2, "功能待开发中…………", "品质测量").ShowDialog(); - return; - + // new FrmMsgBoxOutWithAck(2, "功能待开发中…………", "品质测量").ShowDialog(); + //return; + if (CommonMethods.IsLoginOk) + { + if (!CommonMethods.currentAdmin.SystemLog) + { + new FrmMsgBoxOutWithAck(2, "当前登录用户权限不足！", "权限不足").ShowDialog(); + return; + } + } + else + { + new FrmMsgBoxOutWithAck(2, "请先刷卡登录！", "登录系统").ShowDialog(); + return; + } //if (!CommonMethods.currentAdmin.CpkData) //{ // new FrmMsgBoxOutWithAck(2, "当前登录用户权限不足！", "权限不足").ShowDialog();