出口防护门夹到料问题修改

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip.cs

@@ -99,7 +99,8 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 CloseAllAxis();
                 CloseAllAxis();
                 return false;
                 return false;
-            } 
+            }
+            mainTimer.Enabled = false ;
             runStatus = RobotRunStatus.Reset;
             runStatus = RobotRunStatus.Reset;
 
 
             MoveInfo.NewMove(RobotMoveType.Reset);
             MoveInfo.NewMove(RobotMoveType.Reset);
@@ -107,7 +108,8 @@ namespace OnlineStore.DeviceLibrary
             ShelfMoveInfo.NewMove(RobotMoveType.Reset);
             ShelfMoveInfo.NewMove(RobotMoveType.Reset);
 
 
             LogInfo("开始重置：  ");
             LogInfo("开始重置：  ");
-            StartReset(); 
+            StartReset();
+            mainTimer.Enabled = true ;
             return true;
             return true;
         }
         }
 
 

RC1266-AutoCountMachine/source/DeviceLibrary/bean/RobotBean.cs

@@ -158,8 +158,7 @@ namespace OnlineStore.DeviceLibrary
 
 
 
 
         public override bool Reset()
         public override bool Reset()
-        {
-            mainTimer.Enabled = false;
+        { 
             bool isNeedAllReset = false;
             bool isNeedAllReset = false;
             if (isInSuddenDown || isNoAirCheck)
             if (isInSuddenDown || isNoAirCheck)
             {
             {
@@ -169,7 +168,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if ((runStatus == RobotRunStatus.HomeMoving || runStatus == RobotRunStatus.Reset) && NoAlarm())
             else if ((runStatus == RobotRunStatus.HomeMoving || runStatus == RobotRunStatus.Reset) && NoAlarm())
             {
             {
-                LogUtil.error(Name + "收到复位信号，已经在复位或原点返回中，且当前无报警，不处理复位");
+                LogUtil.error(Name + "收到复位信号，已经在复位或原点返回中，且当前无报警，不处理复位"); 
                 return false;
                 return false;
             }
             }
 
 

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs

@@ -299,13 +299,13 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(StepEnum.XW25_WaitTime);
                 MoveInfo.NextMoveStep(StepEnum.XW25_WaitTime);
                 //Out_ReelInfo = Work_ReelInfo.GetReelInfo();
                 //Out_ReelInfo = Work_ReelInfo.GetReelInfo();
                 //Work_ReelInfo = new ReelInfo();
                 //Work_ReelInfo = new ReelInfo();
-                WorkLog("料盘处理： 中间皮带线先停止，出口皮带线 再转动2秒，出口门先关闭，档停先下降");
+                WorkLog("料盘处理： 中间皮带线先停止，出口皮带线 再转动3秒，挡停先下降");
 
 
                 IOMove(IO_Type.X_MLine_Run, IO_VALUE.LOW);
                 IOMove(IO_Type.X_MLine_Run, IO_VALUE.LOW);
                 IOMove(IO_Type.X_OLine_Run, IO_VALUE.HIGH);
                 IOMove(IO_Type.X_OLine_Run, IO_VALUE.HIGH);
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.HIGH));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.HIGH));
-                CylinderMove(null, IO_Type.X_OutDoor_Down, IO_Type.X_OutDoor_Up);
+                //CylinderMove(null, IO_Type.X_OutDoor_Down, IO_Type.X_OutDoor_Up);
                 CylinderMove(null, IO_Type.X_StopCylinder_Up, IO_Type.X_StopCylinder_Down);
                 CylinderMove(null, IO_Type.X_StopCylinder_Up, IO_Type.X_StopCylinder_Down);
             }
             }