停止时候存储机构不检查缓存口

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -825,6 +825,10 @@ namespace OnlineStore.DeviceLibrary
             //}
             //}
             //if (!runStatus.Equals(RunStatus.Runing))
             //if (!runStatus.Equals(RunStatus.Runing))
             //    return;
             //    return;
+            if(MoveStop)
+            {
+                return;
+            }
             int errSeconds = 20;
             int errSeconds = 20;
             TimeSpan timeSpanA = DateTime.Now - dtUpperA;
             TimeSpan timeSpanA = DateTime.Now - dtUpperA;
             TimeSpan tsUppA = DateTime.Now - errUpperA;
             TimeSpan tsUppA = DateTime.Now - errUpperA;

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -394,7 +394,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (BufferDataManager.AInStoreInfo == null || BufferDataManager.AInStoreInfo.PosId.Equals(""))
                 if (BufferDataManager.AInStoreInfo == null || BufferDataManager.AInStoreInfo.PosId.Equals(""))
                 {
                 {
-                    ClearTimeoutAlarm("A上暂存区物料拿走");
+                    ClearTimeoutAlarm("A上暂存区物料拿走超时");
                     MoveInfo.NextMoveStep(StepEnum.II43_InoutToP2);
                     MoveInfo.NextMoveStep(StepEnum.II43_InoutToP2);
                     MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区为空， 进出轴 到P2(A暂存区放料点){Config.Inout_P2}");
                     MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区为空， 进出轴 到P2(A暂存区放料点){Config.Inout_P2}");
                     InOutAxis.AbsMove(MoveInfo, Config.Inout_P2, Config.Inout_P2_Speed);
                     InOutAxis.AbsMove(MoveInfo, Config.Inout_P2, Config.Inout_P2_Speed);
@@ -407,7 +407,7 @@ namespace OnlineStore.DeviceLibrary
                         MoveInfo.LastSetpTime = DateTime.Now;
                         MoveInfo.LastSetpTime = DateTime.Now;
                     }
                     }
                     else
                     else
-                        SetWarnMsg("A上暂存区物料拿走");
+                        SetWarnMsg("A上暂存区物料拿走超时");
                 }
                 }
             }
             }
             else if (MoveInfo.IsStep(StepEnum.II43_InoutToP2))
             else if (MoveInfo.IsStep(StepEnum.II43_InoutToP2))
@@ -492,7 +492,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals(""))
                 if (BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals(""))
                 {
                 {
-                    ClearTimeoutAlarm("B上暂存区物料拿走");
+                    ClearTimeoutAlarm("B上暂存区物料拿走超时");
                     II63_InoutToP3();
                     II63_InoutToP3();
                 }
                 }
                 else if (MoveInfo.IsTimeOut(120))
                 else if (MoveInfo.IsTimeOut(120))
@@ -503,7 +503,7 @@ namespace OnlineStore.DeviceLibrary
                         MoveInfo.LastSetpTime = DateTime.Now;
                         MoveInfo.LastSetpTime = DateTime.Now;
                     }
                     }
                     else
                     else
-                        SetWarnMsg("B上暂存区物料拿走");
+                        SetWarnMsg("B上暂存区物料拿走超时");
                 }
                 }
             }
             }
             else if (MoveInfo.IsStep(StepEnum.II63_InoutToP3))
             else if (MoveInfo.IsStep(StepEnum.II63_InoutToP3))