料仓状态默认复位中

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -757,6 +757,7 @@ namespace OnlineStore.DeviceLibrary
             StopMove(true);
 
             storeRunStatus = StoreRunStatus.Wait;
+            storeStatus = StoreStatus.ResetMove;
             //mainTimer.Enabled = false;
             AutomaticBaiting.StopRun();
             KNDManager.CloseAllDO();

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -399,9 +399,11 @@ namespace OnlineStore.DeviceLibrary
                 {
                     if (IsHasCompress_Axis)
                     {
-                        InStoreLog("入库：SI_06 压紧轴压紧，压紧轴到P2 ");
+                        int targetPosition = moveP.UpDown_P1 - Config.UpDownAxis_DownValue;
+                        InStoreLog("入库：SI_06 压紧轴压紧，压紧轴到P2，升降轴稍微下降【" + Config.UpDownAxis_DownValue + "】，目标位置【" + targetPosition + "】 ");
                         StoreMove.NextMoveStep(StoreMoveStep.SI_06_CompressWork);
                         ComMoveToPosition(moveP.ComPress_P2, true);
+                        ACAxisMove(Config.UpDown_Axis, targetPosition, Config.UpDownAxis_P1_Speed);
                     }
                     else
                     {
@@ -412,13 +414,13 @@ namespace OnlineStore.DeviceLibrary
                 }
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SI_06_CompressWork)
-            {
-                int targetPosition = moveP.UpDown_P1 - Config.UpDownAxis_DownValue;
-                InStoreLog("入库：SI_061  升降轴稍微下降【"+Config.UpDownAxis_DownValue+"】，目标位置【"+targetPosition+"】 ");
-                StoreMove.NextMoveStep(StoreMoveStep.SI_061_UpdownAxisDown); 
-                ACAxisMove(Config.UpDown_Axis, targetPosition, Config.UpDownAxis_P1_Speed);
-            }
-            else if (StoreMove.MoveStep == StoreMoveStep.SI_061_UpdownAxisDown)
+            //{
+            //    int targetPosition = moveP.UpDown_P1 - Config.UpDownAxis_DownValue;
+            //    InStoreLog("入库：SI_061  升降轴稍微下降【"+Config.UpDownAxis_DownValue+"】，目标位置【"+targetPosition+"】 ");
+            //    StoreMove.NextMoveStep(StoreMoveStep.SI_061_UpdownAxisDown); 
+            //    ACAxisMove(Config.UpDown_Axis, targetPosition, Config.UpDownAxis_P1_Speed);
+            //}
+            //else if (StoreMove.MoveStep == StoreMoveStep.SI_061_UpdownAxisDown)
             {
                 InStoreLog("入库：SI_07  叉子返回，进出轴至P1(待机点) ");
                 StoreMove.NextMoveStep(StoreMoveStep.SI_07_DeviceBackFromDoor);

source/DeviceLibrary/store/AC_Store.cs

@@ -52,7 +52,7 @@ namespace OnlineStore.DeviceLibrary
         ///  6=入库执行中,7=入仓完成，8=入仓失败
         /// 9=出库执行，10=出仓完成，11=出库失败
         /// </summary>
-        public StoreStatus storeStatus = StoreStatus.StoreOnline;
+        public StoreStatus storeStatus = StoreStatus.ResetMove;
         /// <summary>
         /// 料仓状态
         /// </summary>