Commit b331ffd9 LN

出库时可以手动拉出料架

1 个父辈 50de5b93
...@@ -521,7 +521,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -521,7 +521,7 @@ namespace OnlineStore.DeviceLibrary
if (InProcess) if (InProcess)
{ {
//TimeSpan span = DateTime.Now - preProcessTime; //TimeSpan span = DateTime.Now - preProcessTime;
if (stopwatch.Elapsed.TotalMinutes < 1) if (stopwatch.Elapsed.TotalSeconds < 10)
{ {
return; return;
} }
......
...@@ -132,14 +132,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -132,14 +132,14 @@ namespace OnlineStore.DeviceLibrary
wait.IsEnd = true; wait.IsEnd = true;
} }
} }
//else if (wait.AgvAction.Equals((int)ClientAction.FinishLeave)) else if (wait.AgvAction.Equals((int)ClientAction.Arrive)&&MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitArrive))
//{ {
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.LOW))
// { {
// LogInfo("等待agv离开FinishOut,检测到 LineTake_Check和LineIn_Check都没有信号,结束等待"); LogInfo("BS_03_WaitArrive 等待agv到达Arrive,检测到 LineTake_Check和LineIn_Check都没有信号,结束等待");
// wait.IsEnd = true; wait.IsEnd = true;
// } }
//} }
} }
} }
else if (wait.WaitType.Equals(WaitEnum.W011_DoorCloseEvent)) else if (wait.WaitType.Equals(WaitEnum.W011_DoorCloseEvent))
......
...@@ -261,12 +261,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -261,12 +261,11 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_03_WaitArrive); MoveInfo.NextMoveStep(StoreMoveStep.BS_03_WaitArrive);
MoveInfo.TimeOutSeconds = 600; MoveInfo.TimeOutSeconds = 600;
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000)); //MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
InOutStoreLog(moveName + MoveInfo.SLog + ":再次调用 NeedLeave["+mark+"][" + CurrShelfID + "],等待Agv " + Config.AgvNodeName + " Arrive ,最多等待1200秒");
AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.Low, true);
//等待agv到达 //等待agv到达
MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive)); MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
MoveInfo.OneWaitCanEndStep = true; InOutStoreLog(moveName + MoveInfo.SLog + ":再次调用 NeedLeave["+mark+"][" + CurrShelfID + "],等待Agv " + Config.AgvNodeName + " Arrive ,最多等待1200秒");
AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.Low, true);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitArrive)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitArrive))
{ {
...@@ -287,7 +286,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -287,7 +286,7 @@ namespace OnlineStore.DeviceLibrary
//如果agv未到达,直接结束 //如果agv未到达,直接结束
MoveEndToRuningStatus(); MoveEndToRuningStatus();
//EmprtShelfList = new ConcurrentQueue<string>(); //EmprtShelfList = new ConcurrentQueue<string>();
InOutStoreLog(moveName + MoveInfo.SLog + ":等待Agv " + Config.AgvNodeName + " Arrive超时,检测不到料架信号,认为料架已手动离开"); InOutStoreLog(moveName + MoveInfo.SLog + ":等待Agv " + Config.AgvNodeName + " Arrive超时,检测不到料架信号,认为料架已手动离开,出库结束");
} }
else else
{ {
...@@ -325,9 +324,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -325,9 +324,9 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.BS_08_WaitInLineSingle); MoveInfo.NextMoveStep(StoreMoveStep.BS_08_WaitInLineSingle);
InOutStoreLog(moveName + MoveInfo.SLog + ":等待 入料口有信号,最多等待30秒"); InOutStoreLog(moveName + MoveInfo.SLog + ":等待 入料口有信号,最多等待30秒");
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW)); // MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW));
MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH));
MoveInfo.OneWaitCanEndStep = true;
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_08_WaitInLineSingle)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_08_WaitInLineSingle))
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!