Skip to content

李娜 / SO908-XLRStore

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

存储机构-出库状态更改

1 个父辈 0f3bc4b9
内嵌 并排
正在显示 3 个修改的文件 包含 15 行增加 和 12 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
......@@ -384,18 +384,20 @@ namespace OnlineStore.DeviceLibrary
if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.LOW) || IOValue(IO_Type.UnderArea_Check_A).Equals(IO_VALUE.LOW))
{
MoveInfo.NextMoveStep(StepEnum.BOX_H0103_ToAInputHighPos);
ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
XAxis_A.AbsMove(MoveInfo, Config.XAxis_A_P2, Config.XAxis_A_P2_Speed);
if (UpdownAxis.GetAclPosition() >= (Config.Updown_P5 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P4 + axisDiff)
&& (IOValue(IO_Type.UnderArea_Check_A).Equals(IO_VALUE.LOW)|| BufferDataManager.AOutStoreInfo ==null))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A下暂存区低点和高点之间,到高点P4,A面移栽X轴去暂存区P2,A面压紧轴到压紧前点P2");
ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
XAxis_A.AbsMove(MoveInfo, Config.XAxis_A_P2, Config.XAxis_A_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.Updown_P4_Speed);
}
else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P3 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P2 + axisDiff)
&& (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.LOW) || BufferDataManager.AInStoreInfo==null))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点和高点之间,到高点P2,A面移栽X轴去暂存区P2，A面压紧轴到压紧前点P2");
ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
XAxis_A.AbsMove(MoveInfo, Config.XAxis_A_P2, Config.XAxis_A_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2, Config.Updown_P2_Speed);
}
else
......@@ -437,18 +439,20 @@ namespace OnlineStore.DeviceLibrary
if (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW) || IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW))
{
MoveInfo.NextMoveStep(StepEnum.BOX_H0105_ToBInputHighPos);
ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed);
if (UpdownAxis.GetAclPosition() >= (Config.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P10 + axisDiff)&&
(IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW)|| BufferDataManager.BOutStoreInfo ==null))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed);
}
else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P8 + axisDiff)&&
(IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW)|| BufferDataManager.BInStoreInfo==null))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8, Config.Updown_P8_Speed);
}
else
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
......@@ -207,6 +207,7 @@ namespace OnlineStore.DeviceLibrary
case StepEnum.SO_17_InOutToBuff:
MoveInfo.NextMoveStep(StepEnum.SO_18_PutReel);
LogInfo($"出库 {MoveInfo.SLog}：放料盘，移栽升降轴到下暂存区放料低点P5/P11，移栽压紧轴到压紧前点P2");
SetBoxStatus(DeviceStatus.OutStoreBoxEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
UpdownAxisTo_P5_P11();
ComAxis_To_P2();
break;
......@@ -216,7 +217,6 @@ namespace OnlineStore.DeviceLibrary
XAxis_To_P1();
//出库料盘放置成功，将料盘信息写入对应出料口
SetReelInfoToBuff();
SetBoxStatus(DeviceStatus.OutStoreBoxEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
break;
case StepEnum.SO_19_InOutBackFromBuff:
if (MoveInfo.MoveParam.PosInfoBack == null)
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
......@@ -485,7 +485,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// <param name="deviceStatus">设备上报服务端的状态</param>
/// <param name="runStatus">设备显示的状态</param>
private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus,string lastPosId="")
private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus, string lastPosId = "")
{
if (!string.IsNullOrEmpty(lastPosId))
this.lastPosId = lastPosId;
......@@ -592,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));
MoveInfo.NewMove(MoveType.InStore, param);
IgnoreCamDect = false;
SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy,param.PosInfo.PosId);
SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, param.PosInfo.PosId);
MoveInfo.NextMoveStep(StepEnum.SI_00_StartInstore);
return true;
}
......@@ -688,10 +688,9 @@ namespace OnlineStore.DeviceLibrary
public void StartExecuctOut(InOutParam param)
{
bool result = false;
if (OutDoorCheck(param))
{
result = StartOutstore(param);
}
if (!OutDoorCheck(param))
return;
result = StartOutstore(param);
if (!result)
{
lock (outStoreObject)
......@@ -739,7 +738,7 @@ namespace OnlineStore.DeviceLibrary
}
startOutStoreTime = DateTime.Now;
param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy,param.PosInfo.PosId);
SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, param.PosInfo.PosId);
MoveInfo.NewMove(MoveType.OutStore, param);
LogInfo("启动出库【" + param.PosInfo.ToStr() + "】 ");
LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!