Commit 1ea47368 张东亮

放完料就上报完成

1 个父辈 71a400ab
using OnlineStore;
using AGVLib;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -427,6 +428,14 @@ namespace DeviceLibrary
break;
case MoveStep.StoreTS14:
MoveInfo.NextMoveStep(MoveStep.StoreTS15);
if (Common.IsInstore(storeMoveType))
{
if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd))
{
Msg.add(crc.GetString("Res0008", "服务器连接异常"), MsgLevel.warning);
return false;
}
}
InOut_Axis.AbsMove(MoveInfo, Config.InOut_P1, Config.InOut_P1_speed);
MoveInfo.log($"{storeMoveType}:进出轴去待机点P1[{Config.InOut_P1}]");
break;
......
......@@ -64,7 +64,7 @@ namespace DeviceLibrary
public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; }
public event Action<string, StoreMoveType, bool> InOutEndProcessEvent;
ServerCommunication ServerCM = new ServerCommunication();
public ServerCommunication ServerCM = new ServerCommunication();
/// <summary>
/// 开始运行的时间
/// </summary>
......@@ -487,7 +487,7 @@ namespace DeviceLibrary
{
Msg.add(crc.GetString(L.x29_low_no_reel, "检测相机打开失败."), MsgLevel.alarm);
}
else if (!h.Value)
else if (!h.Value)
{
Msg.add(crc.GetString(L.x29_low_no_reel, "传感器未检测到单料口料盘."), MsgLevel.alarm);
RobotManage.UserPause(crc.GetString("x29_low_no_reel", "传感器未检测到单料口料盘."));
......@@ -651,7 +651,7 @@ namespace DeviceLibrary
}
else if (!lastStringDoorSafetyStatus)
{
// StringDoor.ResumeSingle();
// StringDoor.ResumeSingle();
lastStringDoorSafetyStatus = true;
}
}
......@@ -707,14 +707,14 @@ namespace DeviceLibrary
MoveInfo.List.ForEach((m) => { m.CanWhileCount = 5; });
SafetyDevice.PauseAll();
StringDoor.Pause();
if (runStatus == RunStatus.HomeReset)
{
ResetMoveInfo.NewMove(MoveStep.H01_HomeReset);
}
}
}
bool lastStringDoorSafetyStatus=true;
bool lastStringDoorSafetyStatus = true;
void StringDoorSuddenStop()
{
if (lastStringDoorSafetyStatus)
......@@ -727,7 +727,7 @@ namespace DeviceLibrary
{
ResetMoveInfo.NewMove(MoveStep.H01_HomeReset);
}
lastStringDoorSafetyStatus=false;
lastStringDoorSafetyStatus = false;
}
}
/// <summary>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!