Skip to content

孙克 / RC1250-AssemblyLine

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

接驳台需要时再转。

1 个父辈 07422564
全部展开
内嵌 并排
正在显示 3 个修改的文件 包含 38 行增加 和 23 行删除
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -334,11 +334,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -334,11 +334,10 @@ namespace OnlineStore.DeviceLibrary
Line3TimerPro(); Line3TimerPro();
//小皮带线常转 //小皮带线常转
//if (IOValue(IO_Type.SeparateDevice_Run).Equals(IO_VALUE.LOW) && MoveInfo.MoveType.Equals(LineMoveType.None) && NoErrorAlarm())
if (IOValue(IO_Type.SeparateDevice_Run).Equals(IO_VALUE.LOW) && MoveInfo.MoveType.Equals(LineMoveType.None) && NoErrorAlarm()) //{
{ // SeparateLineRun();
SeparateLineRun(); //}
}
} }
//判断红灯状态 //判断红灯状态
...@@ -454,7 +453,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -454,7 +453,7 @@ namespace OnlineStore.DeviceLibrary
private bool Line3HasTray() private bool Line3HasTray()
{ {
if (Line3LastTrayP > 0 && Line3LastTrayP <= Line3MaxPosition * 10) if (Line3LastTrayP > 0 && Line3LastTrayP <= Line3MaxPosition * 3)
{ {
return true; return true;
} }
...@@ -527,6 +526,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -527,6 +526,18 @@ namespace OnlineStore.DeviceLibrary
{ {
UpdateScanInfo(IO_VALUE.HIGH, LastCode); UpdateScanInfo(IO_VALUE.HIGH, LastCode);
LogUtil.info(hengyiName + "ExitTray_Check3不亮，但扫到条码，更改为有料： " + LastCode); LogUtil.info(hengyiName + "ExitTray_Check3不亮，但扫到条码，更改为有料： " + LastCode);
if (DeviceID.Equals(301))
{
if (Line3LastTrayP > Line3MaxPosition) { Line3LastTrayP = Line3MaxPosition; }
// StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr);
}
else
{
if (Line3LastTrayP > Line3MaxPosition - 1)
{
Line3LastTrayP = Line3MaxPosition - 1;
}
}
} }
IsInScanCode = false; IsInScanCode = false;
...@@ -657,22 +668,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -657,22 +668,22 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH); IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
} }
public void SeparateBackRun(LineMoveInfo moveInfo = null) //public void SeparateBackRun(LineMoveInfo moveInfo = null)
{ //{
if (moveInfo != null) // if (moveInfo != null)
{ // {
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Run, IO_VALUE.LOW)); // moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Run, IO_VALUE.LOW));
} // }
IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW); // IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
if (DeviceID.Equals(301)) // if (DeviceID.Equals(301))
{ // {
if (moveInfo != null) // if (moveInfo != null)
{ // {
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_BackRun, IO_VALUE.HIGH)); // moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_BackRun, IO_VALUE.HIGH));
} // }
IOMove(IO_Type.SeparateDevice_BackRun, IO_VALUE.HIGH); // IOMove(IO_Type.SeparateDevice_BackRun, IO_VALUE.HIGH);
} // }
} //}
public void SeparateStopRun(LineMoveInfo moveInfo = null) public void SeparateStopRun(LineMoveInfo moveInfo = null)
{ {
if (moveInfo != null) if (moveInfo != null)
......
source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
...@@ -258,12 +258,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -258,12 +258,16 @@ namespace OnlineStore.DeviceLibrary
internal bool HasTray() internal bool HasTray()
{ {
if (LastTrayPosition > 0 && if (LastTrayPosition > 0 &&
LastTrayPosition <= MaxPosition * 10) LastTrayPosition <= MaxPosition * 2)
{ {
return true; return true;
} }
if (equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH)) if (equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH))
{ {
if (LastTrayPosition > MaxPosition)
{
LastTrayPosition = MaxPosition;
}
return true; return true;
} }
return false; return false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!