Skip to content

孙克 / RC1250-AssemblyLine

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

进仓5优化

1 个父辈 230d363f
内嵌 并排
正在显示 3 个修改的文件 包含 22 行增加 和 6 行删除
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -286,6 +286,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -286,6 +286,10 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(Name + "链条转动超过5秒，先停止链条转动"); LogUtil.info(Name + "链条转动超过5秒，先停止链条转动");
WriteDrivetMotorRun(IO_VALUE.LOW); WriteDrivetMotorRun(IO_VALUE.LOW);
if (!DisableShunt2)
{
IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.LOW );
}
} }
if (runStatus.Equals(LineRunStatus.Wait)) if (runStatus.Equals(LineRunStatus.Wait))
{ {
...@@ -365,6 +369,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -365,6 +369,7 @@ namespace OnlineStore.DeviceLibrary
//分流模块复位 //分流模块复位
ShuntStop(); ShuntStop();
Shunt2Stop(); Shunt2Stop();
IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.HIGH);
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1); CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2); CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1); CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
......
source/DeviceLibrary/assemblyLine/LineBean_Shunt2.cs
...@@ -370,7 +370,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -370,7 +370,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (storeId >= 15 && storeId <= 18) else if (storeId >= 15 && storeId <= 18)
{ {
outMsg = "15-18仓入库"; outMsg = storeId+ "仓入库";
return true; return true;
} }
} }
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -580,9 +580,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -580,9 +580,19 @@ namespace OnlineStore.DeviceLibrary
{ {
if (SecondMoveInfo.MoveType.Equals(LineMoveType.None).Equals(false)) if (SecondMoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
{ {
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
{
trayCheck2LowWait.Stop();
}
else
{
TrayManager.checkWatch(trayCheck2LowWait, 30000, false);
}
LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中，直接返回 "); LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中，直接返回 ");
return; return;
} }
if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
{
bool canpro = LineManager.Line.Move5CanProcessTray(DeviceID); bool canpro = LineManager.Line.Move5CanProcessTray(DeviceID);
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
{ {
...@@ -602,7 +612,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -602,7 +612,7 @@ namespace OnlineStore.DeviceLibrary
bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false); bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH))
{ {
if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk) if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk && canpro)
{ {
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
...@@ -623,6 +633,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -623,6 +633,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
}
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(Name + " StartCheckFixture " + " 出错：" + ex.ToString()); LogUtil.error(Name + " StartCheckFixture " + " 出错：" + ex.ToString());
...@@ -660,7 +671,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -660,7 +671,7 @@ namespace OnlineStore.DeviceLibrary
if (DeviceID.Equals(5)) if (DeviceID.Equals(5))
{ {
SecondMoveInfo.TimeOutSeconds = 15; SecondMoveInfo.TimeOutSeconds = 20;
} }
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
} }
...@@ -829,16 +840,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -829,16 +840,16 @@ namespace OnlineStore.DeviceLibrary
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_17_Stop2Check)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_17_Stop2Check))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_18_WaitTime); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_18_WaitTime);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ， 等待500ms后阻挡2上升"); CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ， 等待300ms后阻挡2上升");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_18_WaitTime)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_18_WaitTime))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_19_StopCylinder_Back); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_19_StopCylinder_Back);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ， 阻挡气缸1-2上升 ）"); CheckLog("托盘放行" + SecondMoveInfo.SLog + " ， 阻挡气缸1-2上升 ）");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_19_StopCylinder_Back)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_19_StopCylinder_Back))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!