20190918更新：压紧轴原点返回， 超时时间为2分钟

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -385,6 +385,7 @@ namespace OnlineStore.DeviceLibrary
                     StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack);
                     if (IsHasCompress_Axis)
                     {
+                        StoreMove.TimeOutSeconds = 120;
                         StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
                         ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 1);
                         Thread.Sleep(60);
@@ -422,6 +423,7 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.info(LOGGER, StoreName + "到待机状态，压紧轴回原点，关闭舱门");
                     if (IsHasCompress_Axis)
                     {
+                        StoreMove.TimeOutSeconds = 120;
                         StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 1, true));
                         ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 1);
                     }
@@ -625,6 +627,7 @@ namespace OnlineStore.DeviceLibrary
                     StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack);
                     if (IsHasCompress_Axis)
                     {
+                        StoreMove.TimeOutSeconds = 120;
                         StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
                         ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 1);
                         Thread.Sleep(60);

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -365,9 +365,10 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (Config.Box_ResetCCount < CurrInOutCCount && IsHasCompress_Axis)
                 { 
-                    StoreMove.NextMoveStep(StoreMoveStep.SI_021_CompAxisHome); 
+                    StoreMove.NextMoveStep(StoreMoveStep.SI_021_CompAxisHome);
                     OutStoreLog("出库：SI_021 已出入库" + CurrInOutCCount + "次，压紧轴需要原点返回");
                     CurrInOutCCount = 0;
+                    StoreMove.TimeOutSeconds = 120;
                     StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
                     ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 1);
                 }
@@ -629,7 +630,8 @@ namespace OnlineStore.DeviceLibrary
                 {
                     StoreMove.NextMoveStep(StoreMoveStep.SO_021_CompAxisHome);
                     OutStoreLog("出库：SO_021 已出入库" + CurrInOutCCount + "次，压紧轴需要原点返回");
-                    CurrInOutCCount = 0; 
+                    CurrInOutCCount = 0;
+                    StoreMove.TimeOutSeconds = 120;
                     StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
                     ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 1); 
                 }
@@ -742,6 +744,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
                 OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
+                StoreMove.TimeOutSeconds = 120;
                 StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
                 StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
                 OpenDoorAndWait();

source/DeviceLibrary/store/model/StoreMoveInfo.cs

@@ -82,6 +82,7 @@ namespace OnlineStore.DeviceLibrary
  
         public void NextMoveStep(StoreMoveStep step)
         {
+            TimeOutSeconds = 60;
             PreMoveStep = moveStep;
             moveStep = step;
             LastSetpTime = DateTime.Now;