1

source/DeviceLibrary/PanasonicServo/ACServerManager.cs

@@ -354,7 +354,7 @@ namespace OnlineStore.DeviceLibrary
                         Thread.Sleep(time);
                         Thread.Sleep(time);
                         LogUtil.info("轴【" + portName + "_" + slvAddr + "】匀速 已等待" + time + "，直接停止");
                         LogUtil.info("轴【" + portName + "_" + slvAddr + "】匀速 已等待" + time + "，直接停止");
                         SuddenStop(portName, slvAddr);
                         SuddenStop(portName, slvAddr);
-                        Thread.Sleep(SleepMSendons);
+                        Thread.Sleep(100);
                     }
                     }
                 }
                 }
             }catch(Exception ex)
             }catch(Exception ex)

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -228,11 +228,8 @@ namespace OnlineStore.DeviceLibrary
             //判断叉子没有料盘
             //判断叉子没有料盘
             //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW)); 
             //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW)); 
         }
         }
-        public override void Reset()
-        {
-            Reset(true);
-        }
-        public void Reset(bool isNeedClearAuto)
+    
+        public void Reset(bool isNeedClearAuto=true)
         {
         {
             CurrInOutCount = 0;
             CurrInOutCount = 0;
             CurrInOutACount = 0;
             CurrInOutACount = 0;
@@ -865,7 +862,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
         }
         }
         private IO_VALUE lastAutoRun = IO_VALUE.LOW;
         private IO_VALUE lastAutoRun = IO_VALUE.LOW;
-     //   private IO_VALUE lastAirValue = IO_VALUE.LOW;
+        //   private IO_VALUE lastAirValue = IO_VALUE.LOW;
         public void IoCheckProcess()
         public void IoCheckProcess()
         {
         {
             DateTime time = DateTime.Now;
             DateTime time = DateTime.Now;
@@ -910,29 +907,20 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         if (StoreMove.MoveType.Equals(StoreMoveType.None))
                         if (StoreMove.MoveType.Equals(StoreMoveType.None))
                         {
                         {
-                            LogUtil.info(LOGGER, "收到复位信号但是没有报警，且当前无操作，只回到待机点");
+                            LogUtil.info(LOGGER, "收到复位信号，当前无报警，且空闲中，只回到待机点");
                             MoveToP1();
                             MoveToP1();
                         }
                         }
                         else
                         else
                         {
                         {
-                            LogUtil.info(LOGGER, "收到复位信号但是已经在" + StoreMove.MoveType + "处理中，且无报警，不处理");
-                            //WarnMsg = "收到复位信号但是已经在" + StoreMove.MoveType + "处理中，且无报警，不处理";
+                            LogUtil.info(LOGGER, "收到复位信号，当前无报警， 在" + StoreMove.MoveType + "处理中，不处理复位");
                         }
                         }
                     }
                     }
                     else
                     else
                     {
                     {
-                        //判断已经在复位中并且没有报警，不需要重新复位
-                        if (StoreMove.MoveType.Equals(StoreMoveType.StoreReset) && alarmType.Equals(StoreAlarmType.None))
-                        {
-                            LogUtil.error(LOGGER, "收到复位信号：已经在复位中且没有报警，不需要重新复位！");
-                        }
-                        else
-                        {
-                            //收到复位信号
-                            LogUtil.info(LOGGER, "收到复位信号，自动复位");
-                            WarnMsg = "收到复位信号，自动复位";
-                            Reset();
-                        }
+                        //收到复位信号
+                        LogUtil.info(LOGGER, "收到复位信号，自动复位");
+                        WarnMsg = "收到复位信号，自动复位";
+                        Reset(); 
                     }
                     }
                 }
                 }
             }
             }