SoftwareGroup/602_FD
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分档方案字段

Browse Source
This commit is contained in:
ldw
2025-09-25 16:50:47 +08:00
parent 9f603bf8f6
commit 114977f726
5 changed files with 267 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.MES/IMes.cs
+1 -1
View File
@@ -241,7 +241,7 @@ namespace JinYuan.MES
/// <param name="equipCode"></param>
/// <param name="materialCode"></param>
/// <returns></returns>
(bool Success, List<string> MesMessage, List<string> MesResType) MesGrading(
(bool Success, List<string> MesMessage, List<string> MesResType, List<string> mesResFangAnType) MesGrading(
string url, string barCode, string siteCode, string lineCode, string userName, string equipCode, string materialCode);
}
}
JinYuan.MES/MesDataProcess.cs
+77 -80
View File
@@ -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<TagDataVOListItem>
//{
// 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<TagDataVOListItem> GetTagDataVOList(BGearEntity m)
private List<TagDataVOListItem> 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
/// <param name="equipCode"></param>
/// <param name="materialCode"></param>
/// <returns></returns>
public (bool Success, List<string> MesMessage, List<string> MesResType) MesGrading(
public (bool Success, List<string> MesMessage, List<string> MesResType, List<string> 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<string> mesage = GetListString(lstbarCode.Count, "分档失败"); // 消息列表
List<string> mesResType = GetListString(lstbarCode.Count, "NULL"); // 响应类型列表
List<string> 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);
}
/// <summary>
@@ -1924,7 +1919,7 @@ namespace JinYuan.MES
/// <param name="BarCode"></param>
/// <param name="MesMessage"></param>
/// <param name="mesResType"></param>
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";
}
}
JinYuan.MES/Models/MesResponse.cs
+4
View File
@@ -203,5 +203,9 @@ namespace JinYuan.MES.Models
public object passage { get; set; }
public object message { get; set; }
/// <summary>
/// 分档方案
/// </summary>
public string sortingScheme { get; set; }
}
}