0112

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -30,14 +30,14 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// </summary>
         public void InLine_None()
         public void InLine_None()
         {
         {
-            SetStatus(InLine_Name, "", ClientAction.None);
+            SetStatus(InLine_Name, "000", ClientAction.None);
         }
         }
         /// <summary>
         /// <summary>
         /// 可以进入状态
         /// 可以进入状态
         /// </summary>
         /// </summary>
         public void InLine_NeedEnter()
         public void InLine_NeedEnter()
         {
         {
-            SetStatus(InLine_Name, "", ClientAction.NeedEnter);
+            SetStatus(InLine_Name, "000", ClientAction.NeedEnter);
         }
         }
         #endregion
         #endregion
 
 
@@ -127,7 +127,7 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
 
 
                     //五秒后改为离开状态
                     //五秒后改为离开状态
-                    Thread.Sleep(5000);
+                    Thread.Sleep(10000);
                     Feeder_In_Msg = "Feeder In: 调用  FinishEnter ";
                     Feeder_In_Msg = "Feeder In: 调用  FinishEnter ";
                     LogUtil.info(Feeder_In_Msg);
                     LogUtil.info(Feeder_In_Msg);
                     FinishEnter(InLine_Name);
                     FinishEnter(InLine_Name);
@@ -306,17 +306,17 @@ namespace OnlineStore.DeviceLibrary
             if (actionMap.ContainsKey(name))
             if (actionMap.ContainsKey(name))
             {
             {
                 ClientAction currA = actionMap[name]; //相同状态就设置一次
                 ClientAction currA = actionMap[name]; //相同状态就设置一次
-                if (currA.Equals(action) && shelfId == "")
+                if (currA.Equals(action) && (shelfId == "000"))
                 {
                 {
                     return false;
                     return false;
                 }
                 }
-                // actionMap[name] = action;
-                // agvClient.SetStatus(name, shelfId, action, level);
+                actionMap[name] = action;
+                agvClient.SetStatus(name, shelfId, action, level);
                 LogUtil.info("设置 " + name + " [" + shelfId + "] " + action.ToString());
                 LogUtil.info("设置 " + name + " [" + shelfId + "] " + action.ToString());
                 return true;
                 return true;
             }
             }
             agvClient.SetStatus(name, shelfId, action, level);
             agvClient.SetStatus(name, shelfId, action, level);
-            //actionMap.Add(name, action);
+            actionMap.Add(name, action);
             LogUtil.info("设置 " + name + " ["+ shelfId + "] "+ action.ToString());
             LogUtil.info("设置 " + name + " ["+ shelfId + "] "+ action.ToString());
             return true;
             return true;
         }
         }
@@ -329,7 +329,14 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return agvClient.IsConn;
             return agvClient.IsConn;
         }
         }
-
+        public static ClientAction GetAction(string NodeName)
+        {
+            if (actionMap.ContainsKey(NodeName))
+            {
+                return actionMap[NodeName];
+            }
+            return ClientAction.None;
+        }
         public void Dispose()
         public void Dispose()
         {
         {
             try
             try