入料提升轴取完料慢上升

source/DeviceLibrary/baan/AxisBean.cs

@@ -339,7 +339,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 axisCheckTimer = new System.Timers.Timer();
                 axisCheckTimer = new System.Timers.Timer();
                 axisCheckTimer.AutoReset = true;
                 axisCheckTimer.AutoReset = true;
-                axisCheckTimer.Interval += 30;
+                axisCheckTimer.Interval += 5;
                 axisCheckTimer.Elapsed += CheckTimer_Elapsed;
                 axisCheckTimer.Elapsed += CheckTimer_Elapsed;
                 axisCheckTimer.Enabled = false;
                 axisCheckTimer.Enabled = false;
             }
             }

source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs

@@ -455,7 +455,7 @@ namespace OnlineStore.DeviceLibrary
                     bool rtn = SServerManager.InstorePosCheck(MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode);
                     bool rtn = SServerManager.InstorePosCheck(MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode);
                     if (!rtn)
                     if (!rtn)
                     {
                     {
-                        InOutParam inOut = new InOutParam(new InOutPosInfo(MoveInfo.MoveParam.PosInfo.barcode, MoveInfo.MoveParam.PosInfo.PosId));
+                        InOutParam inOut = new InOutParam(MoveInfo.MoveParam.PosInfo.ToCopy());
                         LogInfo($"入库 {MoveInfo.SLog}：验证入库完成失败，将该库位出库[{inOut.PosInfo.ToStr()}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                         LogInfo($"入库 {MoveInfo.SLog}：验证入库完成失败，将该库位出库[{inOut.PosInfo.ToStr()}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                         // if (CheckASide())
                         // if (CheckASide())
                         {
                         {

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -133,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
             LastCodeList = new List<string>();
             LastCodeList = new List<string>();
             //NextCodeList = new List<string>();
             //NextCodeList = new List<string>();
             MoveInfo.ShelfNoTray = false;
             MoveInfo.ShelfNoTray = false;
-            BatchAxisToP2();
+            BatchAxisToP2(false);
         }
         }
         protected void InstoreProcess()
         protected void InstoreProcess()
         {
         {
@@ -298,7 +298,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(StepEnum.IB15_BatchAxisToP2);
                 MoveInfo.NextMoveStep(StepEnum.IB15_BatchAxisToP2);
                 WorkLog("料串入料 ：料盘已拿走，批量轴到P2,测盘高 ");
                 WorkLog("料串入料 ：料盘已拿走，批量轴到P2,测盘高 ");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                BatchAxisToP2();
+                BatchAxisToP2(false);
             }
             }
             else if (MoveInfo.IsStep(StepEnum.IB15_BatchAxisToP2))
             else if (MoveInfo.IsStep(StepEnum.IB15_BatchAxisToP2))
             {
             {
@@ -492,7 +492,7 @@ namespace OnlineStore.DeviceLibrary
                         MoveInfo.NextMoveStep(StepEnum.IB07_3_AxisUpMove);
                         MoveInfo.NextMoveStep(StepEnum.IB07_3_AxisUpMove);
                         WorkLog("料串入料 ：CheckHasTray：上料轴开始慢速上升到P2点，等待检测到料盘。currP" + currP.ToString());
                         WorkLog("料串入料 ：CheckHasTray：上料轴开始慢速上升到P2点，等待检测到料盘。currP" + currP.ToString());
                         MoveInfo.ShelfNoTray = false;
                         MoveInfo.ShelfNoTray = false;
-                        BatchAxisToP2();
+                        BatchAxisToP2(false);
                         return;
                         return;
                     }
                     }
                 }
                 }
@@ -627,7 +627,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     MoveInfo.NextMoveStep(StepEnum.IS07_AxisUpMove);
                     MoveInfo.NextMoveStep(StepEnum.IS07_AxisUpMove);
                     WorkLog("料串入库完成，料串上升到P2或检测到料盘");
                     WorkLog("料串入库完成，料串上升到P2或检测到料盘");
-                    BatchAxisToP2();
+                    BatchAxisToP2(true);
                 }
                 }
             }
             }
             return true;
             return true;
@@ -819,7 +819,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     MoveInfo.NextMoveStep(StepEnum.IS07_AxisUpMove);
                     MoveInfo.NextMoveStep(StepEnum.IS07_AxisUpMove);
                     WorkLog("料串入库完成，料串上升到P2或检测到料盘");
                     WorkLog("料串入库完成，料串上升到P2或检测到料盘");
-                    BatchAxisToP2();
+                    BatchAxisToP2(false);
                 }
                 }
             }
             }
             else
             else