agv更新

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -15,7 +15,7 @@ namespace OnlineStore.DeviceLibrary
         public static bool CurrCancelState = true;
         public static bool CurrCancelState = true;
         public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
-        private static Asa.Client2 agvClient;
+        private static Asa.AgvClient agvClient;
         private static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
         private static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
         public static List<string> NodeList = new List<string>();
         public static List<string> NodeList = new List<string>();
         private static bool isInit = false;
         private static bool isInit = false;
@@ -26,7 +26,7 @@ namespace OnlineStore.DeviceLibrary
                 if (!isInit)
                 if (!isInit)
                 {
                 {
                     isInit = true;
                     isInit = true;
-                    agvClient = new Asa.Client2(ServerIp);
+                    agvClient = new Asa.AgvClient(ServerIp);
                     agvClient.CancelState = true;
                     agvClient.CancelState = true;
                     agvClient.Log += AgvClient_Log;
                     agvClient.Log += AgvClient_Log;
                     agvClient.Arrive += AgvClient_Arrive; 
                     agvClient.Arrive += AgvClient_Arrive; 
@@ -54,16 +54,16 @@ namespace OnlineStore.DeviceLibrary
             }
             }
         }
         }
 
 
-        private static void AgvClient_EnterShelf(string id, byte[] content)
+        private static void AgvClient_EnterShelf(string id, string rfid)
         {
         {
-            RFIDData data = new RFIDData(content);
-            LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + data.NumStr() + "]  ");
+           // RFIDData data = new RFIDData(content);
+            LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid+ "]  ");
             StoreManager.Store.AGVProcess(id, ClientAction.Arrive);
             StoreManager.Store.AGVProcess(id, ClientAction.Arrive);
             foreach (AC_BOX_Bean box in StoreManager.Store.BoxMap.Values)
             foreach (AC_BOX_Bean box in StoreManager.Store.BoxMap.Values)
             {
             {
                 if (box.Config.AgvNodeName.Equals(id))
                 if (box.Config.AgvNodeName.Equals(id))
                 {
                 {
-                    LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + data.NumStr() + "]  ,设置 [" + box.Name + "] WaitShelfEnter = true");
+                    LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid+ "]  ,设置 [" + box.Name + "] WaitShelfEnter = true");
                     box.WaitShelfEnter = true;
                     box.WaitShelfEnter = true;
                     break;
                     break;
                 }
                 }
@@ -75,10 +75,10 @@ namespace OnlineStore.DeviceLibrary
             agvClient.CancelState = isCancel;
             agvClient.CancelState = isCancel;
         }
         }
         public  static Dictionary<string, DateTime> closeDoorTimeMap = new Dictionary<string, DateTime>(); 
         public  static Dictionary<string, DateTime> closeDoorTimeMap = new Dictionary<string, DateTime>(); 
-        private static void AgvClient_CloseDoor(string id, byte[] content)
+        private static void AgvClient_CloseDoor(string id, string rfid)
         {
         {
-            RFIDData data = new RFIDData(content);
-            LogUtil.info("收到 AgvClient_CloseDoor [" + id + "] [" + data.NumStr() + "]  ");
+         //   RFIDData data = new RFIDData(content);
+            LogUtil.info("收到 AgvClient_CloseDoor [" + id + "] [" + rfid+ "]  ");
 
 
             if (closeDoorTimeMap.ContainsKey(id))
             if (closeDoorTimeMap.ContainsKey(id))
             {
             {
@@ -101,24 +101,28 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                 }
                 }
             }
             }
+            if (action.Equals(ClientAction.None))
+            {
+                mark = "0";
+            }
             agvClient.SetStatus(id,mark, shelfId, action, level);
             agvClient.SetStatus(id,mark, shelfId, action, level);
             UpdateAction(id, action);
             UpdateAction(id, action);
         }
         }
 
 
-        private static void AgvClient_Ready(string id, byte[] content)
+        private static void AgvClient_Ready(string id, string rfid)
         {
         {
             UpdateAction(id, ClientAction.Ready);
             UpdateAction(id, ClientAction.Ready);
-            RFIDData data = new RFIDData(content);
-            LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.NumStr() + "]  ");
+           // RFIDData data = new RFIDData(content);
+            LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid+ "]  ");
             StoreManager.Store.AGVProcess(id, ClientAction.Ready);
             StoreManager.Store.AGVProcess(id, ClientAction.Ready);
         }
         }
          
          
 
 
-        private static void AgvClient_Arrive(string id, byte[] content)
+        private static void AgvClient_Arrive(string id, string rfid)
         {
         {
             UpdateAction(id, ClientAction.Arrive);
             UpdateAction(id, ClientAction.Arrive);
-            RFIDData data = new RFIDData(content);
-            LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + data.NumStr() + "]   ");
+           // RFIDData data = new RFIDData(content);
+            LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid+ "]   ");
 
 
             StoreManager.Store.AGVProcess(id, ClientAction.Arrive);
             StoreManager.Store.AGVProcess(id, ClientAction.Arrive);
         }
         }