Skip to content

孙克 / RC1250-AssemblyLine

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

获取库位号时不判断是否有出库任务。

1 个父辈 3c1d6d22
内嵌 并排
正在显示 2 个修改的文件 包含 35 行增加 和 13 行删除
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -1159,18 +1159,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -1159,18 +1159,23 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
MoveEquip move = MoveEquipMap[id]; MoveEquip move = MoveEquipMap[id];
if (!move.NoAlarm() || move.IsDebug || move.waitOutStoreList.Count > 0) if (move.IsDebug)
//if (!move.NoErrorAlarm() || move.IsDebug || move.waitOutStoreList.Count > 0)
{ {
return false; return false;
} }
if (runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy)) if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait)
{
if ((move.MoveInfo.MoveType.Equals(LineMoveType.None) || move.MoveInfo.MoveType.Equals(LineMoveType.InStore))
&& (move.runStatus.Equals(LineRunStatus.Runing) || move.runStatus.Equals(LineRunStatus.Busy)))
{ {
return true; return true;
} }
} //if (runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy))
//{
// if ((move.MoveInfo.MoveType.Equals(LineMoveType.None) || move.MoveInfo.MoveType.Equals(LineMoveType.InStore))
// && (move.runStatus.Equals(LineRunStatus.Runing) || move.runStatus.Equals(LineRunStatus.Busy)))
// {
// return true;
// }
//}
// LogUtil.error("runStatus【" + runStatus + "】，move.MoveInfo.MoveType【" + move.MoveInfo.MoveType + "】，move.runStatus【" + move.runStatus + "】 "); // LogUtil.error("runStatus【" + runStatus + "】，move.MoveInfo.MoveType【" + move.MoveInfo.MoveType + "】，move.runStatus【" + move.runStatus + "】 ");
return false; return false;
} }
......
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
...@@ -90,14 +90,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -90,14 +90,17 @@ namespace OnlineStore.DeviceLibrary
private bool Shunt_Updown2CanUp() private bool Shunt_Updown2CanUp()
{ {
TimeSpan span = DateTime.Now - Stop2DownTime; TimeSpan span = DateTime.Now - Stop2DownTime;
if (span.TotalMilliseconds >= 3000) if (span.TotalMilliseconds >= 4000)
{ {
if (IOValue(IO_Type.Shunt_StopDown2_Back).Equals(IO_VALUE.LOW) if (IOValue(IO_Type.Shunt_StopDown2_Back).Equals(IO_VALUE.LOW)
&& IOValue(IO_Type.Shunt_Check3_Back).Equals(IO_VALUE.LOW)) && IOValue(IO_Type.Shunt_Check3_Back).Equals(IO_VALUE.LOW))
{ {
if (TrayManager.checkWatch(check3LowWatch, 200, false))
{
return true; return true;
} }
} }
}
return false; return false;
} }
private void UpateShuntTrayNum() private void UpateShuntTrayNum()
...@@ -128,6 +131,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -128,6 +131,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(null, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2); CylinderMove(null, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
} }
private Stopwatch check3LowWatch = new Stopwatch();
private void ShuntTimerProcess() private void ShuntTimerProcess()
{ {
if (DisableShunt) if (DisableShunt)
...@@ -149,6 +153,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -149,6 +153,16 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
if (IOValue(IO_Type.Shunt_Check3_Back).Equals(IO_VALUE.LOW))
{
TrayManager.checkWatch(check3LowWatch, 30000, false);
}
else
{
check3LowWatch.Stop();
}
if (Shunt_MoveInfo.MoveType.Equals(LineMoveType.None)) if (Shunt_MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
if (IOValue(IO_Type.Shunt_Check1_Front).Equals(IO_VALUE.HIGH)&& IOValue(IO_Type.Shunt_Check2_Middle).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.Shunt_Check1_Front).Equals(IO_VALUE.HIGH)&& IOValue(IO_Type.Shunt_Check2_Middle).Equals(IO_VALUE.HIGH))
...@@ -227,8 +241,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -227,8 +241,8 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1); CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1);
if (Shunt_Updown2CanUp()) if (Shunt_Updown2CanUp())
{ {
CylinderMove(null, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2); CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW)); //Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW));
} }
} }
else else
...@@ -252,17 +266,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -252,17 +266,20 @@ namespace OnlineStore.DeviceLibrary
else if (Shunt_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt05_Top1Up)) else if (Shunt_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt05_Top1Up))
{ {
if (Shunt_Updown2CanUp())
{
if (CylinderIsOk(IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1) && if (CylinderIsOk(IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1) &&
IOValue(IO_Type.Shunt_TopCylinder_Down2).Equals(IO_VALUE.LOW)) CylinderIsOk(IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2))
{ {
Shunt08_DriveMotorMove(); Shunt08_DriveMotorMove();
} }
else if (Shunt_Updown2CanUp()) else
{ {
Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt07_Top2Up); Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt07_Top2Up);
ShuntLog("分流横移：升降2开始上升 "); ShuntLog("分流横移：升降2开始上升 ");
CylinderMove(null, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2); CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW)); //Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW));
}
} }
else if (Shunt_MoveInfo.IsTimeOut(120)) else if (Shunt_MoveInfo.IsTimeOut(120))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!