Skip to content

刘韬 / 1069_MIMO_PlUS

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

测试ok

1 个父辈 19e13667
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 83 行增加 和 26 行删除
Common/StringList.cs
......@@ -143,6 +143,7 @@ namespace OnlineStore.Common
before_FrmPositionTool_stopmuchine,
temp,
outstore_abnormal_reel,
instore_abnormal_reel
instore_abnormal_reel,
trigger_safety_light_curtains,
}
}
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
......@@ -704,7 +704,7 @@ namespace DeviceLibrary
string resultStr = HttpHelper.Post(server, "");
LogUtil.info(deviceName + "cancelPutInTask " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
ResultData data = JsonHelper.DeserializeJsonToObject<ResultData>(resultStr);
CanelResultData data = JsonHelper.DeserializeJsonToObject<CanelResultData>(resultStr);
if (data == null)
{
......@@ -807,6 +807,14 @@ namespace DeviceLibrary
public Dictionary<string, string> data { get; set; }
}
public class CanelResultData
{
//{"code":0,"msg":"ok","data":"7"}
public int code { get; set; }
public string msg { get; set; }
}
/// <summary>
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试
......
DeviceLibrary/theMachine/BoxTransport.cs
......@@ -29,6 +29,7 @@ namespace DeviceLibrary
public event Action<string, StoreMoveType, bool> InOutEndProcessEvent;
public bool IsComplateOrFree { get => MoveInfo.MoveStep == MoveStep.Wait; }
public bool IsTakedReel { get => MoveInfo.MoveStep >= MoveStep.StoreTS10; }
public bool IsPutOnOut { get => MoveInfo.MoveStep >= MoveStep.StoreTS16; }
/// <summary>
......@@ -118,19 +119,19 @@ namespace DeviceLibrary
case MoveStep.Wait:
break;
case MoveStep.StoreTS01:
if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
if (Common.IsManualHandleReelInFix()&&Common.IsInstore(storeMoveType))
{
IsNGReel = true;
MoveInfo.log($"{storeMoveType}:取料前料叉机构料盘检测X30亮，去单料口");
MoveInfo.EndMove();
ErrMsgTxt = "";
}
else
Msg.add(crc.GetString(L.out_store_detect_material, "取料前料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
//if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
//{
// if (Common.IsManualHandleReelInFix()&&Common.IsInstore(storeMoveType))
// {
// IsNGReel = true;
// MoveInfo.log($"{storeMoveType}:取料前料叉机构料盘检测X30亮，去单料口");
// MoveInfo.EndMove();
// ErrMsgTxt = "";
// }
// else
// Msg.add(crc.GetString(L.out_store_detect_material, "取料前料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//}
//else
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
......@@ -368,6 +369,30 @@ namespace DeviceLibrary
return false;
}
}
else
{
if(storeMoveType.Equals(StoreMoveType.InStore))
{
if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
{
if (Common.IsManualHandleReelInFix() && Common.IsInstore(storeMoveType))
{
IsNGReel = true;
MoveInfo.log($"{storeMoveType}:到库位前料叉机构料盘检测X30灭，去单料口");
MoveInfo.EndMove();
ErrMsgTxt = "";
return false;
}
else
Msg.add(crc.GetString(L.out_store_not_detect_material, "取料后料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
}
}
}
MoveInfo.NextMoveStep(MoveStep.StoreTS12);
break;
case MoveStep.StoreTS12:
......@@ -397,6 +422,8 @@ namespace DeviceLibrary
{
IsNGReel = true;
MoveInfo.log($"{storeMoveType}:放完料后料叉机构料盘检测X30亮，去单料口");
//入库异常，屏蔽库位
ServerCommunication.DisablePos(mainMachine.Name, To?.Reel?.WareCode, To?.Reel?.PosID, "入库时料盘放入库位后，料叉检测到信号");
MoveInfo.EndMove();
ErrMsgTxt = "";
}
......@@ -415,8 +442,8 @@ namespace DeviceLibrary
break;
case MoveStep.StoreTS16:
MoveInfo.NextMoveStep(MoveStep.StoreTS17);
if (From.posid != BoxStorePosition.strings && From.posid != BoxStorePosition.ngdoor
&& To.posid != BoxStorePosition.strings && To.posid != BoxStorePosition.ngdoor
if (From?.posid != BoxStorePosition.strings && From?.posid != BoxStorePosition.ngdoor
&& To?.posid != BoxStorePosition.strings && To?.posid != BoxStorePosition.ngdoor
)
{
MoveInfo.log($"{storeMoveType}:库位测试模式,上下轴,旋转不返回待机点");
......
DeviceLibrary/theMachine/MainMachine.cs
......@@ -640,7 +640,7 @@ namespace DeviceLibrary
//IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW) &&
if (IOValue(IO_Type.AGV_OnPosition).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.LOW))
{
Msg.add("料串门光栅被遮挡", MsgLevel.warning);
Msg.add(crc.GetString(L.trigger_safety_light_curtains, "料串门光栅被遮挡"), MsgLevel.warning);
//if (lastStringSafetyStatus)
//{
// lastStringSafetyStatus = false;
......
DeviceLibrary/theMachine/MainMachine_AGV.cs
......@@ -72,6 +72,8 @@ namespace DeviceLibrary
/// </summary>
void needEnter(NodeStatus nodeStatus)
{
if (!UseAgv())
return;
if (nodeStatus.Equals(NodeStatus.NeedEnter) ||
nodeStatus.Equals(NodeStatus.NeedEnter_Empty) ||
nodeStatus.Equals(NodeStatus.NeedEnter_Full))
......@@ -91,6 +93,8 @@ namespace DeviceLibrary
/// </summary>
void needLeave(NodeStatus nodeStatus)
{
if (!UseAgv())
return;
if (nodeStatus.Equals(NodeStatus.NeedLeave) ||
nodeStatus.Equals(NodeStatus.NeedLeave_Full) ||
nodeStatus.Equals(NodeStatus.NeedLeave_Empty))
......
DeviceLibrary/theMachine/MainMachine_Clamp.cs
......@@ -85,8 +85,18 @@ namespace DeviceLibrary
{
if (IsGetReelReady && StoreMoveInfo.MoveStep == MoveStep.Wait && OutSingleJobList.Count == 0)
{
ClampMoveInfo.NewMove(MoveStep.ReelClamp_01);
OpenFlipDoor(ClampMoveInfo);
if (!boxTransport.IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_02);
CloseFlipDoor(StoreMoveInfo);
StoreMoveInfo.log($"取料前料叉机构料盘检测X30亮，去单料口");
}
else
{
ClampMoveInfo.NewMove(MoveStep.ReelClamp_01);
OpenFlipDoor(ClampMoveInfo);
}
}
}
else
......
DeviceLibrary/theMachine/MainMachine_Store.cs
......@@ -117,11 +117,17 @@ namespace DeviceLibrary
StoreMoveInfo.log($"开始转运料盘");
break;
case MoveStep.StoreIn02:
break;
case MoveStep.StoreIn03:
if (boxTransport.IsNGReel)
{
StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_01);
if (boxTransport.IsComplateOrFree)
{
ClampMoveInfo.log($"入库NG，结束处理");
ClampMoveInfo.EndMove();
}
boxTransport.IsNGReel = false;
StoreMoveInfo.log($"入库料盘被判定为NG，准备送往单料口");
}
......
TheMachine/resources/en-US.lngres
......@@ -402,4 +402,5 @@ r_flipDoor_no_work 右侧翻板水平信号未亮 The right flap horizontal sign
reel_not_in_right_status 料盘放置异常 The reel is placed abnormally
confirm_no_reel_in_com 请确保料盘已从库位中取出 Make sure that the reel has been removed from the location
outstore_abnormal_reel The material tray is not successfully put into the string, please check
instore_abnormal_reel During the warehousing process, the fork detects the abnormality of the tray
\ No newline at end of file
instore_abnormal_reel 入库过程中料叉检测料盘异常 During the warehousing process, the fork detects the abnormality of the tray
trigger_safety_light_curtains 料串门光栅被遮挡 the grating of the string gate is occluded
\ No newline at end of file
TheMachine/resources/zh-CN.lngres
......@@ -374,10 +374,10 @@ string_full_takeout 料串已满请取出 料串已满请取出
in_store_nothave_position 入库未找到库位 入库未找到库位
string_not_onposition 回原时X09,X10信号异常,料串可能不在正确位置,请检查. 回原时X09,X10信号异常,料串可能不在正确位置,请检查.
tray_detect_reel_01 料叉传感器X30感应到有料,请人工确认 料叉传感器X30感应到有料,请人工确认
system_running_cantmove 系统正在运行,不能手动控制伺服
before_FrmPositionTool_stopmuchine 运行库位校准程序前,需要先停止料仓的运行
outstore_abnormal_reel 出库时料盘未成功放入料串,请检查
instore_abnormal_reel 入库过程中料叉检测料盘异常
system_running_cantmove 系统正在运行,不能手动控制伺服 系统正在运行,不能手动控制伺服
before_FrmPositionTool_stopmuchine 运行库位校准程序前,需要先停止料仓的运行 运行库位校准程序前,需要先停止料仓的运行
outstore_abnormal_reel 出库时料盘未成功放入料串,请检查 出库时料盘未成功放入料串,请检查
instore_abnormal_reel 入库过程中料叉检测料盘异常 入库过程中料叉检测料盘异常
Res0004 收到出库任务,但料叉上有料,无法启动,请检查 收到出库任务,但料叉上有料,无法启动,请检查
......@@ -386,7 +386,7 @@ selImage 请先选择图片 请先选择图片
title 提示 提示
imageIsNull 获取二维码图片为空 获取二维码图片为空
sureDelete 确定删除文件： 确定删除文件：
trigger_safety_light_curtains 料串门光栅被遮挡 料串门光栅被遮挡
l_flipDoor_no_work 左侧翻板水平信号未亮 左侧翻板水平信号未亮
r_flipDoor_no_work 右侧翻板水平信号未亮 右侧翻板水平信号未亮
reel_not_in_right_status 料盘放置异常 料盘放置异常
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!