Commit 3990f4f5 LN

开始出库前判断是否有信号

1 个父辈 b92723d4
...@@ -386,11 +386,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -386,11 +386,11 @@ namespace OnlineStore.DeviceLibrary
} }
if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm()) if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
{ {
if (CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, BatchMoveList)) if (CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.UnderArea_Check_A, BatchMoveList))
{ {
} }
else if (CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, BatchMoveList)) else if (CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo,IO_Type.UnderArea_Check_B, BatchMoveList))
{ {
} }
...@@ -399,11 +399,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -399,11 +399,11 @@ namespace OnlineStore.DeviceLibrary
//如果有物料且不能放料,需要送一个料串离开 //如果有物料且不能放料,需要送一个料串离开
if (BufferDataManager.AOutStoreInfo != null) if (BufferDataManager.AOutStoreInfo != null)
{ {
CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, BatchMoveList, true); CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.UnderArea_Check_A,BatchMoveList, true);
} }
else if (BufferDataManager.BOutStoreInfo != null) else if (BufferDataManager.BOutStoreInfo != null)
{ {
CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, BatchMoveList, true); CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, IO_Type.UnderArea_Check_B, BatchMoveList, true);
} }
} }
...@@ -419,9 +419,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -419,9 +419,9 @@ namespace OnlineStore.DeviceLibrary
CheckAxisAlarm(); CheckAxisAlarm();
} }
} }
private bool CheckStartOutPos(string posType, InOutPosInfo posInfo, List<BatchMoveBean> BatchMoveList, bool shelfAutoLeave = false) private bool CheckStartOutPos(string posType, InOutPosInfo posInfo,String ioType, List<BatchMoveBean> BatchMoveList, bool shelfAutoLeave = false)
{ {
if (posInfo != null) if (posInfo != null && IOValue(ioType).Equals(IO_VALUE.HIGH))
{ {
foreach (BatchMoveBean moveBean in BatchMoveList) foreach (BatchMoveBean moveBean in BatchMoveList)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!