416 添加OEE报警相关

This commit is contained in:
gf zhou committed 2025-04-17 09:20:19 +08:00
1 parent 233737bc31
commit 9c5ef7bb31
12 files changed
+1164 -171

No files matched your search

+1 -1
View File
@@ -620,7 +620,7 @@ namespace WindowsFormsApp1.server
StationID = _stationID,
MachineID = _machineID,
OPID = _opID,
AlarmID = OtherData.Plc_ErrorMsgs[0],
AlarmID = Init.ErrorCode,
SendTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"),
ResetTime = ""
};
+117 -1
View File
@@ -244,7 +244,7 @@ namespace WindowsFormsApp1.server
case "byte":
address[i].value = ByteTransform.TransByte(read.Content, index).ToString();
break;
case "real":
address[i].value = ByteTransform.TransSingle(read.Content, index).ToString();
break;
@@ -685,5 +685,121 @@ namespace WindowsFormsApp1.server
}
}
#endregion
#region 读取报警
private BllResult ReadOneDB(List<t_oeeaddress> address)
{
address = address.OrderBy(a => a.dbaddress).ToList();
OperateResult<byte[]> read;
if (address.Count == 1)
{
string startaddress = address[0].dbaddress + "." + address[0].addressoffset.ToString();
read = siemensS7Net.Read(startaddress, (ushort)address[0].addressdecimal);
}
else
{
double admax = address.Select(a => a.addressoffset).Max();
double admin = address.Select(a => a.addressoffset).Min();
ushort length = (ushort)(Math.Floor(admax - admin) + (ushort)address[0].addressdecimal);
string startaddress = address[0].dbaddress + "." + admin.ToString();
read = siemensS7Net.Read(startaddress, length);
}
if (read.IsSuccess)
{
if (TransforWCSDataToAddressData(address, read).Success)
{
return BllResult.Sucess(address, "成功");
}
else
{
return BllResult.Sucess(address, "成功");
}
}
else
{
return BllResult.Error(read.Message);
}
}
public BllResult<List<t_oeeaddress>> ReadAddress(List<t_oeeaddress> address)
{
List<List<t_oeeaddress>> i_Device_s = new List<List<t_oeeaddress>>();
var ulist = address.GroupBy(a => a.dbaddress).ToList();
foreach (var u in ulist)
{
var readresult = ReadOneDB(u.ToList());
if (!readresult.Success)
{
return BllResult<List<t_oeeaddress>>.Error(readresult.Msg);
}
}
List<t_oeeaddress> list = new List<t_oeeaddress>();
foreach (var add in address.OrderBy(a => a.addressoffset))
{
list.Add(new t_oeeaddress {code = add.code, value = add.value});
}
return BllResult<List<t_oeeaddress>>.Sucess(list, "成功");
}
public BllResult TransforWCSDataToAddressData(List<t_oeeaddress> address, OperateResult<byte[]> read)
{
try
{
//按偏移量排序
address = address.OrderBy(a => a.dbaddress)
.ThenBy(x => x.addressoffset).ToList();
int startindex = address[0].addressoffset;
for (int i = 0; i < address.Count; i++)
{
int index = address[i].addressoffset - startindex;
switch (address[i].addresstype)
{
case "BYTE":
address[i].value = ByteTransform.TransByte(read.Content, index).ToString();
break;
case "real":
address[i].value = ByteTransform.TransSingle(read.Content, index).ToString();
break;
case "uint":
address[i].value = ByteTransform.TransInt16(read.Content, index).ToString();
break;
case "LWORD":
address[i].value = Convert.ToString(ByteTransform.TransInt64(read.Content, index), 16); ;
break;
case "bool":
address[i].value = ByteTransform.TransBool(read.Content, index, 1)[address[i].addressdecimal].ToString();
break;
case "INT":
address[i].value = ByteTransform.TransInt16(read.Content, index).ToString();
break;
case "DINT":
address[i].value = Convert.ToString(ByteTransform.TransInt32(read.Content, index), 10);
break;
case "CHAR":
address[i].value = Encoding.ASCII.GetString(read.Content, index, 20).Replace(" ", "").Replace("\0", "").Replace("\u0003", "");
break;
default:
return BllResult.Error("找不到未知的数据类型");
}
}
return BllResult.Sucess(address);
}
catch (Exception ex)
{
return BllResult.Error($"转换WCS数据失败{ex.Message}");
}
}
#endregion
}
}