Merge branch 'master' of http://106.15.194.121:8083/zdl/ns200

DeviceLibrary/AutoScanAndLabel/MainMachine _LeftProcess.cs

@@ -118,11 +118,11 @@ namespace DeviceLibrary
                     {
                         int countPleHight = param.RightPlateHeight * Config.Left_Batch_ChangeValue;
                         var target = currpoint - countPleHight + 5000;
-                        if (target < targetP1)
+                       // if (target < targetP1)
                         {
                             targetP1 = target;
                             LeftMoveInfo.MoveParam.PlateH = countPleHight / Config.Left_Batch_ChangeValue;
-                            LeftMoveInfo.log($"出料提升机构，获取到料盘高度脉冲{param.RightPlateHeight},当前位置{currpoint},计算盘高{LeftMoveInfo.MoveParam.PlateH}");
+                            LeftMoveInfo.log($"出料提升机构，获取到料盘高度脉冲{param.RightPlateHeight},当前位置{currpoint},计算盘高{param.PlateH}");
                         }
                     }
                     int targetSpeed = Config.Left_Batch_P1_speed;
@@ -134,9 +134,8 @@ namespace DeviceLibrary
                         LeftMoveInfo.log($"批量轴已下降到底,料串已满,Left_Batch_P1={Config.Left_Batch_P1}");
                     }
 
-                    LeftMoveInfo.log($"出料提升机构，下降固定值为{targetP1}脉冲！");
+                    LeftMoveInfo.log($"出料提升机构，批量轴下降固定值为{targetP1}脉冲！");
                     Left_Batch_Axis.AbsMove(LeftMoveInfo, targetP1, targetSpeed);
-                    LeftMoveInfo.log($"批量轴下降固定值");
                     break;
                 //根据轴位置判断去料串满步骤还是不满步骤
                 case MoveStep.L04: