1

DeviceLibrary/theMachine/LabelParam.cs

@@ -163,7 +163,7 @@ namespace DeviceLibrary
         {
         {
             if (storeSide == StoreSide.NGDoor)
             if (storeSide == StoreSide.NGDoor)
             {
             {
-                Middle_P2 = Config.Middle_P1;
+                Middle_P2 = Config.Middle_P2;
                 InOut_P2 = Config.InOut_P2;
                 InOut_P2 = Config.InOut_P2;
                 UpDown_PH = Config.UpDown_P2;
                 UpDown_PH = Config.UpDown_P2;
                 UpDown_PL = Config.UpDown_P3;
                 UpDown_PL = Config.UpDown_P3;
@@ -171,7 +171,7 @@ namespace DeviceLibrary
             }
             }
             else if (storeSide == StoreSide.String)
             else if (storeSide == StoreSide.String)
             {
             {
-                Middle_P2 = Config.Middle_P1;
+                Middle_P2 = Config.Middle_P3;
                 InOut_P2 = Config.InOut_P3;
                 InOut_P2 = Config.InOut_P3;
                 UpDown_PH = Config.UpDown_P4;
                 UpDown_PH = Config.UpDown_P4;
                 UpDown_PL = Config.UpDown_P5;
                 UpDown_PL = Config.UpDown_P5;

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -174,14 +174,14 @@ namespace DeviceLibrary
                         var tpos2 = Batch_Axis.GetAclPosition() - Config.Batch_PoToMM * Config.Batch_DetectDownMM;
                         var tpos2 = Batch_Axis.GetAclPosition() - Config.Batch_PoToMM * Config.Batch_DetectDownMM;
                         if (tpos2 < 0)
                         if (tpos2 < 0)
                         {
                         {
-                            tpos2 = 0;
-                            if (tpos2 - Config.Batch_PoToMM * 30 < 0)
+                            tpos2 = 0;                            
+                        }
+                        if (StringState == StringStateE.Empty && tpos2 - Config.Batch_PoToMM * 30 < 0)
                             {
                             {
                                 StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                                 StringMoveInfo.NextMoveStep(MoveStep.StringOut_01);
                                 StringState = StringStateE.Full;
                                 StringState = StringStateE.Full;
                                 StringMoveInfo.log($"料串已满可以送出");
                                 StringMoveInfo.log($"料串已满可以送出");
                             }
                             }
-                        }
                         Batch_Axis.AbsMove(StringMoveInfo, tpos2, Config.Batch_P1);
                         Batch_Axis.AbsMove(StringMoveInfo, tpos2, Config.Batch_P1);
                     }
                     }
                     break;
                     break;
@@ -300,7 +300,10 @@ namespace DeviceLibrary
                     CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
                     CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
                     break;
                     break;
                 case MoveStep.StringOut_Released:
                 case MoveStep.StringOut_Released:
-                    Msg.add(crc.GetString(L.string_full_takeout, "料串已满请取出"), MsgLevel.warning);//0427
+                    if (StringState == StringStateE.Full)
+                        Msg.add(crc.GetString(L.string_full_takeout, "料串已满请取出"), MsgLevel.warning);//0427
+                    else
+                        Msg.add(crc.GetString(L.wait_string_take, "等待料串被取走"), MsgLevel.warning);
                     if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW))
                     if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW))
                     {
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.Wait);
                         StringMoveInfo.NextMoveStep(MoveStep.Wait);

DeviceLibrary/userControl/AxisMoveControl.cs

@@ -105,7 +105,7 @@ namespace DeviceLibrary
             }
             }
             int position = FormUtil.GetIntValue(txtAPosition);
             int position = FormUtil.GetIntValue(txtAPosition);
             int speed = FormUtil.GetIntValue(txtASpeed);
             int speed = FormUtil.GetIntValue(txtASpeed);
-            if (currentAxis.IsSafe(position,out string msg))
+            if (!currentAxis.IsSafe(position,out string msg))
             {
             {
                 MessageBox.Show(msg);
                 MessageBox.Show(msg);
                 return;
                 return;
@@ -127,7 +127,7 @@ namespace DeviceLibrary
             int position = FormUtil.GetIntValue(txtAPosition);
             int position = FormUtil.GetIntValue(txtAPosition);
             int speed = FormUtil.GetIntValue(txtASpeed);
             int speed = FormUtil.GetIntValue(txtASpeed);
 
 
-            if (currentAxis.IsSafe(currentAxis.GetAclPosition()+position, out string msg))
+            if (!currentAxis.IsSafe(currentAxis.GetAclPosition()+position, out string msg))
             {
             {
                 MessageBox.Show(msg);
                 MessageBox.Show(msg);
                 return;
                 return;