jingbo 1 周之前
父节点
当前提交
f33678a6a8
共有 1 个文件被更改,包括 11 次插入11 次删除
  1. 11 11
      src/com/mes/ui/MesClient.java

+ 11 - 11
src/com/mes/ui/MesClient.java

@@ -313,9 +313,9 @@ public class MesClient extends JFrame {
         }
 
         test_sn_3.setText("");
-        String scanBarcode = JOptionPane.showInputDialog(null, "请扫衡量码1");
+        String scanBarcode = JOptionPane.showInputDialog(null, "请扫横梁码1");
         if (scanBarcode == null || scanBarcode.equalsIgnoreCase("")) {
-            setMenuStatus("衡量码1为空,请重新扫码", 1);
+            setMenuStatus("横梁码1为空,请重新扫码", 1);
             return;
         }
 
@@ -329,7 +329,7 @@ public class MesClient extends JFrame {
         if (retObj != null && retObj.get("result") != null && retObj.get("result").toString().equalsIgnoreCase("true")) {
             test3_bind_done = true;
             test_scan_bt_4.setEnabled(true);
-            setMenuStatus("衡量码1绑定成功", 0);
+            setMenuStatus("横梁码1绑定成功", 0);
         } else {
             test3_bind_done = false;
             if (retObj == null || retObj.get("result") == null) {
@@ -350,14 +350,14 @@ public class MesClient extends JFrame {
             return;
         }
         if (test_sn_3.getText().isEmpty()) {
-            setMenuStatus("请先扫码衡量码1", 1);
+            setMenuStatus("请先扫横梁码", 1);
             return;
         }
 
         test_sn_4.setText("");
-        String scanBarcode = JOptionPane.showInputDialog(null, "请扫衡量码2");
+        String scanBarcode = JOptionPane.showInputDialog(null, "请扫横梁码2");
         if (scanBarcode == null || scanBarcode.equalsIgnoreCase("")) {
-            setMenuStatus("衡量码2为空,请重新扫码", 1);
+            setMenuStatus("横梁码2为空,请重新扫码", 1);
             return;
         }
 
@@ -370,7 +370,7 @@ public class MesClient extends JFrame {
         JSONObject retObj = DataUtil.bindWarehouse(sn, wsn, user20, "400015");
         if (retObj != null && retObj.get("result") != null && retObj.get("result").toString().equalsIgnoreCase("true")) {
             test4_bind_done = true;
-            setMenuStatus("衡量码2绑定成功", 0);
+            setMenuStatus("横梁码2绑定成功", 0);
         } else {
             test4_bind_done = false;
             if (retObj == null || retObj.get("result") == null) {
@@ -717,7 +717,7 @@ public class MesClient extends JFrame {
         test_scan_bt_2.setEnabled(false);
         indexPanelA.add(test_scan_bt_2);
 
-        JLabel testLabel3 = new JLabel("衡量码1:");
+        JLabel testLabel3 = new JLabel("横梁码1:");
         testLabel3.setFont(new Font("微软雅黑", Font.PLAIN, 20));
         testLabel3.setBounds(20, 262, 140, 40);
         indexPanelA.add(testLabel3);
@@ -742,7 +742,7 @@ public class MesClient extends JFrame {
         test_scan_bt_3.setEnabled(false);
         indexPanelA.add(test_scan_bt_3);
 
-        JLabel testLabel4 = new JLabel("衡量码2:");
+        JLabel testLabel4 = new JLabel("横梁码2:");
         testLabel4.setFont(new Font("微软雅黑", Font.PLAIN, 20));
         testLabel4.setBounds(20, 328, 140, 40);
         indexPanelA.add(testLabel4);
@@ -789,7 +789,7 @@ public class MesClient extends JFrame {
                 if(work_status == 1 && check_quality_result){
                     if (test_sn_1.getText().trim().isEmpty() || test_sn_2.getText().trim().isEmpty()
                             || test_sn_3.getText().trim().isEmpty() || test_sn_4.getText().trim().isEmpty()) {
-                        MesClient.setMenuStatus("请先完成前后压铸件及衡量码绑定", -1);
+                        MesClient.setMenuStatus("请先完成前后压铸件及横梁码绑定", -1);
                         return;
                     }
                     getUser();
@@ -831,7 +831,7 @@ public class MesClient extends JFrame {
                 if(work_status == 1 && check_quality_result){
                     if (test_sn_1.getText().trim().isEmpty() || test_sn_2.getText().trim().isEmpty()
                             || test_sn_3.getText().trim().isEmpty() || test_sn_4.getText().trim().isEmpty()) {
-                        MesClient.setMenuStatus("请先完成前后压铸件及衡量码绑定", -1);
+                        MesClient.setMenuStatus("请先完成前后压铸件及横梁码绑定", -1);
                         return;
                     }
                     getUser();