Skip to content

李娜 / SO664-AssemblyLine

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

增加暂停抓料复选框

1 个父辈 038c4e47
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 45 行增加 和 14 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine ...@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine
LineManager.TrayToOutLineTest = chbTrayTest.Checked; LineManager.TrayToOutLineTest = chbTrayTest.Checked;
LogUtil.info("界面点击勾选：" + chbTrayTest.Text + "=" + LineManager.TrayToOutLineTest); LogUtil.info("界面点击勾选：" + chbTrayTest.Text + "=" + LineManager.TrayToOutLineTest);
} }
private void chbDisGetWare_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisGetWare.Equals(chbDisGetWare.Checked))
{
return;
}
LineManager.DisGetWare = chbDisGetWare.Checked;
LogUtil.info("界面点击勾选：" + chbDisGetWare.Text + "=" + LineManager.DisGetWare);
}
} }
} }
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary
if (ScanCodeTask == null || ScanCodeTask.IsCompleted) if (ScanCodeTask == null || ScanCodeTask.IsCompleted)
{ {
ClearTimeoutAlarm("扫码结束超时"); ClearTimeoutAlarm("扫码结束超时");
MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
ClearTimeoutAlarm("扫码执行结束超时"); ClearTimeoutAlarm("扫码执行结束超时");
if (!LineManager.DisGetWare)
{
ClearTimeoutAlarm("启用抓料超时");
MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
}
else if (MoveInfo.IsTimeOut(60))
{
MoveTimeOut(MoveInfo, "启用抓料超时");
}
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
...@@ -357,7 +365,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -357,7 +365,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.FI_22_UpdownToP3); MoveInfo.NextMoveStep(LineMoveStep.FI_22_UpdownToP3);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P3[" + Config.UpDownAxisP3 + "]"); InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P3[" + Config.UpDownAxisP3 + "]");
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP3, Config.UpdownAxis_P3Speed); UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP3, Config.UpdownAxis_P3Speed);
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_22_UpdownToP3)) else if (MoveInfo.IsStep(LineMoveStep.FI_22_UpdownToP3))
{ {
...@@ -485,11 +493,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -485,11 +493,11 @@ namespace OnlineStore.DeviceLibrary
} }
if (LastResult.Equals(98)) if (LastResult.Equals(98))
{ {
InLog(" " + MoveInfo.SLog + " 出库料，开始拦截空托盘 "); InLog(" " + MoveInfo.SLog + " 出库料，开始拦截空托盘 ");
} }
else else
{ {
InLog(" " + MoveInfo.SLog + " 入库料，开始拦截空托盘 "); InLog(" " + MoveInfo.SLog + " 入库料，开始拦截空托盘 ");
} }
ClearTimeoutAlarm("获取库位号超时"); ClearTimeoutAlarm("获取库位号超时");
...@@ -521,7 +529,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -521,7 +529,7 @@ namespace OnlineStore.DeviceLibrary
TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, LastPosParam.Clone(), LastPosParam.NgMsg); TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, LastPosParam.Clone(), LastPosParam.NgMsg);
TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum); TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P2: [" + targetPositon + "] 更新托盘信息【" + tray.ToStr() + "】"); InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P2: [" + targetPositon + "] 更新托盘信息【" + tray.ToStr() + "】");
SServerManager.SendPosToStoreCheck(Name, LastPosParam.Clone()); SServerManager.SendPosToStoreCheck(Name, LastPosParam.Clone());
} }
if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false)) if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
{ {
...@@ -560,21 +568,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -560,21 +568,21 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
if (IOValue(IO_Type.SL_ClampCylinder_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.SL_ClampCylinder_Check).Equals(IO_VALUE.LOW))
{ {
FI_37_TrayMoveOk(); FI_37_TrayMoveOk();
} }
else else
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_36_ClampCheck); MoveInfo.NextMoveStep(LineMoveStep.FI_36_ClampCheck);
InLog("料盘移栽" + MoveInfo.SLog + "：等待夹爪无料"); InLog("料盘移栽" + MoveInfo.SLog + "：等待夹爪无料");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_ClampCylinder_Check, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_ClampCylinder_Check, IO_VALUE.LOW));
} }
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_36_ClampCheck)) else if (MoveInfo.IsStep(LineMoveStep.FI_36_ClampCheck))
{ {
FI_37_TrayMoveOk(); FI_37_TrayMoveOk();
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_37_TrayMoveOk)) else if (MoveInfo.IsStep(LineMoveStep.FI_37_TrayMoveOk))
{ {
if (axisCheckTimer != null && axisCheckTimer.Enabled) if (axisCheckTimer != null && axisCheckTimer.Enabled)
...@@ -677,7 +685,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -677,7 +685,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_59_WaitTime)) else if (MoveInfo.IsStep(LineMoveStep.FI_59_WaitTime))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_60_LineStop); MoveInfo.NextMoveStep(LineMoveStep.FI_60_LineStop);
InLog("上料完成" + MoveInfo.SLog + "， 料架到达出口，线体横移电机停止 "); InLog("上料完成" + MoveInfo.SLog + "， 料架到达出口，线体横移电机停止 ");
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW); IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW); IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW);
...@@ -718,7 +726,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -718,7 +726,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.FI_62_OutLineRun)) else if (MoveInfo.IsStep(LineMoveStep.FI_62_OutLineRun))
{ {
MoveEndS(); MoveEndS();
LastOutShelfId = CurrShelfId; LastOutShelfId = CurrShelfId;
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW); IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束，更新LastOutShelfId=" + LastOutShelfId); InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束，更新LastOutShelfId=" + LastOutShelfId);
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (LineManager.DisGetWare)
{
return false;
}
MoveEquip move = MoveEquipMap[id]; MoveEquip move = MoveEquipMap[id];
if (!move.NoAlarm() || move.waitInStoreList.Count > 0 || move.IsDebug || move.waitOutStoreList.Count > 0) if (!move.NoAlarm() || move.waitInStoreList.Count > 0 || move.IsDebug || move.waitOutStoreList.Count > 0)
{ {
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if(LineManager.DisGetWare)
{
return false;
}
//如果正在出库执行中，不能拦截入库托盘 //如果正在出库执行中，不能拦截入库托盘
if (MoveInfo.MoveType.Equals(LineMoveType.OutStore)) if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{ {
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary
public static bool DisAllMove = false; public static bool DisAllMove = false;
public static bool TrayToOutLineTest = false; public static bool TrayToOutLineTest = false;
public static bool DisGetWare = false;
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
private static bool isInit = false; private static bool isInit = false;
public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals(""); public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!