diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs
index 00234db..a375ff6 100644
--- a/JinYuan.ControlCenter/ControlCenter_Plc.cs
+++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs
@@ -1989,7 +1989,7 @@ namespace JinYuan.ControlCenters
////}
#endregion
//发送产品结果参数给MES
- 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)
@@ -2027,111 +2027,121 @@ namespace JinYuan.ControlCenters
#region OK分档查询
//if (CommonMethods.sysConfig.MesModeSwitching && CommonMethods.mesConfig.isConnected)
{ //1 分选测厚度NG ，2 分选外观不良 21分选一档,22分选二档，23分选三档、24分选四档，25分档5 26 ==6
-
- if (list[i].Result == 1)
+
+ if (list[i].Result == 1)
+ {
+ if (CommonMethods.mesConfig.isUpMes)
{
- if (CommonMethods.mesConfig.isUpMes)
+ //分档接口
+ //21~26 OK挡位
+ var (success, mesage, mesResType, mesResFangAnType) = CommonMethods.hbgMes.MesGrading(
+ CommonMethods.mesConfig.GradingMesUrl,
+ list[i].BarCode,
+ CommonMethods.mesConfig.siteCode,
+ CommonMethods.mesConfig.lineCode,
+ CommonMethods.mesConfig.mesUserName,
+ CommonMethods.mesConfig.equipNum,
+ CommonMethods.mesConfig.MaterialCode);//分档查询
+
+ try
{
- //分档接口
- //21~26 OK挡位
- var (success, mesage, mesResType) = CommonMethods.hbgMes.MesGrading(
- CommonMethods.mesConfig.GradingMesUrl,
- list[i].BarCode,
- CommonMethods.mesConfig.siteCode,
- CommonMethods.mesConfig.lineCode,
- CommonMethods.mesConfig.mesUserName,
- CommonMethods.mesConfig.equipNum,
- CommonMethods.mesConfig.MaterialCode);//分档查询
-
- try
+ //listGradeResult[i] = (short)26;//默认分档OK
+ list[i].Remark = "外观检OK分档";
+ list[i].Mes_battery_Grade = mesResType[0];
+ list[i].Mes_sorting_scheme = mesResFangAnType[0];
+ if (success && mesResType[0] != "NULL")
{
- //listGradeResult[i] = (short)26;//默认分档OK
- list[i].Remark = "外观检OK分档";
- if (success && mesResType[0] != "NULL")
+
+ if (mesResType[0].Equals(CommonMethods.mesConfig.Grading1))
{
-
- if (mesResType[0].Equals(CommonMethods.mesConfig.Grading1))
- {
- listGradeResult[i] = (short)(CommonMethods.MESGradingSet[0] + 20);
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
- }
- else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading2))
- {
- listGradeResult[i] = (short)(CommonMethods.MESGradingSet[1] + 20);
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
- }
- else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading3))
- {
- listGradeResult[i] = (short)(CommonMethods.MESGradingSet[2] + 20);
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
- }
- else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading4))
- {
- listGradeResult[i] = (short)(CommonMethods.MESGradingSet[3] + 20);
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
- }
- else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading5))
- {
- listGradeResult[i] = (short)(CommonMethods.MESGradingSet[4] + 20);
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
- }
- else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading6))
- {
- listGradeResult[i] = (short)(CommonMethods.MESGradingSet[5] + 20);
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
- }
- else
- {
- throw new Exception("MES未反馈正确档位");
- }
-
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[0] + 20);
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
+ }
+ else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading2))
+ {
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[1] + 20);
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
+ }
+ else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading3))
+ {
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[2] + 20);
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
+ }
+ else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading4))
+ {
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[3] + 20);
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
+ }
+ else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading5))
+ {
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[4] + 20);
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
+ }
+ else if (mesResType[0].Equals(CommonMethods.mesConfig.Grading6))
+ {
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[5] + 20);
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]}";
}
else
+ {
throw new Exception("MES未反馈正确档位");
+ }
}
- catch (Exception ex)
- {
- listGradeResult[i] = (short)26;
-
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档NG，MES未反馈正确档位";
- LoggerHelp.WriteLog("解析出站MES分档数据异常：{ex.Message}", "SysErrorLog");
-
- }
+ else
+ throw new Exception("MES未反馈正确档位");
+
}
- else
+ catch (Exception ex)
{
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档，MES断连";
- listGradeResult[i] = (short)26;
- // list[i].Result = "MES NG";
- CommonMethods.PlcLink.WriteValue("D80", 1, Data_Type.Short);
- //反馈MES结果
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[5] + 20); //(short)26;
+
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档NG，MES未反馈正确档位";
+ LoggerHelp.WriteLog("解析出站MES分档数据异常：{ex.Message}", "SysErrorLog");
}
-
}
else
{
- //厚度不良分档
- if (!(list[i].ThicknessPLCResult1 == 1 && list[i].ThicknessPLCResult2 == 1 && list[i].ThicknessPLCResult3 == 1))
- {
- listGradeResult[i] = 1;
- list[i].Remark = $"出站条码[{list[i].BarCode}]测厚度NG";
- }
- else
- {
- //外观不良分档
- listGradeResult[i] = 2;
- list[i].Remark = $"出站条码[{list[i].BarCode}]外观检NG不分类";
- }
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档，MES断连";
+ listGradeResult[i] = (short)(CommonMethods.MESGradingSet[5] + 20); //(short)26;
+ // list[i].Result = "MES NG";
+ CommonMethods.PlcLink.WriteValue("D80", 1, Data_Type.Short);
+ //反馈MES结果
+
}
- listRes[i] = listGradeResult[i];
- list[i].Result = listGradeResult[i];
-
+
+ }
+ else
+ {
+ //厚度不良分档 1 测厚不良 2 外观不良
+ if (list[i].CCD19 != 1)
+ {
+ listGradeResult[i] = 1;
+ list[i].Remark = $"出站条码[{list[i].BarCode}]测厚度NG";
+ }
+ else
+ {
+ //外观不良分档
+ listGradeResult[i] = 2;
+ list[i].Remark = $"出站条码[{list[i].BarCode}]外观检NG不分类";
+ }
+ }
+ listRes[i] = listGradeResult[i];
+ list[i].Result = listGradeResult[i];
+ MyRes[i] = listGradeResult[i];
+
}
-
+
+ #endregion
+ #region 结果参数
+ //发送产品结果参数给MES
+ if (CommonMethods.mesConfig.isUpMes)
+ {
+ bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage);
+ }
#endregion
#region//极限件发3给PLC
//if (ChallengeFlag == 1)
diff --git a/JinYuan.MES/IMes.cs b/JinYuan.MES/IMes.cs
index 17fa44b..6847b6e 100644
--- a/JinYuan.MES/IMes.cs
+++ b/JinYuan.MES/IMes.cs
@@ -241,7 +241,7 @@ namespace JinYuan.MES
///
///
///
- (bool Success, List MesMessage, List MesResType) MesGrading(
+ (bool Success, List MesMessage, List MesResType, List mesResFangAnType) MesGrading(
string url, string barCode, string siteCode, string lineCode, string userName, string equipCode, string materialCode);
}
}
diff --git a/JinYuan.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs
index 4a67feb..3cbd457 100644
--- a/JinYuan.MES/MesDataProcess.cs
+++ b/JinYuan.MES/MesDataProcess.cs
@@ -1122,50 +1122,11 @@ namespace JinYuan.MES
payload1.identification = new IdentificationListItem
{
identification = m.BarCode,
- qualityStatus = m.CSBYHOUTSTATIONJUDGMENTRESULT,
+ qualityStatus = "Y",//m.CSBYHOUTSTATIONJUDGMENTRESULT,
};
- payload1.tagDataVOList = GetTagDataVOList(m);
- #region old
- // 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 = "芯包称重工位号"
- // //}
-
-
- // };
- #endregion
-
+ payload1.tagDataVOList = GetTagDataVOList(m, equipNum, payload1);
+
model.payload = JsonConvert.SerializeObject(payload1);
//payload1= JsonConvert.SerializeObject(payload1);
break;
@@ -1213,7 +1174,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");
@@ -1243,47 +1204,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
@@ -1811,7 +1803,7 @@ namespace JinYuan.MES
///
///
///
- public (bool Success, List MesMessage, List MesResType) MesGrading(
+ public (bool Success, List MesMessage, List MesResType, List mesResFangAnType) MesGrading(
string url, string barCode, string siteCode, string lineCode, string userName, string equipCode, string materialCode)
{
bool res = false; // 操作结果
@@ -1823,6 +1815,7 @@ namespace JinYuan.MES
lstbarCode.Add(barCode);
List mesage = GetListString(lstbarCode.Count, "分档失败"); // 消息列表
List mesResType = GetListString(lstbarCode.Count, "NULL"); // 响应类型列表
+ List mesResFangAnType = GetListString(lstbarCode.Count, "NULL"); // 新增分档方案响应类型列表
try
{
@@ -1867,7 +1860,7 @@ namespace JinYuan.MES
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, mesage, mesResType);
+ return (res, mesage, mesResType, mesResFangAnType);
}
// 解析返回结果 - 修改部分开始
@@ -1881,10 +1874,12 @@ namespace JinYuan.MES
for (int i = 0; i < lstbarCode.Count; i++)
{
string MesGrading = "NULL";
+ string MesGradingFangAn = "NULL";
string Mesage = string.Empty;
- GetGradingMesResType(res1, barCode, ref Mesage, ref MesGrading);
+ GetGradingMesResType(res1, barCode, ref Mesage, ref MesGrading,ref MesGradingFangAn);
mesage[i] = Mesage ?? "分档成功";
mesResType[i] = MesGrading;
+ mesResFangAnType[i] = MesGradingFangAn;
}
res = true;
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,返回结果:{result}";
@@ -1914,7 +1909,7 @@ namespace JinYuan.MES
}
// 返回结果
- return (res, mesage, mesResType);
+ return (res, mesage, mesResType, mesResFangAnType);
}
///
@@ -1924,7 +1919,7 @@ namespace JinYuan.MES
///
///
///
- private void GetGradingMesResType(MesGradingResponse res1, string BarCode, ref string MesMessage, ref string MesGrading)
+ private void GetGradingMesResType(MesGradingResponse res1, string BarCode, ref string MesMessage, ref string MesGrading,ref string MesGradingFangAn)
{
if (res1 != null && res1.rows != null)
{
@@ -1941,11 +1936,13 @@ namespace JinYuan.MES
{
MesMessage = row.message.ToString();
MesGrading = row.rank;
+ MesGradingFangAn = row.sortingScheme;
}
else
{
MesMessage = "返回为空!";
MesGrading = "NULL";
+ MesGradingFangAn = "NULL";
}
}
diff --git a/JinYuan.MES/Models/MesResponse.cs b/JinYuan.MES/Models/MesResponse.cs
index a0fa5ca..9b50216 100644
--- a/JinYuan.MES/Models/MesResponse.cs
+++ b/JinYuan.MES/Models/MesResponse.cs
@@ -203,5 +203,9 @@ namespace JinYuan.MES.Models
public object passage { get; set; }
public object message { get; set; }
+ ///
+ /// 分档方案
+ ///
+ public string sortingScheme { get; set; }
}
}
diff --git a/JinYuan.Models/BGearEntity.cs b/JinYuan.Models/BGearEntity.cs
index 260730a..eff839b 100644
--- a/JinYuan.Models/BGearEntity.cs
+++ b/JinYuan.Models/BGearEntity.cs
@@ -80,20 +80,20 @@ namespace JinYuan.Models
/// 电芯1_厚度数据1
///
public float Thickness1 { get; set; }
- public float Thickness2 { get; set; }
- public float Thickness3 { 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; }
///
/// 电芯_CCD1结果 1 OK，0 NG，2 缺图
///
@@ -166,617 +166,92 @@ 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 string TestTime { 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 string RFID { get; set; }
+ public string ScanBarRes { get; set; }
+
+
+
+ public string flatness_setpoint { get; set; }
+ ///
+ /// 平面度实际值
+ ///
+ public string flatness_actual { get; set; }
+ ///
+ /// 平面度判定结果
+ ///
+ // public string flatness_judgment { get; set; }
+ ///
+ /// 外观设定值
+ ///
+ public string appearance_standard { get; set; }
+ public string CCD1NgCode { get; set; }
+ public string CCD2NgCode { get; set; }
+ public string CCD3NgCode { get; set; }
+ public string CCD4NgCode { get; set; }
+ public string CCD5NgCode { get; set; }
+ public string CCD6NgCode { get; set; }
+ public string CCD7NgCode { get; set; }
+ public string CCD8NgCode { get; set; }
+ public string CCD9NgCode { get; set; }
+ public string CCD10NgCode { get; set; }
+ public string CCD11NgCode { get; set; }
+ public string CCD12NgCode { get; set; }
+ public string CCD13NgCode { get; set; }
+ public string CCD14NgCode { get; set; }
+ public string CCD15NgCode { get; set; }
+ public string CCD16NgCode { get; set; }
+ public string CCD17NgCode { get; set; }
+ ///
+ /// 二维码ng 不良编号
+ ///
+ public string CCD18NgCode { get; set; }
+ public string BarCodeResult { get; set; }
+ ///
+ /// 进出站条码匹配结果
+ ///
+ public string barcode_match_result { get; set; }
+ ///
+ /// NG代码汇总
+ ///
+ public string ng_code_summary { get; set; }
+ public int PlcResult { get; set; }
+
+ ///
+ /// 结果数据是否上传MES
+ ///
+ public string Flag1 { get; set; }
+
+
+ public string Info { get; set; }
+ ///
+ /// 进出站电池等级
+ ///
+ public string in_battery_grade { get; set; }
+ ///
+ /// 进出站电池等级
+ ///
+ public string out_battery_grade { get; set; }
+ // MES返回分选方案
+ public string Mes_sorting_scheme { get; set; }
+ ///
+ /// MES返回电池档位
+ ///
+ public string Mes_battery_Grade { 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; }
- // ///
- // /// 物流线托盘码
- // ///
- // //public short pan { get; set; }
- // ///
- // /// 标志
- // ///
- // public int Flag { get; set; }
- // ///
- // /// 备注
- // ///
- // public string Remark { get; set; }
}
}