Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 f4632008
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 74 行增加 和 25 行删除
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -206,9 +206,6 @@ ...@@ -206,9 +206,6 @@
<None Include="LineConfig\MoveEquip\Config_MoveEquip_09.csv"> <None Include="LineConfig\MoveEquip\Config_MoveEquip_09.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="LineConfig\StoreConfig_line.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -249,8 +249,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -249,8 +249,9 @@ namespace OnlineStore.DeviceLibrary
} }
public override void StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
{ {
return false;
} }
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -110,10 +110,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -110,10 +110,15 @@ namespace OnlineStore.DeviceLibrary
//判断流水线打开了才可以运行 //判断流水线打开了才可以运行
if (MoveInfo.MoveType.Equals(LineMoveType.None)) if (MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
if (LineManager.Line.CanProcessLine()) if (LineManager.Line.CanProcessLine()&&SecondMoveInfo.MoveType.Equals(LineMoveType.None))
{ {
StartCheckFixture(); StartCheckFixture();
} }
if (MoveInfo.MoveType.Equals(LineMoveType.None)&&Config.IsCanOut.Equals(false))
{
StartInStoreP();
}
} }
IOTimeOutProcess(); IOTimeOutProcess();
} }
...@@ -225,14 +230,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -225,14 +230,7 @@ namespace OnlineStore.DeviceLibrary
{ {
} }
public override bool StartOutStoreMove(InOutParam param)
{
return true;
}
protected override void OutStoreProcess()
{
}
/// <summary> /// <summary>
/// 是否需要拦截当前托盘进行处理 /// 是否需要拦截当前托盘进行处理
/// </summary> /// </summary>
...@@ -285,6 +283,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -285,6 +283,30 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.FL_TopCylinder_Down, IO_VALUE.LOW); IOMove(IO_Type.FL_TopCylinder_Down, IO_VALUE.LOW);
} }
} }
public void TrayLCylinderBefore(LineMoveInfo moveinfo = null)
{
IOMove(IO_Type.SL_TrayLocationCylinder_After, IO_VALUE.LOW);
IOMove(IO_Type.SL_TrayLocationCylinder_Before, IO_VALUE.HIGH);
if (moveinfo != null)
{
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder1_After, IO_VALUE.LOW));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder1_Before, IO_VALUE.HIGH));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder2_After, IO_VALUE.LOW));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder2_Before, IO_VALUE.HIGH));
}
}
public void TrayLCylinderAfter(LineMoveInfo moveinfo = null)
{
IOMove(IO_Type.SL_TrayLocationCylinder_After, IO_VALUE.HIGH);
IOMove(IO_Type.SL_TrayLocationCylinder_Before, IO_VALUE.LOW);
if (moveinfo != null)
{
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder1_After, IO_VALUE.HIGH));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder1_Before, IO_VALUE.LOW));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder2_After, IO_VALUE.HIGH));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocationCylinder2_Before, IO_VALUE.LOW));
}
}
} }
} }
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -462,7 +462,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -462,7 +462,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 开始入库移动移动 /// 开始入库移动移动
/// </summary> /// </summary>
public override void StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
{ {
//TODO:发送数据给服务器，获取需要入库的库位号，记录盘信息，料仓位置信息到缓存中 //TODO:发送数据给服务器，获取需要入库的库位号，记录盘信息，料仓位置信息到缓存中
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
...@@ -475,6 +475,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -475,6 +475,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitCanInstore()); MoveInfo.WaitList.Add(WaitResultInfo.WaitCanInstore());
MoveInfo.OneWaitCanEndStep = true; MoveInfo.OneWaitCanEndStep = true;
return true;
} }
protected override void InStoreProcess() protected override void InStoreProcess()
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -182,14 +182,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -182,14 +182,14 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 入库移动移动 /// 入库移动移动
/// </summary> /// </summary>
public override void StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
{ {
string posId = param != null ? param.PosId : ""; string posId = param != null ? param.PosId : "";
//调试模式移栽装置不需要有操作 //调试模式移栽装置不需要有操作
if (IsDebug) if (IsDebug)
{ {
LogInfo("需要入库【" + posId + "】处于调试模式，暂时不再进行出入库操作"); LogInfo("需要入库【" + posId + "】处于调试模式，暂时不再进行出入库操作");
return; return false ;
} }
if (runStatus.Equals(LineRunStatus.Runing)) if (runStatus.Equals(LineRunStatus.Runing))
{ {
...@@ -201,12 +201,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -201,12 +201,13 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.MI_07_UpDownCylinderDown); MoveInfo.NextMoveStep(LineMoveStep.MI_07_UpDownCylinderDown);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
UpdownDownMove(MoveInfo.MoveParam.PlateH); UpdownDownMove(MoveInfo.MoveParam.PlateH);
return true;
// CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down); // CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down);
} }
else else
{ {
LogUtil.error(Name + " 启动一个 入库【" + posId + "】运动失败，当前状态，storeStatus=" + runStatus); LogUtil.error(Name + " 启动一个 入库【" + posId + "】运动失败，当前状态，storeStatus=" + runStatus);
} }return false;
} }
protected override void InStoreProcess() protected override void InStoreProcess()
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
...@@ -202,9 +202,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -202,9 +202,9 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
} }
public override void StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
{ {
return false;
} }
protected override void InStoreProcess() protected override void InStoreProcess()
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 开始入库移动移动 /// 开始入库移动移动
/// </summary> /// </summary>
public abstract void StartInStoreMove(InOutParam param); public abstract bool StartInStoreMove(InOutParam param);
protected abstract void InStoreProcess(); protected abstract void InStoreProcess();
#endregion #endregion
...@@ -322,6 +322,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -322,6 +322,7 @@ namespace OnlineStore.DeviceLibrary
return sta; return sta;
} }
} }
public void CylinderMove(LineMoveInfo moveInfo, string IoLowType, string IoHighType) public void CylinderMove(LineMoveInfo moveInfo, string IoLowType, string IoHighType)
{ {
IOMove(IoLowType, IO_VALUE.LOW); IOMove(IoLowType, IO_VALUE.LOW);
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -445,17 +445,46 @@ namespace OnlineStore.DeviceLibrary ...@@ -445,17 +445,46 @@ namespace OnlineStore.DeviceLibrary
#region 入料装置入料处理，11000开始 #region 入料装置入料处理，11000开始
/// <summary> /// <summary>
/// 入口流水线转动 /// 入口流水线转动，等待入料检测信号消失
/// </summary> /// </summary>
FI_01_InLineStart=11001, FI_01_InLineStart=11001,
#endregion
/// <summary>
/// 入口流水线转动，等待阻挡气缸信号到位
/// </summary>
FI_02_InLineRun=11002,
/// <summary>
/// 入口流水线转动，等待入料阻挡信号消失
/// </summary>
FI_03_InLineStart = 11003,
/// <summary>
/// 入口流水线转动，等待定位工位检测到位
/// </summary>
FI_04_InLineRun = 11004,
/// <summary>
/// 已有工位检测信号，定位气缸上升
/// </summary>
FI_05_LocationUp=11005,
/// <summary>
/// 托盘定位气缸上升
/// </summary>
FI_06_TrayLocationUp=11006,
#endregion
#region 入料装置出料处理，12000开始
/// <summary>
///
/// </summary>
FO_01_OutLineStart = 11001,
#endregion
#region 出料装置移栽出料，20000开始 #region 出料装置移栽出料，20000开始
/// <summary> /// <summary>
/// 上下气缸下降 /// 上下气缸下降
/// </summary> /// </summary>
PO_01_UpDownCylinderDown =20001, PO_01_UpDownCylinderDown = 20001,
/// <summary> /// <summary>
/// 等待0.3秒后再夹紧 /// 等待0.3秒后再夹紧
/// </summary> /// </summary>
...@@ -518,9 +547,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -518,9 +547,6 @@ namespace OnlineStore.DeviceLibrary
DL_R_LineCheck=30100, DL_R_LineCheck=30100,
#endregion #endregion
} }
public enum LineAlarmType public enum LineAlarmType
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!