优化

src/com/mes/ui/MesClient.java

@@ -111,7 +111,7 @@ public class MesClient extends JFrame {
 
 
     public static String namea = "A"; // A枪名称 M5
-    public static Integer maxa = 12; // A枪任务数  360=12 290=89
+    public static Integer maxa = 14; // A枪任务数  360=12 290=89
     public static Integer cura = 0; // A枪当前数
     public static Integer resulta = 0; // A枪结果 0=NG 1=OK
     public static List<String> atids = new ArrayList<>();
@@ -516,7 +516,7 @@ public class MesClient extends JFrame {
         }
 
         YgslUtil.disableTool(ygslClient);
-        YgslUtil2.disableTool(ygslClient2);
+//        YgslUtil2.disableTool(ygslClient2);
 
         ModbusRtu.closeDevice(serialPort);
 
@@ -734,10 +734,10 @@ public class MesClient extends JFrame {
             }
         });
         settingMenu.add(reset1);
-        contentPane = new JPanel();
-        contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-        setContentPane(contentPane);
-        contentPane.setLayout(new BorderLayout(0, 0));
+//        contentPane = new JPanel();
+//        contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+//        setContentPane(contentPane);
+//        contentPane.setLayout(new BorderLayout(0, 0));
 
 
         JLabel equipment_statu_label = new JLabel("状态：");
@@ -978,7 +978,7 @@ public class MesClient extends JFrame {
         ygsllast.setBounds(690, 171, 140, 40);
 //        indexPanelA.add(ygsllast);
         
-        JLabel lblNewLabel = new JLabel("M6");
+        JLabel lblNewLabel = new JLabel("A枪");
         lblNewLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         lblNewLabel.setFont(new Font("微软雅黑", Font.PLAIN, 28));
         lblNewLabel.setBounds(185, 180, 261, 30);

src/com/mes/ui/MesClientDJ.java

@@ -732,14 +732,14 @@ public class MesClientDJ extends JFrame {
         equipment_statu_label.setBackground(Color.LIGHT_GRAY);
         toolBar.add(equipment_statu_label);
 
-        status_menu = new JButton("已连接MES服务器");
-//        if(tcp_connect_flag) {
-//            status_menu.setText("已连接MES服务器");
-//            status_menu.setForeground(Color.GREEN);
-//        }else {
-//            status_menu.setText("未连接MES服务器");
-//            status_menu.setForeground(Color.DARK_GRAY);
-//        }
+        status_menu = new JButton("设备未连接MES服务器");
+        if(tcp_connect_flag) {
+            status_menu.setText("已连接MES服务器");
+            status_menu.setForeground(Color.GREEN);
+        }else {
+            status_menu.setText("未连接MES服务器");
+            status_menu.setForeground(Color.DARK_GRAY);
+        }
         status_menu.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
             }

src/com/mes/util/ErrorMsg.java

@@ -38,6 +38,10 @@ public class ErrorMsg {
                 lmsg = "工件码格式不正确";
             }else if(processMsgRet.equalsIgnoreCase("CF")) {
                 lmsg = "工件码重复";
+            }else if (processMsgRet.equalsIgnoreCase("JS")) {
+                lmsg = "请更换胶管";
+            }else if (processMsgRet.equalsIgnoreCase("JZ")) {
+                lmsg = "超过规定时间";
             }
         }catch (Exception e){ }
         return lmsg;