Commit ac395c8a 张东亮

1

1 个父辈 a3224e28
......@@ -80,15 +80,18 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.debug($"{Name} 处理1");
if (Robot.IOValue(Config.IO_AGV_RequestIn).Equals(IO_VALUE.HIGH))
{
ShelfEnterProcess("", "");
}else if (Robot.AutoInput && Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH))
{
LogUtil.debug($"{Name} 处理2");
StartInstore(new InOutParam());
}
else if (Robot.AutoInput && Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH))
{
LogUtil.debug($"{Name} 处理3");
StartInstore(new InOutParam());
}
}
......
......@@ -38,16 +38,20 @@ namespace OnlineStore.DeviceLibrary
//{
// return false;
//}
LogUtil.debug($"{Name} 处理4");
if (doorInfo.status == doorStatusE.fullBoxNeedLeave)
{
return false;
}
LogUtil.debug($"{Name} 处理5");
if (AgvClient.GetAction(Config.AgvName) == ClientAction.NeedLeave || AgvClient.GetAction(Config.AgvName) == ClientAction.MayLeave)
{
//WorkLog("料串入料 :等待AGV来取空料串1");
return false;
}
LogUtil.debug($"{Name} 处理6");
UpdateShelf(1);
LogUtil.debug($"{Name} 处理7");
if (CurrShelf.ShelfState.Equals(3))
{
//bool agvcallresult = AgvClient.NeedLeave(Config.AgvName, CurrShelf.ShelfRfid, ClientLevel.High);
......@@ -57,23 +61,26 @@ namespace OnlineStore.DeviceLibrary
doorInfo.status = doorStatusE.free;
doorInfo.hasContainer = true;
WorkLog($"有料串,:通知agv来取料串 ShelfType:{ShelfType},{doorInfo.doorIndex},hasContainer:{doorInfo.hasContainer}");
LogUtil.debug($"{Name} 处理8");
return false;
}
else if (Robot.IOValue(Config.IO_LineIn_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.NewMove(MoveType.InStore, new InOutParam());
IB03_LineStart();
LogUtil.debug($"{Name} 处理9");
}
else if (Robot.IOValue(Config.IO_LineEnd_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.NewMove(MoveType.InStore, new InOutParam());
IB04_LineWait();
LogUtil.debug($"{Name} 处理10");
}
else
{
LineStop();
MoveInfo.EndMove();
LogUtil.debug($"{Name} 处理11");
}
return true;
}
......
......@@ -507,7 +507,7 @@ namespace OnlineStore.DeviceLibrary
CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, IO_Type.FeedingB_Outstore_UnderArea_ReelCheck, BatchMoveList, true);
}
}
LogUtil.debug($"入料机构出库检查");
// LogUtil.debug($"入料机构出库检查");
}
if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
......@@ -591,25 +591,25 @@ namespace OnlineStore.DeviceLibrary
private bool CheckStartOutPos(string posType, InOutPosInfo posInfo, String ioType, List<BatchMoveBean> BatchMoveList, bool shelfAutoLeave = false)
{
LogUtil.debug($"CheckStartOutPos 【{posType}】,【{posInfo?.ToStr()}】,【{ioType}】");
// LogUtil.debug($"CheckStartOutPos 【{posType}】,【{posInfo?.ToStr()}】,【{ioType}】");
DoorInfo doorinfo = null;
if (posInfo != null && IOValue(ioType).Equals(IO_VALUE.HIGH))
{
LogUtil.debug($"CheckStartOutPos 处理0");
// LogUtil.debug($"CheckStartOutPos 处理0");
if (!posInfo.IsNG && string.IsNullOrEmpty(posInfo.hSerial))
{
InOutParam param = new InOutParam(posInfo.ToCopy());
LogInfo($"{posType} 紧急物料{param.PosInfo.ToStr()},准备出库到紧急箱");
StartOutstore(param);
LogUtil.debug($"CheckStartOutPos 处理1");
// LogUtil.debug($"CheckStartOutPos 处理1");
return true;
}
foreach (BatchMoveBean moveBean in BatchMoveList)
{
LogUtil.debug($"{moveBean.Name} CheckStartOutPos {moveBean.MoveInfo.MoveType}");
// LogUtil.debug($"{moveBean.Name} CheckStartOutPos {moveBean.MoveInfo.MoveType}");
if (moveBean.MoveInfo.MoveType.Equals(MoveType.Reset) || moveBean.MoveInfo.MoveType.Equals(MoveType.RHome))
continue;
LogUtil.debug($"{moveBean.Name} CheckStartOutPos 处理");
// LogUtil.debug($"{moveBean.Name} CheckStartOutPos 处理");
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial ?? "";
if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial)
{
......@@ -644,9 +644,9 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.debug($"CheckStartOutPos 处理-1");
// LogUtil.debug($"CheckStartOutPos 处理-1");
}
LogUtil.debug($"CheckStartOutPos 处理-2");
// LogUtil.debug($"CheckStartOutPos 处理-2");
return false;
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!