1

DeviceLibrary/DeviceLibrary/CameraTest.cs

@@ -10,7 +10,7 @@ namespace DeviceLibrary
     {
         public object ValueEdit(object value)
         {
-            Task.Run(() => CodeManager.TestHasReel(CodeManager.hikNameList[0]));
+            Task.Run(() => CodeManager.TestHasReel(CodeManager.hikNameList[0],out _,out _));
             return "Click To Test";
         }
     }

DeviceLibrary/theMachine/MainMachine_Clamp.cs

@@ -394,7 +394,7 @@ namespace DeviceLibrary
             get
             {
                 if (ConfigHelper.Config.Get("CamTestReel_Ability", false))
-                    return CodeManager.TestHasReel(CodeManager.hikNameList[0]);
+                    return CodeManager.TestHasReel(CodeManager.hikNameList[0],out _,out _);
                 else
                     return IOValue(IO_Type.NGDoor_Tray_Check).Equals(IO_VALUE.HIGH);
             }

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -240,7 +240,7 @@ namespace DeviceLibrary
                     {
                         tpos2 = 0;
                     }
-                    if (StringState == StringStateE.OutStore && tpos2 - Config.Batch_PoToMM * 30 < 0)
+                    if (StringState == StringStateE.OutStore && tpos2 - Config.Batch_PoToMM * 60 < 0)
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                         StringState = StringStateE.Full;
@@ -327,7 +327,7 @@ namespace DeviceLibrary
                         StringMoveInfo.NextMoveStep(MoveStep.StringReelPut_01);
                         downCheck2 = true;
                     }
-                    else if (tpos > Config.Batch_P1)
+                    else if (tpos > Config.Batch_P1+ Config.Batch_PoToMM * 60)
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.StringReadyPut);
                         StringMoveInfo.log($"料盘放入料串,下降{StringMoveInfo.MoveParam.PlateH}+{3}cm");
@@ -376,7 +376,7 @@ namespace DeviceLibrary
                     var tpos3 = Batch_Axis.GetAclPosition() - Config.Batch_PoToMM * Config.Batch_OutPlateDownMM;
                     if (tpos3 < 0)
                         tpos3 = 0;
-                    if (tpos3 > Config.Batch_P1)
+                    if (tpos3 > Config.Batch_P1+Config.Batch_PoToMM * 60)
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.StringLoad_04b);
                     }

TheMachine/SettingControl.cs

@@ -130,7 +130,7 @@ namespace TheMachine
 
         private void button1_Click_1(object sender, EventArgs e)
         {
-           Task.Run(()=>CodeManager.TestHasReel(CodeManager.hikNameList[0]));
+           Task.Run(()=>CodeManager.TestHasReel(CodeManager.hikNameList[0], out _, out _));
         }
 
         //private void button2_Click(object sender, EventArgs e)