1

DeviceLibrary/theMachine/MainMachine_Counting.cs

@@ -102,6 +102,12 @@ namespace DeviceLibrary
                             goto retryopen;
                             goto retryopen;
                         }
                         }
                         Thread.Sleep(1000);
                         Thread.Sleep(1000);
+                        if (!RobotManage.XRay.SetVC(Setting_Init.XRay_Voltage.ToString(), Setting_Init.XRay_Current.ToString()))
+                        {
+                            CountMoveInfo.log(string.Format("X光电压电流设置失败:{0},{1}", Setting_Init.XRay_Voltage, Setting_Init.XRay_Current));
+                            goto retryopen;
+                        }
+                        Thread.Sleep(1000);
                         goto retry;
                         goto retry;
                     }
                     }
                     break;
                     break;

DeviceLibrary/theMachine/MainMachine_OutMove.cs

@@ -85,9 +85,9 @@ namespace DeviceLibrary
                     else
                     else
                     {
                     {
                         takeretry++;
                         takeretry++;
-                        OutMoveInfo.MoveParam.PlateH--;
+                        OutMoveInfo.MoveParam.PlateH= OutMoveInfo.MoveParam.PlateH-2;
                         OutMoveInfo.log($"未取到料盘");
                         OutMoveInfo.log($"未取到料盘");
-                        if (takeretry < 3)
+                        if (takeretry < 3 && OutMoveInfo.MoveParam.PlateH>=8)
                         {
                         {
                             OutMoveInfo.NextMoveStep(MoveStep.Out_05);
                             OutMoveInfo.NextMoveStep(MoveStep.Out_05);
                             OutMoveInfo.log($"重试取盘:"+ OutMoveInfo.MoveParam.PlateH);
                             OutMoveInfo.log($"重试取盘:"+ OutMoveInfo.MoveParam.PlateH);

DeviceLibrary/userControl/AxisMoveControl.cs

@@ -425,7 +425,8 @@ namespace DeviceLibrary
                     lbl.BackColor = Color.Red   ;
                     lbl.BackColor = Color.Red   ;
                     lblAlarmcode.Visible = true;
                     lblAlarmcode.Visible = true;
                     lblAlarmcode.ForeColor = Color.Red;
                     lblAlarmcode.ForeColor = Color.Red;
-                    lblAlarmcode.Text = "错误码：" + HCBoardManager.GetAxErrCode(SlvAddr);
+                    var err = HCBoardManager.GetAxisErrorDetail(SlvAddr);
+                    lblAlarmcode.Text = "错误码：" + err[0]+" "+ err[1];
                 }
                 }
                 else
                 else
                 {
                 {