出库料架agv对接修改

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

@@ -374,42 +374,41 @@ namespace OnlineStore.DeviceLibrary
 
 
             }
             }
             //出库处理中不处理
             //出库处理中不处理
-            if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
-            {
-                if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf))
+
+            if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitEmptyAgv))
             {
             {
-                    if (rfid.Equals(""))
+                if (!rfid.Equals(""))
                 {
                 {
                     string mark = GetMarkInfo();
                     string mark = GetMarkInfo();
-                        LogUtil.error(Name + logN + " 当前出库中 BI_00_ReadyShelf，RFID无效，不处理agv，重发 NeedEnter [" + mark + "][" + MoveInfo.MoveParam.rfid + "]");
-                        AgvClient.SetStatus(Config.AgvNodeName, mark, MoveInfo.MoveParam.rfid, ClientAction.NeedEnter, ClientLevel.High, true);
+                    LogUtil.error(Name + logN + " 当前 BS_03_WaitEmptyAgv，RFID[" + rfid + "]不是空车，不处理agv，重发 NeedLeave [" + mark + "][" + CurrShelfID + "]");
+                    AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
                     return false;
                     return false;
                 }
                 }
 
 
-                    //出库等待料架到达
-                    LogUtil.info(Name + logN + ",当前出库中 BI_00_ReadyShelf，正在等待料架到达");
-                    MoveInfo.NextMoveStep(StoreMoveStep.BI_01_DoorOpen);
-                    InOutStoreLog("出库等待料架" + MoveInfo.SLog + " agv已到达，打开入料口移门");
+                //等待空车到达
+                LogUtil.info(Name + logN + ",当前 BS_03_WaitEmptyAgv，正在等待料架到达");
+                MoveInfo.NextMoveStep(StoreMoveStep.BS_04_DoorOpen);
+                InOutStoreLog("送出料架等待空车" + MoveInfo.SLog + "：agv到达,打开入料口移门");
                 DoorBean.StartOpen(MoveInfo);
                 DoorBean.StartOpen(MoveInfo);
                 return true;
                 return true;
             }
             }
-            }
-            else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitEmptyAgv))
+            else if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore) && MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf))
             {
             {
-                if (!rfid.Equals(""))
+                if (rfid.Equals(""))
                 {
                 {
                     string mark = GetMarkInfo();
                     string mark = GetMarkInfo();
-                    LogUtil.error(Name + logN + " 当前 BS_03_WaitEmptyAgv，RFID[" + rfid + "]不是空车，不处理agv，重发 NeedLeave [" + mark + "][" + CurrShelfID + "]");
-                    AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
+                    LogUtil.error(Name + logN + " 当前出库中 BI_00_ReadyShelf，RFID无效，不处理agv，重发 NeedEnter [" + mark + "][" + MoveInfo.MoveParam.rfid + "]");
+                    AgvClient.SetStatus(Config.AgvNodeName, mark, MoveInfo.MoveParam.rfid, ClientAction.NeedEnter, ClientLevel.High, true);
                     return false;
                     return false;
                 }
                 }
 
 
-                //等待空车到达
-                LogUtil.info(Name + logN + ",当前 BS_03_WaitEmptyAgv，正在等待料架到达");
-                MoveInfo.NextMoveStep(StoreMoveStep.BS_04_DoorOpen);
-                InOutStoreLog("送出料架等待空车" + MoveInfo.SLog + "：agv到达,打开入料口移门");
+                //出库等待料架到达
+                LogUtil.info(Name + logN + ",当前出库中 BI_00_ReadyShelf，正在等待料架到达");
+                MoveInfo.NextMoveStep(StoreMoveStep.BI_01_DoorOpen);
+                InOutStoreLog("出库等待料架" + MoveInfo.SLog + " agv已到达，打开入料口移门");
                 DoorBean.StartOpen(MoveInfo);
                 DoorBean.StartOpen(MoveInfo);
                 return true;
                 return true;
+
             }
             }
             else if (storeRunStatus.Equals(StoreRunStatus.Runing) &&
             else if (storeRunStatus.Equals(StoreRunStatus.Runing) &&
                 MoveInfo.MoveType.Equals(StoreMoveType.None) &&
                 MoveInfo.MoveType.Equals(StoreMoveType.None) &&
@@ -425,6 +424,10 @@ namespace OnlineStore.DeviceLibrary
                 StartShelfInStore();
                 StartShelfInStore();
                 return true;
                 return true;
             }
             }
+            else
+            {
+                LogUtil.error(Name + logN + " ，未找到相关处理");
+            }
 
 
             return false;
             return false;
         }
         }