Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ebc7f358 由 LN
选项

1

1 个父辈 e70bb168
内嵌 并排
正在显示 9 个修改的文件 包含 24 行增加 和 23 行删除
source/DeviceLibrary/assemblyLine/DischargeLine.cs
......@@ -33,8 +33,8 @@ namespace OnlineStore.DeviceLibrary
Name = (" " + "_出料皮带线_" +( DeviceID.Equals(301)?"123":"456") + " ").ToUpper();
Init();
UseAxis = false;
MoveInfo = new LineMoveInfo(DeviceID, "出料皮带线-" + (DeviceID.Equals(301) ? "123" : "456") + "-MoveInfo");
SecondMoveInfo = new LineMoveInfo(DeviceID, "出料皮带线-" + (DeviceID.Equals(301) ? "123" : "456") + "-SecondMoveInfo");
MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
int id = DeviceID % 100;
hengyiName = "横移皮带线-"+ ((id - 1) * 3 + 3)+" ";
TrayLine1 = new OutTrayLineBean("移栽皮带线" + "-" +( (id - 1) * 3 + 1)+" ", IO_Type.EntryLocation_Check1, IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.EntryTray_Check3, this.DeviceID);
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
{
continue;
}
NotOkMsg = wait.ToStr();
NotOkMsg =" ["+ wait.ToStr()+"] ";
if (wait.WaitType.Equals(WaitEnum.W001_AxisMove))
{
TimeSpan axisSpan = DateTime.Now - preCheckAxisTime;
......@@ -360,7 +360,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (wait.WaitType.Equals(WaitEnum.W002_IOValue))
{
NotOkMsg = " (" + baseConfig.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") ";
NotOkMsg = " [" + baseConfig.GetDisplayName(wait.IoType) + "=" + wait.IoValue + "]";
wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
if (!wait.IsEnd)
......@@ -450,8 +450,8 @@ namespace OnlineStore.DeviceLibrary
}
else if (span.TotalSeconds > moveInfo.TimeOutSeconds )
{
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待[" + NotOkMsg
+ "]超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg
+ "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg, DeviceID + 15);
Alarm(LineAlarmType.IoSingleTimeOut);
}
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -32,8 +32,8 @@ namespace OnlineStore.DeviceLibrary
Config.SetAxisParam();
UpdownAxis = new AxisBean( config.UpDown_Axis,Name);
BatchAxis = new AxisBean( config.Batch_Axis,Name);
MoveInfo = new LineMoveInfo(DeviceID, "入料-" + DeviceID + "-Move");
SecondMoveInfo = new LineMoveInfo(DeviceID, "入料-" + DeviceID + "-SecondMove");
MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
}
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = lineConfig.Id;
SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41");
SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23");
MoveInfo = new LineMoveInfo(DeviceID, "流水线-Move ");
MoveInfo = new LineMoveInfo(DeviceID, "[流水线-Move] ");
Name = (" 流水线_" + Config.CID + " ").ToUpper();
IsDebug = Config.IsDebug.Equals(1);
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -172,10 +172,10 @@ namespace OnlineStore.DeviceLibrary
{
continue;
}
NotOkMsg = wait.ToStr();
NotOkMsg = " ["+wait.ToStr()+"] ";
if (wait.WaitType.Equals(WaitEnum.W002_IOValue))
{
NotOkMsg = " (" + Config.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") ";
NotOkMsg = " [" + Config.GetDisplayName(wait.IoType) + "=" + wait.IoValue + "] ";
wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
if (!wait.IsEnd)
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
......@@ -26,10 +26,11 @@ namespace OnlineStore.DeviceLibrary
Name = (" " + "_进仓_" + DeviceID.ToString().PadLeft(2,'0') + " ").ToUpper();
Init();
MoveInfo = new LineMoveInfo(DeviceID, "进仓-" + DeviceID.ToString().PadLeft(2, '0') + "-MoveInfo");
SecondMoveInfo = new LineMoveInfo(DeviceID, "进仓-" + DeviceID.ToString().PadLeft(2, '0') + "-SecondMoveInfo");
MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
UseAxis = config.UpDownUseAxis.Equals(1);
if (UseAxis)
{
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
......@@ -26,9 +26,9 @@ namespace OnlineStore.DeviceLibrary
IsDebug = config.IsDebug.Equals(1);
baseConfig = config;
Name = (" " + "_出料_" + DeviceID % 100 + " ").ToUpper();
Init();
MoveInfo = new LineMoveInfo(DeviceID, "出料-" + DeviceID + "-MoveInfo");
SecondMoveInfo = new LineMoveInfo(DeviceID, "出料-" + DeviceID + "-SecondMoveInfo");
Init();
MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
UseAxis = config.UpDownUseAxis.Equals(1);
if (UseAxis)
{
......
source/DeviceLibrary/model/LineMoveInfo.cs
......@@ -341,7 +341,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】";
return "轴【" + AxisInfo.DisplayStr + "】目标位置【" + TargetPosition + "】";
}
}
else if (WaitType.Equals(WaitEnum.W002_IOValue))
......@@ -350,19 +350,19 @@ namespace OnlineStore.DeviceLibrary
}
else if (WaitType.Equals(WaitEnum.W003_Time))
{
return "时间等待：【" + TimeMSeconds + "】毫秒";
return "时间【" + TimeMSeconds + "】毫秒";
}
else if (WaitType.Equals(WaitEnum.W004_StellMove))
{
return "电钢目标位置：【" + TargetPosition + "】 ";
return "电钢目标位置【" + TargetPosition + "】 ";
}
else if (WaitType.Equals(WaitEnum.W005_ShuoKe))
{
return "硕科电机目标位置：【" + TargetPosition + "】 ";
return "硕科电机目标位置【" + TargetPosition + "】 ";
}
else if (WaitType.Equals(WaitEnum.W006_AxisOrg))
{
return "轴【" + AxisInfo.DisplayStr + "】ORG信号：【" + IoValue + "】 ";
return "轴【" + AxisInfo.DisplayStr + "】ORG信号【" + IoValue + "】 ";
}else if (WaitType.Equals(WaitEnum.W007_ReelHeight))
{
return "料盘高度【" + HeightValue + "】 ";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!