紧急出料模块，料架离开时，mark=紧急料或者分配料，rfid=料架号

source/AssemblyLineClient/记录.txt

 
 
+20200409
+紧急出料模块，料架离开时，mark=紧急料或者分配料，rfid=料架号
+
+
 20200408 盘高计算修改：如果检测出<=15,都按照8计算
 20200408 盘高计算修改：如果检测出<=15,都按照8计算
 agv更新
 agv更新
 
 

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -65,8 +65,8 @@ namespace OnlineStore.DeviceLibrary
             agvClient.CancelState = isCancel;
             agvClient.CancelState = isCancel;
         }
         }
         public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low,bool isMust=false)
         public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low,bool isMust=false)
-        {
-            //  ClientAction currA = GetAction(id);
+        { 
+
             if (!isMust)
             if (!isMust)
             {
             {
                 if (actionMap.ContainsKey(id))
                 if (actionMap.ContainsKey(id))
@@ -78,7 +78,18 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                 }
                 }
             }
             }
-            agvClient.SetStatus(id, "", shelfId, action, level);
+            string mark = "";
+            if (shelfId != "")
+            {
+                int index = shelfId.IndexOf(',');
+                if (index > 0)
+                {
+                    //紧急出料模块，料架离开时，mark=紧急料或者分配料，rfid=料架号
+                    mark = shelfId.Substring(index + 1, shelfId.Length - index - 2);
+                    shelfId = shelfId.Substring(0, index);
+                }
+            }
+            agvClient.SetStatus(id,mark, shelfId, action, level);
             UpdateAction(id, action);
             UpdateAction(id, action);
         }
         }
         private static void AgvClient_CloseDoor(string id, string rfid)
         private static void AgvClient_CloseDoor(string id, string rfid)