开门后取消暂停仍然运动问题

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -1124,7 +1124,7 @@ namespace OnlineStore.DeviceLibrary
                     return;
                     return;
                 }
                 }
 
 
-                if (CurrSecurityAccess.Equals(0))
+                //if (CurrSecurityAccess.Equals(0))
                 {
                 {
                     if (StoreManager.DisBoxSecurityAccess)
                     if (StoreManager.DisBoxSecurityAccess)
                     {
                     {
@@ -1142,7 +1142,8 @@ namespace OnlineStore.DeviceLibrary
                         SecurityAccessStop("后门门禁");
                         SecurityAccessStop("后门门禁");
                     }
                     }
                 }
                 }
-                else if (CurrSecurityAccess.Equals(1))
+                //else
+                if (CurrSecurityAccess.Equals(1))
                 {
                 {
                     if (IOValue(IO_Type.LeftDoor_Limit).Equals(IO_VALUE.HIGH) &&
                     if (IOValue(IO_Type.LeftDoor_Limit).Equals(IO_VALUE.HIGH) &&
                         IOValue(IO_Type.RightDoor_Limit).Equals(IO_VALUE.HIGH) &&
                         IOValue(IO_Type.RightDoor_Limit).Equals(IO_VALUE.HIGH) &&

source/DeviceLibrary/storeBean/inputBean/InputEquip.cs

@@ -24,6 +24,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         public BatchMoveBean BatchMove_A = null;
         public BatchMoveBean BatchMove_A = null;
         public BatchMoveBean BatchMove_B = null;
         public BatchMoveBean BatchMove_B = null;
+        List<BatchMoveBean> BatchMoveList;
         public AxisBean BatchAxis_A = null;
         public AxisBean BatchAxis_A = null;
         public AxisBean BatchAxis_B = null;
         public AxisBean BatchAxis_B = null;
         public ClampJawBean ClampJaw = null;
         public ClampJawBean ClampJaw = null;
@@ -61,7 +62,7 @@ namespace OnlineStore.DeviceLibrary
 
 
             BatchMove_A = new BatchMoveBean(Config, BatchAxis_A, 1);
             BatchMove_A = new BatchMoveBean(Config, BatchAxis_A, 1);
             BatchMove_B = new BatchMoveBean(config, BatchAxis_B, 2);
             BatchMove_B = new BatchMoveBean(config, BatchAxis_B, 2);
-
+            BatchMoveList =new List<BatchMoveBean>() { BatchMove_A, BatchMove_B };
             addLastDI(IO_Type.Airpressure_Check, IO_VALUE.LOW);
             addLastDI(IO_Type.Airpressure_Check, IO_VALUE.LOW);
             addLastDI(IO_Type.SuddenStop_BTN, IO_VALUE.LOW);
             addLastDI(IO_Type.SuddenStop_BTN, IO_VALUE.LOW);
             addLastDI(IO_Type.Reset_BTN, IO_VALUE.LOW);
             addLastDI(IO_Type.Reset_BTN, IO_VALUE.LOW);
@@ -388,7 +389,7 @@ namespace OnlineStore.DeviceLibrary
             BusyMoveProcess();
             BusyMoveProcess();
             IOTimeOutProcess();
             IOTimeOutProcess();
             //判断流水线打开了才可以运行  
             //判断流水线打开了才可以运行  
-            List<BatchMoveBean> BatchMoveList = new List<BatchMoveBean>() { BatchMove_A, BatchMove_B };
+            //List<BatchMoveBean> BatchMoveList = new List<BatchMoveBean>() { BatchMove_A, BatchMove_B };
             if (!MoveStop)
             if (!MoveStop)
             { 
             { 
 
 

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -199,7 +199,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 else if (MoveInfo.IsTimeOut(60))
                 {
                 {
-                    MoveTimeOut(MoveInfo, "" + moveBean.Name + "获取料盘高度完成");
+                    MoveTimeOut(MoveInfo, "" + moveBean.Name + "获取料盘高度完成超时");
                 }
                 }
             }
             }
             else if (MoveInfo.IsStep(StepEnum.II13_GetPosId))
             else if (MoveInfo.IsStep(StepEnum.II13_GetPosId))