Skip to content

李娜 / SO664-AssemblyLine

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

出料线分配逻辑修改

1 个父辈 f4c7862c
内嵌 并排
正在显示 8 个修改的文件 包含 61 行增加 和 81 行删除
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -226,7 +226,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("从调试状态切换到正常状态！");
}
}
else if (baseConfig.DType.Equals(DeviceType.MoveEquip))
else if (baseConfig.DType.Equals(DeviceType.HYEquip))
{
if (isDebug)
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -153,20 +153,16 @@ namespace OnlineStore.DeviceLibrary
break;
case LineMoveStep.FR_01_StopUp:
MoveInfo.NextMoveStep(LineMoveStep.FR_02_LineRun);
//阻挡上升
//if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
//{
// LogInfo(MoveInfo.MoveType + "：" + MoveInfo.SLog + "：开始复位，放料顶升下降， 所有阻挡上升，检测到定位工位有信号，不转动链条");
//}
//else
//{
LogInfo(MoveInfo.MoveType + "：" + MoveInfo.SLog + "：开始复位，放料顶升下降， 所有阻挡上升，链条先转动 3000 ");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
//线体开始转动
AllLineMove(IO_VALUE.HIGH);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.HIGH));
//MoveInfo.OneWaitCanEndStep = true;
//}
int time = 4000;
if (HasOutLine)
{
time = 6000;
}
LogInfo(MoveInfo.MoveType + "：" + MoveInfo.SLog + "：开始复位，放料顶升下降， 所有阻挡上升，链条先转动 " + time + " ");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(time));
//线体开始转动
AllLineMove(IO_VALUE.HIGH);
break;
case LineMoveStep.FR_02_LineRun:
MoveInfo.NextMoveStep(LineMoveStep.FR_03_CylinderUp);
......@@ -194,7 +190,7 @@ namespace OnlineStore.DeviceLibrary
break;
case LineMoveStep.FR_05_UpdownAxis_P1:
if (UpdownIsInP1())
{
{
MoveInfo.NextMoveStep(LineMoveStep.FR_06_CylinderGive);
if (Config.IsCanOut.Equals(1))
{
......@@ -244,9 +240,9 @@ namespace OnlineStore.DeviceLibrary
LogInfo(MoveInfo.MoveType + "：" + MoveInfo.SLog + "： 定位气缸下降 ，夹紧气缸放松");
LocationCylinderDown(MoveInfo);
//CylinderMove(MoveInfo, IO_Type.SL_OutTopCylinder_Up, IO_Type.SL_OutTopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SL_ClampCylinder_Work, IO_Type.SL_ClampCylinder_Relax );
break;
case LineMoveStep.FR_15_TopDown:
CylinderMove(MoveInfo, IO_Type.SL_ClampCylinder_Work, IO_Type.SL_ClampCylinder_Relax);
break;
case LineMoveStep.FR_15_TopDown:
RFIDData data = RFIDManager.GetShelfId(DeviceID);
if (data.Num > 0)
{
......@@ -280,15 +276,15 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.HIGH));
}
break;
case LineMoveStep.FR_17_BatchAxisToP1:
case LineMoveStep.FR_17_BatchAxisToP1:
MoveInfo.NextMoveStep(LineMoveStep.FR_18_ClampCheck);
DebugInfo(MoveInfo.MoveType + " : 等待夹爪料盘检测信号无料");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_ClampCylinder_Check, IO_VALUE.LOW));
break;
case LineMoveStep.FR_18_ClampCheck:
case LineMoveStep.FR_18_ClampCheck:
LogInfo("重置完成！");
MoveEndS();
break;
default: break;
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
......@@ -3,10 +3,7 @@ using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
......@@ -98,9 +95,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY_R_02StopMove))
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
MoveEndS();
}
}
}
......@@ -208,7 +204,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
LogInfo("托盘检测，" + MoveInfo.SLog + " 检测到托盘 ，阻挡上升");
CheckLog("托盘检测，" + MoveInfo.SLog + " 检测到托盘 ，阻挡上升");
if (Config.DOList.ContainsKey(IO_Type.HY_FrontStopDown))
{
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
......@@ -238,7 +234,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘，前阻挡下降");
CheckLog(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘，前阻挡下降");
ClearTrayRFID();
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
MoveInfo.OneWaitCanEndStep = true;
......@@ -320,7 +316,7 @@ namespace OnlineStore.DeviceLibrary
{
//未检测到信号或阻挡下降失败，结束处理
LogInfo(MoveInfo.SLog + "未等到信号 HY_FrontStopCheck=LOW 或 HY_TrayCheck=LOW 结束处理 ");
MoveInfo.EndMove();
MoveEndS();
}
}
else if (MoveInfo.IsStep(LineMoveStep.HY03_FrontStopUp))
......@@ -335,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
{
//未检测到信号或阻挡下降失败，结束处理
LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
MoveInfo.EndMove();
MoveEndS();
}
}
else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime))
......@@ -437,8 +433,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY35_IOL_TopDown))
{
CheckLog("C1线->出料线" + MoveInfo.SLog + " ，结束处理 ");
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
MoveEndS();
ClearTrayRFID();
}
#endregion
......@@ -530,8 +526,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY17_TopDown))
{
CheckLog("托盘横移" + MoveInfo.SLog + " ，结束横移处理 ");
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
ClearTrayRFID();
MoveEndS();
}
#endregion
......@@ -707,8 +703,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY95_StopDownUp))
{
CheckLog(" 结束托盘处理 ");
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
ClearTrayRFID();
MoveEndS();
}
#endregion
......@@ -919,7 +915,7 @@ namespace OnlineStore.DeviceLibrary
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel.Equals(false) && param.cutReel.Equals(false))
{
LogInfo(" C1->出料线：工单料" + "" + param.ToStr());
//LogInfo(" C1->出料线：工单料" + "" + param.ToStr());
List<int> leftLineList= new List<int> { 204, 206 };
List<int> rightLineList = new List<int> { 213, 216 };
List<int> mustLine = new List<int>();
......@@ -1004,7 +1000,7 @@ namespace OnlineStore.DeviceLibrary
{
if (DeviceID.Equals(216) || DeviceID.Equals(213))
{
if (LastValue <= 2)
if (LastValue.Equals(0) )
{
LogInfo(" C1->出料线：工单料，随意放"+ LastValue+"," + "" + param.ToStr());
LastValue++;
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -95,9 +95,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY_R_02StopMove))
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
MoveEndS();
}
}
}
......@@ -204,7 +203,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
LogInfo("检测托盘，" + MoveInfo.SLog + " ，阻挡上升");
CheckLog("检测托盘，" + MoveInfo.SLog + " ，阻挡上升");
UpdateTrayNum();
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
MoveInfo.OneWaitCanEndStep = true;
......@@ -215,7 +214,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.HY56_CheckWait);
LogInfo("检测托盘，" + MoveInfo.SLog + " ，阻挡上升，等待托盘检测");
CheckLog("检测托盘，" + MoveInfo.SLog + " ，阻挡上升，等待托盘检测");
UpdateTrayNum();
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
......@@ -235,7 +234,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID");
CheckLog(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID");
ClearTrayRFID();
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
MoveInfo.OneWaitCanEndStep = true;
......@@ -293,7 +292,7 @@ namespace OnlineStore.DeviceLibrary
{
//未检测到信号或阻挡下降失败，结束处理
LogInfo(MoveInfo.SLog + "未等到信号 HY_FrontStopCheck=HIGH 或 HY_TrayCheck=LOW 结束处理 ");
MoveInfo.EndMove();
MoveEndS();
}
}
else if (MoveInfo.IsStep(LineMoveStep.HY03_FrontStopUp))
......@@ -310,7 +309,7 @@ namespace OnlineStore.DeviceLibrary
{
//未检测到信号或阻挡下降失败，结束处理
LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
MoveInfo.EndMove();
MoveEndS();
}
}
else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime))
......@@ -338,7 +337,7 @@ namespace OnlineStore.DeviceLibrary
{
//未检测到信号或阻挡下降失败，结束处理
LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
MoveInfo.EndMove();
MoveEndS();
}
}
......@@ -457,9 +456,9 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsStep(LineMoveStep.HY17_TopDown))
{
CheckLog("托盘横移" + MoveInfo.SLog + " ，结束横移处理 ");
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
CheckLog("托盘横移" + MoveInfo.SLog + " ，结束横移处理，清理托盘号 ");
ClearTrayRFID();
MoveEndS();
}
#endregion
......@@ -564,9 +563,9 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsStep(LineMoveStep.HY65_TopUp))
{
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
CheckLog("托盘阻挡" + MoveInfo.SLog + " 处理完成");
CheckLog("托盘阻挡" + MoveInfo.SLog + " 处理完成，清理托盘号");
ClearTrayRFID();
MoveEndS();
}
else
{
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
......@@ -119,8 +119,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.JHY_R05_ClampCheck))
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
MoveEndS();
}
else
{
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
......@@ -261,6 +261,7 @@ namespace OnlineStore.DeviceLibrary
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
{
CheckLog(" 托盘放行结束");
ClearTrayRFID();
SecondMoveInfo.EndMove();
}
else
......@@ -297,7 +298,7 @@ namespace OnlineStore.DeviceLibrary
int robotIndex = GetRobotIndex();
string code = SecondMoveInfo.MoveParam.WareCode;
string result = SServerManager.GetTraySize(Name, robotIndex, code, out LastWidth);
LogUtil.info(Name + MoveInfo.SLog + "接驳台托盘[" + currTrayNum + "] [" + code + "] 获取尺寸【" + LastWidth + "】【" + result + "】");
OutLog( "接驳台托盘[" + currTrayNum + "] [" + code + "] 获取尺寸【" + LastWidth + "】【" + result + "】");
if (LastWidth > 0)
{
......@@ -317,7 +318,8 @@ namespace OnlineStore.DeviceLibrary
if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_10_ReelProEnd);
LogUtil.info(Name + " 接驳台托盘" + SecondMoveInfo.SLog + "：料盘已移走，更新托盘[" + currTrayNum + "]为空");
OutLog(Name + " 料盘已移走，更新托盘[" + currTrayNum + "]为空");
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：料盘已移走，更新托盘[" + currTrayNum + "]为空");
TrayManager.UpdateTrayInfo(currTrayNum);
}
else
......@@ -436,7 +438,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(LineMoveType.OutStore);
MoveInfo.MoveParam = param;
MoveInfo.NextMoveStep(LineMoveStep.JM_01_UpdownToP1);
OutLog("托盘移栽【" + param.ToShortStr() + "】升降气缸上升 ");
OutLog("托盘移栽 升降气缸上升 ");
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
return true;
}
......@@ -576,7 +578,7 @@ namespace OnlineStore.DeviceLibrary
string code = MoveInfo.MoveParam.WareCode;
if (MoveInfo.MoveParam.urgentReel)
{
LogUtil.info(Name + MoveInfo.SLog + logName + "，紧急料已放入NG箱，发送 afterPutCut [" + code + "] ");
OutLog(logName + MoveInfo.SLog + "，紧急料已放入NG箱，发送 afterPutCut ");
TaskData taskData;
string msg = SServerManager.afterPutCut(Name, "BN", code, "", 1, out taskData);
afterPutCutOK = true;
......@@ -584,7 +586,7 @@ namespace OnlineStore.DeviceLibrary
else if (!MoveInfo.MoveParam.InStoreNg)
{
int robotIndex = GetRobotIndex();
LogUtil.info(Name + MoveInfo.SLog + logName + "，工单料到达接驳台，发送 arriveRobotLocation=" + robotIndex + "[" + code + "]");
OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台，发送 arriveRobotLocation ");
string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
afterPutCutOK = true;
}
......@@ -612,9 +614,7 @@ namespace OnlineStore.DeviceLibrary
if (afterPutCutOK)
{
ClearTimeoutAlarm("给服务器发送 "+ log + " 完成");
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
OutLog(logName + MoveInfo.SLog + "：结束 ");
MoveEndS();
}
else if (MoveInfo.IsTimeOut(60))
{
......
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
......@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.OHY22_TrayLeave))
{
CheckLog("出料线横移" + MoveInfo.SLog + " 横移结束");
MoveInfo.EndMove();
MoveEndS();
}
else
{
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -906,6 +906,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (SecondMoveInfo.IsStep(LineMoveStep.MO_19_StopUp))
{
ClearTrayRFID();
CheckLog("托盘放行 SecondMove：(托盘放行结束） ");
SecondMoveInfo.EndMove();
}
......@@ -913,21 +914,10 @@ namespace OnlineStore.DeviceLibrary
}
private void MO_16_Stop2Down()
{
//if (LineManager.Line.Move9CanStop2Down(DeviceID,currTrayNum))
//if (true)
//{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
//}
//else if (SecondMoveInfo.IsTimeOut(120))
//{
// WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待分流横移1空闲[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
// LogUtil.error(WarnMsg, DeviceID * 1000 + 12);
// Alarm(LineAlarmType.IoSingleTimeOut);
//}
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
}
#endregion
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!