修改：出库时没有给agv发mark

source/ACPackingStore/记录.txt

@@ -60,4 +60,18 @@ BI_03_LineRun超时报警改为40秒
 20200221
 20200221
 agv客户端启动时需要设置状态为none。
 agv客户端启动时需要设置状态为none。
 区分是入库结束出空料架还是出库完成的有料料架，当入库完成出空料架时，mark="0"。
 区分是入库结束出空料架还是出库完成的有料料架，当入库完成出空料架时，mark="0"。
-增加AgvClient_EnterShelf事件处理。
\ No newline at end of file
+增加AgvClient_EnterShelf事件处理。
+
+20200222
+修改：出库时没有给agv发mark
+
+
+
+
+
+
+
+
+
+
+

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs

@@ -759,10 +759,10 @@ namespace OnlineStore.DeviceLibrary
             if ((IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveParam.NeedEnterShelf) || MoveInfo.MoveParam.ShelfPosID.Equals(""))
             if ((IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveParam.NeedEnterShelf) || MoveInfo.MoveParam.ShelfPosID.Equals(""))
             {
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.BI_00_ReadyShelf);
                 MoveInfo.NextMoveStep(StoreMoveStep.BI_00_ReadyShelf);
-                InOutStoreLog("出库 " + MoveInfo.SLog + "： 通知agv调度准备带料架的agv，等待agv到达或检测到料架信号，进出轴到P1");
+                InOutStoreLog("出库 " + MoveInfo.SLog + "： 通知agv调度准备带料架的agv["+ param.rfid + "]，等待agv到达或检测到料架信号，进出轴到P1");
                 InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
                 InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
                 //需要先叫agv到达
                 //需要先叫agv到达
-                AgvClient.NeedEnter(Config.AgvNodeName,MoveInfo.MoveParam.ShelfPosID);
+                AgvClient.SetStatus(Config.AgvNodeName,param.rfid, param.rfid, ClientAction.NeedEnter,ClientLevel.High,true);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
             }
             }
             else
             else

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -86,16 +86,19 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         
         
         public static void SetStatus(string id, string mark = "", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false)
         public static void SetStatus(string id, string mark = "", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false)
-        { 
+        {
             //  ClientAction currA = GetAction(id);
             //  ClientAction currA = GetAction(id);
-            if (actionMap.ContainsKey(id))
+            if (!isMust)
             {
             {
-                ClientAction currA = actionMap[id]; //相同状态就设置一次
-                if (currA.Equals(action))
+                if (actionMap.ContainsKey(id))
                 {
                 {
-                    return;
+                    ClientAction currA = actionMap[id]; //相同状态就设置一次
+                    if (currA.Equals(action))
+                    {
+                        return;
+                    }
                 }
                 }
-            } 
+            }
             agvClient.SetStatus(id,mark, shelfId, action, level);
             agvClient.SetStatus(id,mark, shelfId, action, level);
             UpdateAction(id, action);
             UpdateAction(id, action);
         }
         }