Commit 9d102103 张东亮

重置料串改成降下来,清除信息,不升上去了

1 个父辈 b6efe6ab
...@@ -88,14 +88,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -88,14 +88,19 @@ namespace OnlineStore.DeviceLibrary
} }
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))
{ {
ResetShelf = false;
LogUtil.debug($"{Name} 处理2"); 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))
{ {
if(!ResetShelf)
{
LogUtil.debug($"{Name} 处理3"); LogUtil.debug($"{Name} 处理3");
StartInstore(new InOutParam()); StartInstore(new InOutParam());
} }
}
} }
} }
else if (MoveInfo.MoveType.Equals(MoveType.Reset)) else if (MoveInfo.MoveType.Equals(MoveType.Reset))
...@@ -146,6 +151,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -146,6 +151,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private Stopwatch shelfWatch = new Stopwatch(); private Stopwatch shelfWatch = new Stopwatch();
public bool ResetShelf = false;
public bool Reset(bool needStop = false, bool resetShelf = false) public bool Reset(bool needStop = false, bool resetShelf = false)
{ {
WarnMsg = ""; WarnMsg = "";
...@@ -173,6 +179,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -173,6 +179,7 @@ namespace OnlineStore.DeviceLibrary
WorkLog("复位前重置料串状态"); WorkLog("复位前重置料串状态");
UpdateShelf(); UpdateShelf();
} }
ResetShelf = resetShelf;
preCodeList = new List<string>(); preCodeList = new List<string>();
WarnMsg = ""; WarnMsg = "";
alarmType = AlarmType.None; alarmType = AlarmType.None;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!