气密泄露点位补充

src/com/mes/ui/MesClient.java

@@ -308,6 +308,7 @@ public class MesClient extends JFrame {
         pendingNgTestParam = null;
         MesClient.finish_ok_bt.setEnabled(false);
         MesClient.finish_ng_bt.setEnabled(false);
+        MesClient.finish_ng_bt.setVisible(false);
         product_sn.setText("");
         product_sn.setEditable(true);
         tjFlag = 0;
@@ -325,8 +326,10 @@ public class MesClient extends JFrame {
 
         updateMaterailData();
 
-//        MesClient.result.setText("等待结果");
-//        MesClient.result.setForeground(Color.GRAY);
+        if (MesClient.result != null) {
+            MesClient.result.setText("");
+            MesClient.result.setVisible(false);
+        }
     }
 
     public static int userLoginHours;//用户登录所处小时
@@ -634,10 +637,12 @@ public class MesClient extends JFrame {
     }
 
     public static void scanBarcode() {
-        if (work_status == 1) {
-            startQmDevice();
+        if (work_status != 1) {
+            scan_type = 1;
+            scanBarcode2();
             return;
         }
+        startQmDevice();
     }
 
     public static void scanBarcode2() {
@@ -730,6 +735,7 @@ public class MesClient extends JFrame {
         if (MesClient.configParam.getStartMode().equals("自动启动")) {
             startQmDevice();
         }
+        MesClient.result.setVisible(true);
         MesClient.result.setText("等待结果");
         MesClient.result.setForeground(Color.GRAY);
     }
@@ -768,6 +774,7 @@ public class MesClient extends JFrame {
         }
         String ngLeakPoints = LeakNgPointDialog.showDialog(mesClientFrame);
         if (ngLeakPoints == null) {
+            MesClient.finish_ng_bt.setVisible(true);
             MesClient.finish_ng_bt.setEnabled(true);
             MesClient.setMenuStatus("气密 NG，请选择漏点点位", -1);
             return;
@@ -788,6 +795,7 @@ public class MesClient extends JFrame {
             boolean hasLeakPoints = leakPoints != null && !leakPoints.trim().isEmpty();
             if (!isOk && !hasLeakPoints && mes_enable) {
                 pendingNgTestParam = testParam;
+                MesClient.finish_ng_bt.setVisible(true);
                 MesClient.finish_ng_bt.setEnabled(true);
                 MesClient.finish_ok_bt.setEnabled(false);
                 MesClient.setMenuStatus("气密 NG，请选择漏点点位", -1);
@@ -1168,6 +1176,7 @@ public class MesClient extends JFrame {
         result.setFont(new Font("微软雅黑", Font.BOLD, 50));
 //        result.setBounds(290, 392, 356, 89);
         result.setBounds(290, 332, 356, 89);
+        result.setVisible(false);
         indexPanelA.add(result);
 
         finish_ok_bt = new JButton("OK");
@@ -1185,6 +1194,7 @@ public class MesClient extends JFrame {
 
         finish_ng_bt = new JButton("NG");
         finish_ng_bt.setEnabled(false);
+        finish_ng_bt.setVisible(false);
         finish_ng_bt.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 if (pendingNgTestParam != null) {