diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs
index 107438d..3ea2018 100644
--- a/JinYuan.ControlCenter/ControlCenter_Plc.cs
+++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs
@@ -257,9 +257,13 @@ namespace JinYuan.ControlCenters
}
return Result;
}
- private int JudgmentCCDResult(int A, int[,] B, int C)
+
+ ///
+ /// 判断总结果
+ ///
+ private (short, string, string) JudgmentWGJResult(int A, int[,] B, int C)
{
- var ngType = new string[16] {"正面(2D/3D)结果",
+ var ngType = new string[20] {"正面(2D/3D)结果",
"反面(2D/3D)结果",
"左侧面(2D/3D)结果",
"右侧面(2D/3D)结果",
@@ -273,14 +277,19 @@ namespace JinYuan.ControlCenters
"中ME2结果",
"中ME3结果",
"中ME4结果",
- "极柱(POS/NEG)结果",
- "防爆阀(PRO)结果"
+ "右极柱(POS/NEG)结果",
+ "左极柱(POS/NEG)结果",
+ "防爆阀(PRO)结果",
+ "二维码结果",
+ "厚度结果",
+ "平面度结果"
};
- int Result = 1;
- OK_NG = "OK";
- for (int i = 0; i < 16; i++)
+ short Result = 1;
+ var OK_NG = "OK";
+ var NG_Type = "";
+ for (int i = 0; i < 20; i++)
{
- if (B[C,i] !=1)
+ if (B[C, i] != 1)
{
//1OK，2扫码NG，3MES反馈NG，4其他NG
Result = 4;
@@ -295,27 +304,44 @@ namespace JinYuan.ControlCenters
OK_NG = "NG";
}
- return Result;
+ return (Result, OK_NG, NG_Type);
}
- private int JudgmentThickNessResult(int[,] B, int C,int ccdResult =1)
+
+ //下料不良代码 外观检
+ public (List, List) NGWGJcode(string[,] lstResult, int index)
{
- var ngType = new string[3] {"厚度1结果",
- "厚度2结果",
- "厚度3结果"
- };
- int Result = ccdResult;
- for (int i = 0; i < 3; i++)
- {
- if (B[C, i] != 1)
- {
- //1OK，2扫码NG，3MES反馈NG，4其他NG
- Result = 4;
- OK_NG = "NG";
- NG_Type += $"{ngType[i]}(NG),";
- }
- }
- return Result;
+ List NGcodelist = new List();
+ List NGmessagelist = new List();
+ for (int i = 0; i < 20; i++)
+ {
+ var tempStr = lstResult[index, i];
+ if (tempStr.IndexOf(",") >= 0)
+ {
+ var arr = tempStr.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ foreach (var str in arr)
+ {
+ var strCode = str.PadLeft(3, '0');
+ if (NGcodelist.Contains($"PFVA{strCode}"))
+ {
+ continue;
+ }
+ NGcodelist.Add($"PFVA{strCode}");
+ var codeEntity = CommonMethods.listNgCodeEntity.FirstOrDefault(x => strCode == x.ngCode);
+ if (codeEntity != null)
+ {
+ NGmessagelist.Add(codeEntity.ngMessage);
+ }
+ else
+ {
+ NGmessagelist.Add("未匹配不良编号");
+ }
+ }
+
+ }
+ }
+
+ return (NGcodelist, NGmessagelist);
}
#region 上料工位(数据处理)
///
@@ -1805,26 +1831,37 @@ namespace JinYuan.ControlCenters
//芯包信息1 D3300~D3326
//芯包信息2 D3330~D3356
//芯包信息3 D3360~D3386
- for (int j = 0; j < 16; j++)
+ for (int j = 0; j < 20; j++)
{
m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
}
+ //3400
+ m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB).ToString();
+ m.ThicknessResult1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
+ //3500
+ m.flatness_setpoint = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 30 * 2, DataFormat.CDAB).ToString();
+ m.flatness_actual = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
//厚度3400
- for (int j = 0; j < 3; j++)
- {
- m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB);
- }
- //厚度plc 3500
- for (int j = 0; j < 3; j++)
- {
- m.Thickness_PLCData[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 500 + i * 30 * 2 + j * 2, DataFormat.CDAB);
- }
+ //for (int j = 0; j < 3; j++)
+ //{
+ // m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB);
+ //}
+ ////厚度plc 3500
+ //for (int j = 0; j < 3; j++)
+ //{
+ // m.Thickness_PLCData[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 500 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+ //}
//不良ng编号4300
- for (int j = 0; j < 16; j++)
+ //for (int j = 0; j < 20; j++)
+ //{
+ // m.CCD_NgNo[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 2200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+ //}
+ for (int j = 0; j < 20; j++)
{
- m.CCD_NgNo[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 2200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+ m.CCD_NgNo[i, j] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, (7800 * 2 + j * 40 * 2), 20 * 2, System.Text.Encoding.ASCII).
+ Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
+ //ShortLib.GetShortFromByteArray(bArrays.Content, 6800 *2 + j * 2, DataFormat.CDAB);
}
-
//芯包扫码时间
//m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1898,22 +1935,27 @@ namespace JinYuan.ControlCenters
m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图");
m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图");
m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图");
+ m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 0 ? "NG" : "缺图");
+ m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 0 ? "NG" : "缺图");
+ m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图");
+ m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图");
#endregion
- #region //厚度判定结果
- m.ThicknessResult1 = m.Thickness_PLCData[i, 0] == 1 ? "OK" : (m.Thickness_PLCData[i, 0] == 0 ? "NG" : "缺测");
- m.ThicknessResult2 = m.Thickness_PLCData[i, 1] == 1 ? "OK" : (m.Thickness_PLCData[i, 1] == 0 ? "NG" : "缺测");
- m.ThicknessResult3 = m.Thickness_PLCData[i, 2] == 1 ? "OK" : (m.Thickness_PLCData[i, 2] == 0 ? "NG" : "缺测");
- #endregion
+
m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
m.CSBYHPROCESSNAME = "外观检测";
m.CSBYHSCHEDULE = CommonMethods.strClass;
- m.CSBYHINSTATIONTIME = m.ScanTime[0];
+ m.CSBYHINSTATIONTIME = m.ScanTime[0];
m.CSBYHOUTSTATIONTIME = m.ScanTime[1];
-
- m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]);
- m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]);
- m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]);
+ m.MaterialCode = CommonMethods.mesConfig.MaterialCode;
+ //m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]);
+ //m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]);
+ //m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]);
m.ChannelNo = i + 1;
+ { //此处预留
+ m.out_battery_grade = "";//出入站条码等级
+ m.in_battery_grade = "";
+ m.appearance_standard = "";
+ }
//条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置，
//芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折
if (Code_NG == 1)
@@ -1931,14 +1973,15 @@ namespace JinYuan.ControlCenters
}
else
MyRes[i] = 2;//扫码NG
- MyRes[i] = JudgmentCCDResult(Code_NG, m.CCD_Data,i);
- MyRes[i] = JudgmentThickNessResult(m.Thickness_PLCData, i, MyRes[i]);
+ var judementResult = JudgmentWGJResult(1, list[i].CCD_Data, i);
+ MyRes[i] = judementResult.Item1;
+ OK_NG = judementResult.Item2;
+ NG_Type = judementResult.Item3;
m.Result = MyRes[i];
m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG;
m.Remark += NG_Type;
- m.MaterialCode = CommonMethods.mesConfig.MaterialCode;
NG_Type = "";//清除上一次不良字符串
OK_NG = ""; //清除上一次结果
@@ -2034,7 +2077,28 @@ namespace JinYuan.ControlCenters
}
//发送产品结果参数给MES
bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage);
+ list[i].PlcResult = MyRes[i];
+ #region 排出 3 外观NG电芯，4 厚度NG电芯
+ for (int i = 0; i < list.Count; i++)
+ {
+ if (list[i].PlcResult != 1)
+ {
+ //厚度不良分档 5 测厚不良 6 外观不良
+ if (list[i].CCD19 != 1)
+ {
+ m.Result = MyRes[i] = 5;
+ list[i].Remark += $",测厚度NG";
+ }
+ else
+ {
+ //外观不良分档
+ m.Result = MyRes[i] = 6;
+ list[i].Remark += $",外观检NG不良";
+ }
+ }
+ }
+ #endregion
if (m.Flag == 1)
m.UpState = "已上传";
diff --git a/JinYuan.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs
index fea9647..9361c09 100644
--- a/JinYuan.MES/MesDataProcess.cs
+++ b/JinYuan.MES/MesDataProcess.cs
@@ -1123,7 +1123,7 @@ namespace JinYuan.MES
qualityStatus = m.CSBYHOUTSTATIONJUDGMENTRESULT,
};
- payload1.tagDataVOList = GetTagDataVOList(m);
+ payload1.tagDataVOList = GetTagDataVOList(m, equipNum,payload1);
#region old
// payload1.tagDataVOList = new List
//{
@@ -1211,7 +1211,7 @@ namespace JinYuan.MES
#endregion
return res;
}
- private List GetTagDataVOList(BGearEntity m)
+ private List GetTagDataVOList(BGearEntity m, string equipNum, Payload1 payload1)
{
//var AGearList =
string insertTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1241,47 +1241,78 @@ namespace JinYuan.MES
}
}
#region 本地字段没有，手动赋值
- // 进站时间
- if (string.IsNullOrEmpty(insertTime))
- {
+
+ {//非Y项//工序名称
+ // 产线名称
+ // 设备编号
+ //操作员
+ //班次
+ //生产型号
+
+ // 工厂名称
datavolist.Add(new TagDataVOListItem()
{
- tagCode = "FV_F060_RES_002",
- tagValue = DateTime.Now.ToString(),//m
+ tagCode = "factory_name",
+ tagValue = payload1.siteCode,
tagTime = DateTime.Now.ToString(),
- tagCalculateResult = "Y",
- tagRemark = "采集时间"
+ tagCalculateResult = "",
+ tagRemark = "工厂名称"
});
- }
- else
- {
+ // 工序名称
datavolist.Add(new TagDataVOListItem()
{
- tagCode = "FV_F060_RES_002",
- tagValue = insertTime,//m
+ tagCode = "process_name",
+ tagValue = m.CSBYHPROCESSNAME,
tagTime = DateTime.Now.ToString(),
- tagCalculateResult = "Y",
- tagRemark = "采集时间"
+ tagCalculateResult = "",
+ tagRemark = "工序名称"
+ });
+ // 产线名称
+ datavolist.Add(new TagDataVOListItem()
+ {
+ tagCode = "production_line_name",
+ tagValue = payload1.lineCode,
+ tagTime = DateTime.Now.ToString(),
+ tagCalculateResult = "",
+ tagRemark = "工序名称"
+ });
+ // 设备编码
+ datavolist.Add(new TagDataVOListItem()
+ {
+ tagCode = "equipment_id",
+ tagValue = equipNum,
+ tagTime = DateTime.Now.ToString(),
+ tagCalculateResult = "",
+ tagRemark = "设备编码"
+ });
+ // 操作员
+ datavolist.Add(new TagDataVOListItem()
+ {
+ tagCode = "operator",
+ tagValue = payload1.userName,
+ tagTime = DateTime.Now.ToString(),
+ tagCalculateResult = "",
+ tagRemark = "操作员"
+ });
+ // 班次
+ datavolist.Add(new TagDataVOListItem()
+ {
+ tagCode = "work_shift",
+ tagValue = m.CSBYHSCHEDULE,
+ tagTime = DateTime.Now.ToString(),
+ tagCalculateResult = "",
+ tagRemark = "班次"
+ });
+ // 生产型号
+ datavolist.Add(new TagDataVOListItem()
+ {
+ tagCode = "product_model",
+ tagValue = payload1.materialCode,
+ tagTime = DateTime.Now.ToString(),
+ tagCalculateResult = "",
+ tagRemark = "生产型号"
});
}
- // 设备名称
- datavolist.Add(new TagDataVOListItem()
- {
- tagCode = "FV_F060_RES_004",
- tagValue = "",//m
- tagTime = DateTime.Now.ToString(),
- tagCalculateResult = "Y",
- tagRemark = "设备名称"
- });
- // 操作员
- datavolist.Add(new TagDataVOListItem()
- {
- tagCode = "FV_F060_RES_005",
- tagValue = "",//m
- tagTime = DateTime.Now.ToString(),
- tagCalculateResult = "Y",
- tagRemark = "操作员"
- });
#endregion
diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs
index 260730a..53cbd06 100644
--- a/JinYuan.Models/BGearEntity.cs
+++ b/JinYuan.Models/BGearEntity.cs
@@ -20,10 +20,10 @@ namespace JinYuan.Models
public short[,] list_pan = new short[3, 1];//物流线托盘码
//
- public int[,] CCD_Data = new int[3, 16];//芯包CCD信息1,2,3
- public int[,] CCD_NgNo = new int[3, 16];//芯包不良编码信息1,2,3
- public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3
- public int[,] Thickness_PLCData = new int[3, 3];//电芯3_厚度数据OKNG1,2,3 与ccd一样 1 OK，0 NG，2 缺图
+ public int[,] CCD_Data = new int[3, 20];//芯包CCD信息1,2,3
+ public string[,] CCD_NgNo = new string[3, 20];//芯包不良编码信息1,2,3
+ // public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3
+ // public int[,] Thickness_PLCData = new int[3, 3];//电芯3_厚度数据OKNG1,2,3 与ccd一样 1 OK，0 NG，2 缺图
///
/// 通道
///
@@ -79,21 +79,29 @@ namespace JinYuan.Models
///
/// 电芯1_厚度数据1
///
- public float Thickness1 { get; set; }
- public float Thickness2 { get; set; }
- public float Thickness3 { get; set; }
+ public string Thickness1 { get; set; }
+ // public float Thickness2 { get; set; }
+ // public float Thickness3 { get; set; }
///
/// 电芯1_厚度 PLC判定 OKNG 1 OK，0 NG
///
- public int ThicknessPLCResult1 { get; set; }
- public int ThicknessPLCResult2 { get; set; }
- public int ThicknessPLCResult3 { get; set; }
+ // public int ThicknessPLCResult1 { get; set; }
+ // public int ThicknessPLCResult2 { get; set; }
+ // public int ThicknessPLCResult3 { get; set; }
///
/// 电芯1_厚度OKNG 显示OK NG
///
public string ThicknessResult1 { get; set; }
- public string ThicknessResult2 { get; set; }
- public string ThicknessResult3 { get; set; }
+ // public string ThicknessResult2 { get; set; }
+ // public string ThicknessResult3 { get; set; }
+ ///
+ /// 平面度设定值
+ ///
+ public string flatness_setpoint { get; set; }
+ ///
+ /// 平面度实际值
+ ///
+ public string flatness_actual { get; set; }
///
/// 电芯_CCD1结果 1 OK，0 NG，2 缺图
///
@@ -166,617 +174,31 @@ 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; }
+ public int PlcResult { 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; }
+ ///
+ /// 进出站电池等级
+ ///
+ public string in_battery_grade { get; set; }
+ ///
+ /// 进出站电池等级
+ ///
+ public string out_battery_grade { get; set; }
+ ///
+ /// MES返回电池档位
+ ///
+ public string Mes_battery_Grade { get; set; }
+ public string appearance_standard { get; set; }
+ //撕膜机
+ public string SM_cleaning_defocus_dist { get; set; }
+ public string SM_cleaning_peak_power { get; set; }
+ public string SM_cleaning_frequency { get; set; }
+ public string SM_cleaning_speed { get; set; }
+ public string SM_cutting_defocus_dist { get; set; }
+ public string SM_cutting_peak_power { get; set; }
+ public string SM_cutting_frequency { get; set; }
+ public string SM_cutting_speed { get; set; }
+ public string SM_dust_removal_wind_speed { get; set; }
}
}