复位bug修改

source/DeviceLibrary/duoStore/DUOStoreBean.cs

@@ -128,6 +128,10 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else
             else
             {
             {
+                if (!OpenAllAxis(true))
+                {
+                    return false;
+                }
                 LogUtil.info(Name + "开始启动 ，启动时间：" + StartTime.ToString());
                 LogUtil.info(Name + "开始启动 ，启动时间：" + StartTime.ToString());
                 runStatus = StoreRunStatus.HomeMoving;
                 runStatus = StoreRunStatus.HomeMoving;
                 StartTime = DateTime.Now;
                 StartTime = DateTime.Now;
@@ -149,6 +153,11 @@ namespace OnlineStore.DeviceLibrary
 
 
             //停止运动
             //停止运动
             MoveInfo.EndMove();
             MoveInfo.EndMove();
+            if (!OpenAllAxis(true))
+            {
+                LogInfo("复位时打开轴失败，需要再次复位，直接报警停止复位");
+                return;
+            }
             runStatus = StoreRunStatus.Reset;
             runStatus = StoreRunStatus.Reset;
             StartResetMove();
             StartResetMove();
 
 

source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs

@@ -482,9 +482,9 @@ namespace OnlineStore.DeviceLibrary
             else if (IOValue(IO_Type.Line_WaitCheck).Equals(IO_VALUE.HIGH))
             else if (IOValue(IO_Type.Line_WaitCheck).Equals(IO_VALUE.HIGH))
             {
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.LI_04_LineStart);
                 MoveInfo.NextMoveStep(StoreMoveStep.LI_04_LineStart);
-                InOutStoreLog("入料检测： 上料等待区有料架 ，阻挡1下降500，阻挡2上升，流水线转动 ,等待料架到达上料区");
+                InOutStoreLog("入料检测： 上料等待区有料架 ，阻挡1下降2000，阻挡2上升，流水线转动 ,等待料架到达上料区");
 
 
-                IOMove(IO_Type.Line_Stop1_Wait, IO_VALUE.HIGH, false, 500);//进料阻挡下降
+                IOMove(IO_Type.Line_Stop1_Wait, IO_VALUE.HIGH, false, 2000);//进料阻挡下降
                 IOMove(IO_Type.Line_Stop2_Work, IO_VALUE.LOW);//缓冲阻挡前进1000
                 IOMove(IO_Type.Line_Stop2_Work, IO_VALUE.LOW);//缓冲阻挡前进1000
                 LineRun(MoveInfo);
                 LineRun(MoveInfo);
                 //等待指定时间
                 //等待指定时间
@@ -794,9 +794,9 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.NextMoveStep(StoreMoveStep.LI_34_WorkStopDown);
                     MoveInfo.NextMoveStep(StoreMoveStep.LI_34_WorkStopDown);
                     InOutStoreLog("送出料架[" + InstoreEndSendShelf + "]：上料阻挡下降1秒，流水线开始转动");
                     InOutStoreLog("送出料架[" + InstoreEndSendShelf + "]：上料阻挡下降1秒，流水线开始转动");
                     UpdateShelfNum(-1, -1);
                     UpdateShelfNum(-1, -1);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1500));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
                     LineRun(MoveInfo);
                     LineRun(MoveInfo);
-                    IOMove(IO_Type.Line_Stop2_Work, IO_VALUE.HIGH, false, 1500);
+                    IOMove(IO_Type.Line_Stop2_Work, IO_VALUE.HIGH, false, 2000);
 
 
                 }
                 }
                 else
                 else