oee相关修改
This commit is contained in:
1 parent
9c5ef7bb31
commit
4419a4de3c
9 files changed
+422
-121
No files matched your search
@@ -525,14 +525,14 @@ namespace WindowsFormsApp1.server
|
||||
else if ("ScrewE,Assy2,Assy3,ScrewS,ScrewM,ScrewTC".ToLower().Contains(station))
|
||||
{
|
||||
// 扭力 读马头服务器
|
||||
var geturl = $"http://10.50.12.41/getdata/v2/tighteningresults?startTime={OtherData.material.date}&endTime={DateTime.Now.AddDays(1).ToString("yyyy-MM-dd")}&vin={OtherData.material.sn}&controllerName={Init.t_Line.lineremark3}@{Init.t_Line.linecode}&includeCurve=true&includeSteps=false";
|
||||
var geturl = $"http://10.50.12.41/getdata/v2/tighteningresults?startTime={OtherData.material.date}&endTime={DateTime.Now.AddDays(1).ToString("yyyy-MM-dd")}&vin={OtherData.material.sn}&controllerName={Init.t_Line.lineremark2}@{Init.t_Line.linecode}&includeCurve=true&includeSteps=false";
|
||||
//var geturl = "http://10.50.12.41/getdata/v2/tighteningresults?startTime=2025-04-11&endTime=2025-04-12&vin=ok&controllerName=OP1260%4010.50.247.110&includeCurve=true&includeSteps=false";
|
||||
|
||||
var res = _httpClient.GetAsync(geturl).Result;
|
||||
if (res.StatusCode == System.Net.HttpStatusCode.OK)
|
||||
{
|
||||
//var getresult = JsonConvert.DeserializeObject(res.Content.ReadAsStringAsync().Result);
|
||||
// 扭力 读马头服务器 todo
|
||||
// 扭力 读马头服务器
|
||||
try
|
||||
{
|
||||
// 反序列化 JSON 数据
|
||||
@@ -579,7 +579,7 @@ namespace WindowsFormsApp1.server
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"发生错误: {ex.Message}");
|
||||
LogExecute.logNet.WriteError($"解析马头数据,发生错误: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -890,7 +890,7 @@ namespace WindowsFormsApp1.server
|
||||
material = new t_materialupload
|
||||
{
|
||||
sn = PlcData.Write_stSN,
|
||||
CarrierID = PlcData.Write_stSN,
|
||||
CarrierID = PlcData.Read_MaterialCode1,
|
||||
datacollectionUploaded = 1,
|
||||
result = logresult,
|
||||
date = DateTime.Now.ToString("yyyy-MM-dd")
|
||||
@@ -1082,6 +1082,63 @@ namespace WindowsFormsApp1.server
|
||||
return ApiFormResult.Sucess(mesresult.PASS, false, "", PlcData, DateTime.Now);
|
||||
}
|
||||
|
||||
public ApiFormResult OEEDataCollection(string url, plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
var request = new
|
||||
{
|
||||
EventID = "OEEDataCollection",
|
||||
Line = _line,
|
||||
StationID = _stationID,
|
||||
MachineID = _machineID,
|
||||
OPID = _opID,
|
||||
SN = PlcData.Write_stSN,
|
||||
CarrierID = PlcData.Read_MaterialCode1,
|
||||
DC_INFO = new List<DataDCInfoItem>(),
|
||||
CompList = new List<CompListItem>(),
|
||||
SendTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")
|
||||
};
|
||||
|
||||
// 工位最长ct
|
||||
request.DC_INFO.Add(new DataDCInfoItem()
|
||||
{
|
||||
Item = "Cycle_Time",
|
||||
Value = OtherData.Oeeaddresses.FirstOrDefault(x => x.code == "uiMAXCT")?.value //跟PLC定义好值从哪里获取
|
||||
});
|
||||
|
||||
// 机台ct
|
||||
request.DC_INFO.Add(new DataDCInfoItem()
|
||||
{
|
||||
Item = "Takt_Time",
|
||||
Value = OtherData.Oeeaddresses.FirstOrDefault(x => x.code == "uiNEWCT")?.value //跟PLC定义好值从哪里获取
|
||||
});
|
||||
|
||||
var tossing = DataListManager.DataList.Any(x => x.Name == _stationID);
|
||||
if (tossing)
|
||||
{
|
||||
var materialList = DataListManager.DataList.First(x => x.Name == _stationID).Components;
|
||||
var num = 0;
|
||||
foreach (var material in materialList)
|
||||
{
|
||||
request.DC_INFO.Add(
|
||||
new DataDCInfoItem()
|
||||
{
|
||||
Item = $"Toss_Count_{material}",
|
||||
Value = OtherData.Oeeaddresses.FirstOrDefault(x => x.code == $"uiUnloadingNG[{num}]")?.value //跟PLC定义好值从哪里获取
|
||||
}
|
||||
);
|
||||
request.DC_INFO.Add(
|
||||
new DataDCInfoItem()
|
||||
{
|
||||
Item = $"TossRate_{material}",
|
||||
Value = OtherData.Oeeaddresses.FirstOrDefault(x => x.code == $"uiUnloadingNGX[{num}]")?.value //跟PLC定义好值从哪里获取
|
||||
}
|
||||
);
|
||||
num++;
|
||||
}
|
||||
}
|
||||
|
||||
return CallApi(url, request, "OEEDataCollection", PlcData, PLC_Status.OEEDataCollection);
|
||||
}
|
||||
#region 暂时不用
|
||||
public ApiFormResult Test(string url, plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
@@ -1098,68 +1155,6 @@ namespace WindowsFormsApp1.server
|
||||
return CallApi(url, request, "Test", PlcData, PLC_Status.Test);
|
||||
}
|
||||
|
||||
public ApiFormResult OEEDataCollection(string url, plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
//模穴 真空站两个穴位
|
||||
var model = 1;
|
||||
|
||||
if (_stationID.ToLower() == "vacuum")
|
||||
{
|
||||
model = OtherData.plcid;
|
||||
}
|
||||
|
||||
var request = new
|
||||
{
|
||||
EventID = "OEEDataCollection",
|
||||
Line = _line,
|
||||
StationID = _stationID,
|
||||
MachineID = _machineID,
|
||||
OPID = _opID,
|
||||
SN = PlcData.Write_stSN,
|
||||
CarrierID = PlcData.Read_MaterialCode1,
|
||||
DC_INFO = new List<DataDCInfoItem>(),
|
||||
CompList = new List<CompListItem>(),
|
||||
SendTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")
|
||||
};
|
||||
request.DC_INFO.Add(new DataDCInfoItem()
|
||||
{
|
||||
Item = "Eq_Active_Rate",
|
||||
Value = "0"
|
||||
});
|
||||
|
||||
// 工位最长ct
|
||||
request.DC_INFO.Add(new DataDCInfoItem()
|
||||
{
|
||||
Item = "Cycle_Time",
|
||||
Value = "0" //跟PLC定义好值从哪里获取
|
||||
});
|
||||
|
||||
// 机台ct
|
||||
request.DC_INFO.Add(new DataDCInfoItem()
|
||||
{
|
||||
Item = "Takt_Time",
|
||||
Value = "0" //跟PLC定义好值从哪里获取
|
||||
});
|
||||
|
||||
var tossing = DataListManager.DataList.Any(x => x.Name == _stationID);
|
||||
if (tossing)
|
||||
{
|
||||
var materialList = DataListManager.DataList.First(x => x.Name == _stationID).Components;
|
||||
foreach(var material in materialList)
|
||||
{
|
||||
request.DC_INFO.Add(
|
||||
new DataDCInfoItem()
|
||||
{
|
||||
Item = $"Tossing_{material}",
|
||||
Value = "1" //跟PLC定义好值从哪里获取
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return CallApi(url, request, "OEEDataCollection", PlcData, PLC_Status.OEEDataCollection);
|
||||
}
|
||||
|
||||
public ApiFormResult Get_Para(string url, plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
var request = new
|
||||
|
||||
@@ -689,7 +689,9 @@ namespace WindowsFormsApp1.server
|
||||
#region 读取报警
|
||||
private BllResult ReadOneDB(List<t_oeeaddress> address)
|
||||
{
|
||||
address = address.OrderBy(a => a.dbaddress).ToList();
|
||||
address = address.OrderBy(a => a.dbaddress)
|
||||
.ThenBy(x => x.addressoffset)
|
||||
.ToList();
|
||||
OperateResult<byte[]> read;
|
||||
if (address.Count == 1)
|
||||
{
|
||||
@@ -700,7 +702,7 @@ namespace WindowsFormsApp1.server
|
||||
{
|
||||
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);
|
||||
ushort length = (ushort)(Math.Floor(admax - admin) + address.Last().addresstypelegth);
|
||||
string startaddress = address[0].dbaddress + "." + admin.ToString();
|
||||
read = siemensS7Net.Read(startaddress, length);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user