Commit 6f3cdfc5 LN

agv客户端启动时需要设置状态为none

1 个父辈 8feaf907
此文件类型无法预览
...@@ -242,7 +242,12 @@ ...@@ -242,7 +242,12 @@
</member> </member>
<member name="E:Asa.Client2.CloseDoor"> <member name="E:Asa.Client2.CloseDoor">
<summary> <summary>
关门 关门,仅包装料仓
</summary>
</member>
<member name="E:Asa.Client2.EnterShelf">
<summary>
准备进入料架不能出料,仅包装料仓
</summary> </summary>
</member> </member>
<member name="E:Asa.Client2.Log"> <member name="E:Asa.Client2.Log">
...@@ -431,6 +436,11 @@ ...@@ -431,6 +436,11 @@
小车已准备,已对接上流水线 小车已准备,已对接上流水线
</summary> </summary>
</member> </member>
<member name="F:Asa.ClientAction.EnterShelf">
<summary>
包装料仓只能入料不能出料
</summary>
</member>
<member name="T:Asa.ClientLevel"> <member name="T:Asa.ClientLevel">
<summary> <summary>
客户端的优先级 客户端的优先级
......
...@@ -34,15 +34,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -34,15 +34,16 @@ namespace OnlineStore.DeviceLibrary
agvClient.CloseDoor += AgvClient_CloseDoor; agvClient.CloseDoor += AgvClient_CloseDoor;
} }
actionMap = new Dictionary<string, Asa.ClientAction>(); actionMap = new Dictionary<string, Asa.ClientAction>();
foreach (string key in NodeList) //foreach (string key in NodeList)
{ //{
actionMap.Add(key, Asa.ClientAction.None); // actionMap.Add(key, Asa.ClientAction.None);
} //}
agvClient.Connect(); agvClient.Connect();
foreach (string str in NodeList) foreach (string str in NodeList)
{ {
SetStatus(str); SetStatus(str);
LogUtil.info("agv init ,SetStatus[" + str + "]=none ");
} }
} }
...@@ -64,12 +65,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -64,12 +65,16 @@ namespace OnlineStore.DeviceLibrary
public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low) public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low)
{ {
ClientAction currA = GetAction(id); // ClientAction currA = GetAction(id);
//相同状态就设置一次 if (actionMap.ContainsKey(id))
{
ClientAction currA = actionMap[id]; //相同状态就设置一次
if (currA.Equals(action)) if (currA.Equals(action))
{ {
return; return;
} }
}
agvClient.SetStatus(id, "",shelfId, action, level); agvClient.SetStatus(id, "",shelfId, action, level);
UpdateAction(id, action); UpdateAction(id, action);
} }
......
...@@ -7,3 +7,5 @@ Mayleave、MayEnter是包装料仓的,开了门后发,环形线和VMI是不 ...@@ -7,3 +7,5 @@ Mayleave、MayEnter是包装料仓的,开了门后发,环形线和VMI是不
20200220 20200220
agvclien增加cancelState的参数设置 agvclien增加cancelState的参数设置
20200221
agv客户端启动时需要设置状态为none
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!