Skip to content

张东亮 / SO1131-XLRStore

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

1

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