Commit d01e6b82 张东亮

1

1 个父辈 e1401b36
......@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Web.UI.WebControls;
namespace OnlineStore.DeviceLibrary
{
......@@ -321,8 +322,7 @@ namespace OnlineStore.DeviceLibrary
{
needLeave = (BoxTaskInfo.boxTCount >= MaxCntOnSide || BoxTaskInfo.boxBCount >= MaxCntOnSide || BoxTaskInfo.remainTaskCount <= 0);
}
ProcessShelfOut = false;
ProcessShelfEnter = false;
ProcessShelf = false;
recvAGVSig = false;
SetToNone();
Task.Factory.StartNew(delegate
......@@ -414,8 +414,7 @@ namespace OnlineStore.DeviceLibrary
}
}
}
bool ProcessShelfOut = false;
bool ProcessShelfEnter = false;
bool ProcessShelf = false;
bool DIValue(string iotype, IO_VALUE iO_VALUE)
{
return IOManager.IOValue(iotype, config.Id).Equals(iO_VALUE);
......@@ -545,8 +544,11 @@ namespace OnlineStore.DeviceLibrary
}
public void BoxOutProcess()
{
if (ProcessShelfEnter) return;
if (ProcessShelfOut) return;
if (ProcessShelf)
{
LogUtil.error($"BoxOutProcess 不处理:ProcessShelf={ProcessShelf}");
return;
}
//AGV已到达,将料串送入AGV中
Task.Factory.StartNew(delegate
{
......@@ -571,8 +573,8 @@ namespace OnlineStore.DeviceLibrary
if (DIValue(DI_FrontCheck, IO_VALUE.HIGH) || DIValue(DI_InPlaceCheck, IO_VALUE.HIGH))
{
LogUtil.info(logName + " 开始出料箱");
ProcessShelfOut = true;
ProcessShelf = true;
LogUtil.info(logName + " 开始出料箱:"+ ProcessShelf);
LogUtil.info(logName + " 横移停止运行");
TranverseStopRun();
LogUtil.info(logName + " 横移下降");
......@@ -632,7 +634,6 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(logName + " 结束横移回转");
//让料箱流到位置
LogUtil.info(logName + " 开始进料箱");
ProcessShelfEnter = true;
LogUtil.info(logName + " 横移停止运行");
TranverseStopRun();
LogUtil.info(logName + " 横移下降");
......@@ -641,7 +642,6 @@ namespace OnlineStore.DeviceLibrary
StopDown();
LogUtil.info(logName + " 线体正转");
LineRun();
ProcessShelfOut = false;
result = WaitIo(DI_InPlaceCheck, IO_VALUE.HIGH, 60000);
if (!result)
......@@ -683,16 +683,19 @@ namespace OnlineStore.DeviceLibrary
finally
{
LineStopRun();
ProcessShelfOut = false;
ProcessShelf = false;
recvAGVSig = false;
LogUtil.info(logName + " 结束");
LogUtil.info(logName + $"ProcessShelf={ProcessShelf} 结束");
}
});
}
public void BoxEnterProcess()
{
if (ProcessShelfEnter) return;
if (ProcessShelfOut) return;
if (ProcessShelf)
{
LogUtil.error($"BoxEnterProcess 不处理:ProcessShelf={ProcessShelf}");
return;
}
Task.Factory.StartNew(delegate
{
BoxId = "";
......@@ -703,8 +706,8 @@ namespace OnlineStore.DeviceLibrary
if (DIValue(DI_FrontCheck, IO_VALUE.LOW) && DIValue(DI_CacheFrontCheck, IO_VALUE.LOW)
&& DIValue(DI_CacheBackCheck, IO_VALUE.LOW) && otherTurnoverBox.CacheBackCheck(IO_VALUE.LOW) && otherTurnoverBox.CacheFrontCheck(IO_VALUE.LOW))
{
LogUtil.info(logName + " 开始进料箱");
ProcessShelfEnter = true;
ProcessShelf = true;
LogUtil.info(logName + " 开始进料箱:"+ ProcessShelf);
LogUtil.info(logName + " 横移停止运行");
TranverseStopRun();
LogUtil.info(logName + " 横移下降");
......@@ -775,7 +778,6 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(1000);
}
}
ProcessShelfEnter = false;
}
else
{
......@@ -798,9 +800,9 @@ namespace OnlineStore.DeviceLibrary
}
finally
{
ProcessShelfEnter = false;
ProcessShelf = false;
recvAGVSig = false;
LogUtil.info(logName + " 结束");
LogUtil.info(logName + $"ProcessShelf={ProcessShelf} 结束");
}
});
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!