Skip to content

刘韬 / MIMO

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d727492d 由 张东亮
选项

取出出库料串按钮修复

1 个父辈 486ec025
内嵌 并排
正在显示 5 个修改的文件 包含 27 行增加 和 12 行删除
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
...@@ -449,12 +449,7 @@ namespace DeviceLibrary ...@@ -449,12 +449,7 @@ namespace DeviceLibrary
var step = RobotManage.mainMachine.StringMoveInfo.MoveStep; var step = RobotManage.mainMachine.StringMoveInfo.MoveStep;
if ((step >= MoveStep.StringLoad_04 && step < MoveStep.StringOut_01)) if ((step >= MoveStep.StringLoad_04 && step < MoveStep.StringOut_01))
{ {
if (RobotManage.mainMachine.StringState.Equals(StringStateE.OutStore) && RobotManage.mainMachine.ServerCM.queueTaskCount == 0) map[ParamDefine.takeOutReel] = ParamDefine.enable;
{
map[ParamDefine.takeOutReel] = ParamDefine.enable;
}
else
map[ParamDefine.takeOutReel] = ParamDefine.enable;
} }
if (RobotManage.mainMachine.IOValue(IO_Type.NGDoor_Open).Equals(IO_VALUE.HIGH)) if (RobotManage.mainMachine.IOValue(IO_Type.NGDoor_Open).Equals(IO_VALUE.HIGH))
{ {
......
DeviceLibrary/theMachine/MainMachine _IOMonitor.cs
...@@ -24,6 +24,7 @@ namespace DeviceLibrary ...@@ -24,6 +24,7 @@ namespace DeviceLibrary
if ((StringState >= StringStateE.OutStore) && IOValue(IO_Type.DoorClose_LoadMaterial).Equals(IO_VALUE.LOW)) if ((StringState >= StringStateE.OutStore) && IOValue(IO_Type.DoorClose_LoadMaterial).Equals(IO_VALUE.LOW))
{ {
MaterialDoorOpen = true; MaterialDoorOpen = true;
RequestTakeOutReel = false;
StringState = StringStateE.None; StringState = StringStateE.None;
} }
else if (IOValue(IO_Type.DoorClose_LoadMaterial).Equals(IO_VALUE.HIGH) && StringMoveInfo.MoveStep == MoveStep.Wait) else if (IOValue(IO_Type.DoorClose_LoadMaterial).Equals(IO_VALUE.HIGH) && StringMoveInfo.MoveStep == MoveStep.Wait)
......
DeviceLibrary/theMachine/MainMachine_ServerControl.cs
...@@ -28,18 +28,17 @@ namespace DeviceLibrary ...@@ -28,18 +28,17 @@ namespace DeviceLibrary
public string doTakeOutReel() public string doTakeOutReel()
{ {
LogUtil.info("请求下降出库料串"); LogUtil.info("请求下降出库料串");
var step = RobotManage.mainMachine.StringMoveInfo.MoveStep; var stringStep = RobotManage.mainMachine.StringMoveInfo.MoveStep;
var clampstep = RobotManage.mainMachine.ClampMoveInfo.MoveStep; var clampstep = RobotManage.mainMachine.ClampMoveInfo.MoveStep;
if (step == MoveStep.StringReadyGet && clampstep >= MoveStep.ReelClamp_GetHeight) if (stringStep == MoveStep.StringReadyGet && clampstep >= MoveStep.ReelClamp_GetHeight)
{ {
RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01); RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
StringState = StringStateE.ManualOut; StringState = StringStateE.ManualOut;
return crc.GetString(L.string_begin_release, "开始释放料串"); return crc.GetString(L.string_begin_release, "开始释放料串");
} }
if (step == MoveStep.StringReadyPut) if (stringStep == MoveStep.StringReadyPut)
{ {
RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01); RequestTakeOutReel = true;
StringState = StringStateE.ManualOut;
return crc.GetString(L.string_begin_release, "开始释放料串"); return crc.GetString(L.string_begin_release, "开始释放料串");
} }
LogUtil.info($"料串无法释放,料仓正在出入库中:{StringMoveInfo.MoveStep}"); LogUtil.info($"料串无法释放,料仓正在出入库中:{StringMoveInfo.MoveStep}");
......
DeviceLibrary/theMachine/MainMachine_Store.cs
...@@ -107,7 +107,7 @@ namespace DeviceLibrary ...@@ -107,7 +107,7 @@ namespace DeviceLibrary
else else
boxTransport.IgnoreX09 = false; boxTransport.IgnoreX09 = false;
TurnToOut(); TurnToOut();
if (IsPutReelReady && OutStoreJobList.Dequeue(out JobInfo jobInfo)) if (IsPutReelReady && !RequestTakeOutReel && OutStoreJobList.Dequeue(out JobInfo jobInfo))
{ {
StoreMoveInfo.NewMove(MoveStep.StoreOut10); StoreMoveInfo.NewMove(MoveStep.StoreOut10);
StoreMoveInfo.MoveParam.PosID = jobInfo.PosId; StoreMoveInfo.MoveParam.PosID = jobInfo.PosId;
......
DeviceLibrary/theMachine/MainMachine_String.cs
...@@ -30,6 +30,11 @@ namespace DeviceLibrary ...@@ -30,6 +30,11 @@ namespace DeviceLibrary
get => StringMoveInfo.MoveStep == MoveStep.StringReadyPut; get => StringMoveInfo.MoveStep == MoveStep.StringReadyPut;
} }
/// <summary> /// <summary>
/// 请求取出出库料盘
/// 当前出库料盘出完，不出下一盘
/// </summary>
public bool RequestTakeOutReel = false;
/// <summary>
/// 通知料盘已取走 /// 通知料盘已取走
/// </summary> /// </summary>
void ReelGetted(bool success = true) void ReelGetted(bool success = true)
...@@ -328,6 +333,20 @@ namespace DeviceLibrary ...@@ -328,6 +333,20 @@ namespace DeviceLibrary
StringMoveInfo.log($"当前服务器反馈没有出库任务, 料串下降待机"); StringMoveInfo.log($"当前服务器反馈没有出库任务, 料串下降待机");
StringMoveInfo.NextMoveStep(MoveStep.StringOut_01); StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
} }
else if(RequestTakeOutReel)
{
StringMoveInfo.log($"请求取出出库料盘,料串下降");
RobotManage.mainMachine.StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
StringState = StringStateE.ManualOut;
}
else if(ServerCM.queueTaskCount != 0)
{
StringMoveInfo.log($"当前服务器反馈有出库任务：{ServerCM.queueTaskCount}");
}
else if (!boxTransport.IsComplateOrFree)
{
StringMoveInfo.log($"等待料盘转移完成");
}
break; break;
case MoveStep.StringReelPut: case MoveStep.StringReelPut:
if (Setting_Init.Device_OutStoreStringReelCheck) { if (Setting_Init.Device_OutStoreStringReelCheck) {
...@@ -408,6 +427,7 @@ namespace DeviceLibrary ...@@ -408,6 +427,7 @@ namespace DeviceLibrary
break; break;
case MoveStep.StringOut_01: case MoveStep.StringOut_01:
StringMoveInfo.NextMoveStep(MoveStep.StringOut_Released); StringMoveInfo.NextMoveStep(MoveStep.StringOut_Released);
RequestTakeOutReel = false;
StringMoveInfo.log($"料串下降到P1点"); StringMoveInfo.log($"料串下降到P1点");
Batch_Axis.AbsMove(StringMoveInfo, Config.Batch_P1, Config.Batch_P1_speed); Batch_Axis.AbsMove(StringMoveInfo, Config.Batch_P1, Config.Batch_P1_speed);
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitMsg("料串正在下降", MsgLevel.warning)); StringMoveInfo.WaitList.Add(WaitResultInfo.WaitMsg("料串正在下降", MsgLevel.warning));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!