|
@@ -111,6 +111,7 @@ public class MesClient extends JFrame {
|
|
|
public static JLabel countdownLabel = null; // 倒计时显示标签
|
|
public static JLabel countdownLabel = null; // 倒计时显示标签
|
|
|
public static TestParam pendingTestParam = null; // 等待提交的测试参数
|
|
public static TestParam pendingTestParam = null; // 等待提交的测试参数
|
|
|
public static String deviceResult = ""; // 设备判定结果
|
|
public static String deviceResult = ""; // 设备判定结果
|
|
|
|
|
+ public static boolean testResultProcessed = false; // 测试结果是否已处理(防止重复执行)
|
|
|
|
|
|
|
|
public static String tjFlagText2 = "设备运行中";
|
|
public static String tjFlagText2 = "设备运行中";
|
|
|
|
|
|
|
@@ -352,6 +353,8 @@ public class MesClient extends JFrame {
|
|
|
// 清空待提交数据
|
|
// 清空待提交数据
|
|
|
pendingTestParam = null;
|
|
pendingTestParam = null;
|
|
|
deviceResult = "";
|
|
deviceResult = "";
|
|
|
|
|
+ // 重置测试结果处理标志
|
|
|
|
|
+ testResultProcessed = false;
|
|
|
|
|
|
|
|
// f_scan_data_bt_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/scan_barcode.png")));
|
|
// f_scan_data_bt_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/scan_barcode.png")));
|
|
|
// f_scan_data_bt_1.setText("扫码");
|
|
// f_scan_data_bt_1.setText("扫码");
|
|
@@ -1825,6 +1828,9 @@ public class MesClient extends JFrame {
|
|
|
deviceResult = "OK";
|
|
deviceResult = "OK";
|
|
|
countdownSeconds = 5;
|
|
countdownSeconds = 5;
|
|
|
|
|
|
|
|
|
|
+ // 禁用扫码框,防止扫下一件
|
|
|
|
|
+ product_sn.setEditable(false);
|
|
|
|
|
+
|
|
|
// 显示倒计时标签
|
|
// 显示倒计时标签
|
|
|
countdownLabel.setText("5秒后自动提交OK...");
|
|
countdownLabel.setText("5秒后自动提交OK...");
|
|
|
countdownLabel.setVisible(true);
|
|
countdownLabel.setVisible(true);
|
|
@@ -1897,6 +1903,9 @@ public class MesClient extends JFrame {
|
|
|
pendingTestParam = testParam;
|
|
pendingTestParam = testParam;
|
|
|
deviceResult = "NG";
|
|
deviceResult = "NG";
|
|
|
|
|
|
|
|
|
|
+ // 禁用扫码框,防止扫下一件
|
|
|
|
|
+ product_sn.setEditable(false);
|
|
|
|
|
+
|
|
|
// 启用漏点按钮
|
|
// 启用漏点按钮
|
|
|
enableWeldButtons();
|
|
enableWeldButtons();
|
|
|
|
|
|