复位失败不自动屏蔽agv

source/DeviceLibrary/PackingStore/AC_BOX_Bean_AGV.cs

@@ -22,7 +22,7 @@ namespace OnlineStore.DeviceLibrary
         /// <param name="action"></param>
         /// <param name="level"></param>
         /// <param name="isMust"></param>
-        void setAgvStatus(string mark = "0", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false)
+        public void setAgvStatus(string mark = "0", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false)
         {
             AgvClient.SetStatus(Config.AgvNodeName, mark, shelfId, action, level, isMust);
         }
@@ -45,12 +45,13 @@ namespace OnlineStore.DeviceLibrary
                 {
                     string mark = GetMarkInfo();
                     LogUtil.error(Name + logN + " 当前 BS_03_WaitEmptyAgv，RFID[" + rfid + "]不是空车，不处理agv，重发 NeedLeave [" + mark + "][" + CurrShelfID + "]");
-                    Task.Factory.StartNew(new Action(()=> {
+                    Task.Factory.StartNew(new Action(() =>
+                    {
                         setAgvStatus(mark, CurrShelfID, ClientAction.MayNot, ClientLevel.High, true);
                         Thread.Sleep(10000);
                         setAgvStatus(mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
                     }));
-                  
+
                     return false;
                 }
 
@@ -67,7 +68,8 @@ namespace OnlineStore.DeviceLibrary
                 {
                     string mark = GetMarkInfo();
                     LogUtil.error(Name + logN + " 当前出库中 BI_00_ReadyShelf，RFID无效，不处理agv，重发 NeedEnter [" + mark + "][" + MoveInfo.MoveParam.rfid + "]");
-                    Task.Factory.StartNew(new Action(() => {
+                    Task.Factory.StartNew(new Action(() =>
+                    {
                         setAgvStatus(mark, CurrShelfID, ClientAction.MayNot, ClientLevel.High, true);
                         Thread.Sleep(10000);
                         setAgvStatus(mark, MoveInfo.MoveParam.rfid, ClientAction.NeedEnter, ClientLevel.High, true);

source/DeviceLibrary/PackingStore/PackingStoreBean.cs

@@ -210,7 +210,7 @@ namespace OnlineStore.DeviceLibrary
         {
             mainTimer.Enabled = false;
             ledProcessTimer.Enabled = false;
-            AgvClient.SetCancelState(AgvClient.CurrCancelState);
+            AgvClient.SetCancelState(AgvClient.CurrCancelState);           
             //停止运行时，把阻挡气缸上升
             StopMove();
             foreach (AC_BOX_Bean equip in BoxMap.Values)