Commit 553e6f4f 张东亮

1

1 个父辈 9d16bed7
...@@ -885,9 +885,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -885,9 +885,9 @@ namespace OnlineStore.DeviceLibrary
} }
} }
List<OutTaskData> outTask = SServerManager.GetOutTask(Name); List<OutTaskData> outTask = SServerManager.GetOutTask(Name);
RobotStates states = SServerManager.GetRobotState();
if (outTask != null && outTask.Count > 0) if (outTask != null && outTask.Count > 0)
{ {
RobotStates states = SServerManager.GetRobotState();
if (LineManager.RobotIsIdle(states) || LineManager.CheckRobotTrayIsInstore(states)) if (LineManager.RobotIsIdle(states) || LineManager.CheckRobotTrayIsInstore(states))
{ {
TimeSpan span1 = DateTime.Now - callOutLastTime; TimeSpan span1 = DateTime.Now - callOutLastTime;
...@@ -901,8 +901,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -901,8 +901,8 @@ namespace OnlineStore.DeviceLibrary
} }
} }
LineManager.UploadAGVStatus(states);
} }
LineManager.UploadAGVStatus(states);
//发送呼叫任务 //发送呼叫任务
ContainerManager.HandlePendingTask(); ContainerManager.HandlePendingTask();
} }
......
...@@ -521,7 +521,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -521,7 +521,7 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region AGV状态上报 #region AGV状态上报
static string agvStr = "";
/// <summary> /// <summary>
/// AGV状态上报 /// AGV状态上报
/// </summary> /// </summary>
...@@ -537,6 +537,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -537,6 +537,11 @@ namespace OnlineStore.DeviceLibrary
string server = GetAddr(Addr_agvStatus, queryStr); string server = GetAddr(Addr_agvStatus, queryStr);
string json = HttpHelper.Post(server,""); string json = HttpHelper.Post(server,"");
ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json); ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json);
if(!agvStr.Equals(json))
{
LogUtil.info($"UpdateAgvStatus【{json}】【{JsonHelper.SerializeObject(rtnData)}】");
agvStr = json;
}
if (rtnData != null && rtnData.code == 0) if (rtnData != null && rtnData.code == 0)
{ {
return true; return true;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!