Skip to content

李娜 / SO908-XLRStore

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

入库调试修改

1 个父辈 3ffab84f
内嵌 并排
正在显示 5 个修改的文件 包含 34 行增加 和 43 行删除
source/DeviceLibrary/manager/model/DeviceMoveInfo.cs
......@@ -164,7 +164,7 @@ namespace OnlineStore.DeviceLibrary
LastSetpTime = DateTime.Now;
WaitList = new List<WaitResultInfo>();
WriteIoList = new List<WriteIOInfo>();
MoveNum++;
MoveNum++;
}
public void NewMove(MoveType type, InOutParam param)
{
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs
......@@ -132,7 +132,7 @@ namespace OnlineStore.DeviceLibrary
}
WarnMsg = "";
alarmType = AlarmType.None;
MoveInfo.NewMove(MoveType.Reset);
MoveInfo.NewMove(MoveType.Reset,new InOutParam());
MoveInfo.NextMoveStep(StepEnum.IBR01_StopDown);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
WorkLog("开始复位，定位气缸下降");
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
......@@ -40,22 +40,14 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(Name + "StartInstore 失败，料串" + CurrShelf.ToStr() + "需要离开，NeedLeave:" + Config.AgvName + "," + CurrShelf.ShelfRfid + ",agvcallresult:" + agvcallresult.ToString());
return false;
}
//if (Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH) && Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH))
//{
// MoveInfo.NewMove(MoveType.InStore);
// MoveInfo.MoveParam = new InOutParam();
// //判断是哪个工位有料串
// IB05_StopUp();
//}
else if (Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH) )
{
MoveInfo.NewMove(MoveType.InStore);
MoveInfo.NewMove(MoveType.InStore,new InOutParam());
IB03_LineStart();
}
else if(Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH))
else if(Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.NewMove(MoveType.InStore);
MoveInfo.NewMove(MoveType.InStore, new InOutParam());
IB04_LineWait();
}
else
......@@ -139,29 +131,15 @@ namespace OnlineStore.DeviceLibrary
}
if (MoveInfo.IsStep(StepEnum.IB02_BatchAxisToP1))
{
//MoveInfo.NextMoveStep(StepEnum.IB03_LineStart);
//WorkLog("料串入料 ：开始转动链条");
//LineRun(MoveInfo);
////等待指定时间
//MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
IB03_LineStart();
}
else if (MoveInfo.IsStep(StepEnum.IB03_LineStart))
{
//if (Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH) && Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH))
//{
// IB05_StopUp();
//}
//else
if (Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH))
{
//MoveInfo.NextMoveStep(StepEnum.IB03_LineStart);
//WorkLog(" 入口检测到料串，流水线转动 6000，等待料串完全进入轨道");
//LineRun(MoveInfo);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(6000));
IB03_LineStart();
}
else if (Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH))
else if (Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH))
{
IB04_LineWait();
}
......@@ -171,9 +149,19 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndMove();
LogUtil.info(" 未检测到料串，入料结束");
}
}else if (MoveInfo.IsStep(StepEnum.IB04_LineWait))
}
else if (MoveInfo.IsStep(StepEnum.IB04_LineWait))
{
IB05_StopUp();
if (Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH))
{
IB05_StopUp();
}
else
{
LineStop();
MoveInfo.EndMove();
LogUtil.info(" 未检测到料串，入料结束");
}
}
else if (MoveInfo.IsStep(StepEnum.IB06_WaitTime))
{
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
......@@ -80,7 +80,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("StartRun ： 开始启动 ");
runStatus = RunStatus.HomeMoving;
MoveInfo.NewMove(MoveType.RHome);
MoveInfo.NewMove(MoveType.RHome,new InOutParam());
if (!BatchMove_A.Reset())
{
......@@ -117,7 +117,7 @@ namespace OnlineStore.DeviceLibrary
}
LogInfo("Reset 开始重置 ");
runStatus = RunStatus.Reset;
MoveInfo.NewMove(MoveType.Reset);
MoveInfo.NewMove(MoveType.Reset,new InOutParam());
if (!BatchMove_A.Reset())
{
SetWarnMsg("复位失败：A料口复位失败");
......
source/XLRStoreClient/useControl/EquipControl.cs
......@@ -63,18 +63,21 @@ namespace OnlineStore.XLRStore
if (MoveInfo.MoveType.Equals(MoveType.InStore))
{
str = "入库中：";
InOutPosInfo pos = MoveInfo.MoveParam.PosInfo;
if (pos != null)
if (MoveInfo.MoveParam != null && (MoveInfo.MoveParam.PosInfo != null))
{
if (pos.IsNG)
{
str = "NG料：" + pos.PosId + "_" + pos.barcode;
}
else
InOutPosInfo pos = MoveInfo.MoveParam.PosInfo;
if (pos != null)
{
str = "入库中：" + pos.PosId + "_" + pos.barcode;
}
if (pos.IsNG)
{
str = "NG料：" + pos.PosId + "_" + pos.barcode;
}
else
{
str = "入库中：" + pos.PosId + "_" + pos.barcode;
}
}
}
}
else if (MoveInfo.MoveType.Equals(MoveType.OutStore))
......@@ -94,7 +97,7 @@ namespace OnlineStore.XLRStore
else if (pos.cutReel)
{
str = "出库中：" + pos.PosId + "_" + pos.barcode;
}
}
}
}
lblMoveInfo.Text = str;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!