Commit a06d56c5 张东亮

钢网接口限制

1 个父辈 4e013e46
...@@ -234,6 +234,7 @@ namespace DeviceLibrary.bean.job ...@@ -234,6 +234,7 @@ namespace DeviceLibrary.bean.job
JobRunStep.ToNextStep(RunStep.Steel_LiftToLine_14_Dock); JobRunStep.ToNextStep(RunStep.Steel_LiftToLine_14_Dock);
runInfo = $"到达{JobParam.CurTargetNode.AliceName}的放料点";//,开始停靠 runInfo = $"到达{JobParam.CurTargetNode.AliceName}的放料点";//,开始停靠
//AllocateTask(agv, $"{SettingString.Docking}"); //AllocateTask(agv, $"{SettingString.Docking}");
DataBufferManager.SteelAgvInStorage = true;
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
} }
} }
......
...@@ -28,6 +28,10 @@ namespace DeviceLibrary.manager ...@@ -28,6 +28,10 @@ namespace DeviceLibrary.manager
/// </summary> /// </summary>
public static string SteelTarget = ""; public static string SteelTarget = "";
/// <summary> /// <summary>
/// 钢网agv在立库那
/// </summary>
public static bool SteelAgvInStorage=false;
/// <summary>
/// 重置钢网信息 /// 重置钢网信息
/// </summary> /// </summary>
public static void ResetSteelInfo() public static void ResetSteelInfo()
...@@ -35,6 +39,7 @@ namespace DeviceLibrary.manager ...@@ -35,6 +39,7 @@ namespace DeviceLibrary.manager
DockingOk = false; DockingOk = false;
LeaveLiku = false; LeaveLiku = false;
DetachShelf = false; DetachShelf = false;
SteelAgvInStorage = false;
SteelTarget = ""; SteelTarget = "";
} }
} }
......
...@@ -8,6 +8,7 @@ using Common; ...@@ -8,6 +8,7 @@ using Common;
using DeviceLibrary.service.model; using DeviceLibrary.service.model;
using DeviceLibrary.manager; using DeviceLibrary.manager;
using System.Reflection; using System.Reflection;
using System.Windows.Forms;
namespace DeviceLibrary namespace DeviceLibrary
{ {
...@@ -207,6 +208,12 @@ namespace DeviceLibrary ...@@ -207,6 +208,12 @@ namespace DeviceLibrary
public StealResult Storage(string Place) public StealResult Storage(string Place)
{ {
StealResult stealResult = new StealResult(); StealResult stealResult = new StealResult();
if(!DataBufferManager.SteelAgvInStorage)
{
stealResult.Msg = $"NG,3D";
Log.Info($"收到立库调用Storage接口:【Place={Place}】【{JsonHelper.SerializeObject(stealResult)}】");
return stealResult;
}
stealResult.Msg = $"OK,3D"; stealResult.Msg = $"OK,3D";
//DI_On/DI_Off 信号亮DI_On,没信号DI_Off //DI_On/DI_Off 信号亮DI_On,没信号DI_Off
if (Place.Equals("DI_Off")) if (Place.Equals("DI_Off"))
...@@ -245,8 +252,24 @@ namespace DeviceLibrary ...@@ -245,8 +252,24 @@ namespace DeviceLibrary
public StealResult SendNew(string From, string Place) public StealResult SendNew(string From, string Place)
{ {
StealResult stealResult = new StealResult(); StealResult stealResult = new StealResult();
DataBufferManager.SteelTarget = Place;
stealResult.Msg = $"OK,3D"; stealResult.Msg = $"OK,3D";
if (DataBufferManager.SteelAgvInStorage)
{
DataBufferManager.SteelTarget = Place;
}
else
{
if("storage".Equals(From.ToLower()))
{
//MissionInfo missionInfo = new MissionInfo();
//missionInfo.state = MissionState.创建;
//bool rtn = MissionManager.AddMission(missionInfo);
//if (!rtn)
//{
// stealResult.Msg = $"NG,3D";
//}
}
}
Log.Info($"收到立库调用SendNew接口:【From={From}】【Place={Place}】【{JsonHelper.SerializeObject(stealResult)}】"); Log.Info($"收到立库调用SendNew接口:【From={From}】【Place={Place}】【{JsonHelper.SerializeObject(stealResult)}】");
return stealResult; return stealResult;
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!