Skip to content

张东亮 / SO1057-XLRStore

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

1

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