胶水管理

src/com/mes/ui/LoginFrame.java

@@ -176,6 +176,14 @@ public class LoginFrame extends JFrame {
                     jfxPanel2.setSize(990, 550);
                     MesClient.indexPanelC.add(jfxPanel2);
 
+                    if(MesClient.jfxPanelJs == null){
+                        String url = "http://"+ Config.server_ip+":8980/js/a/mes/mesGlueRecord/olist?ucode="+user_id+"&oprno="+Config.gw+"&lineSn="+Config.line_sn;
+                        MesClient.jfxPanelJs = new MesWebView(url);
+                        MesClient.jfxPanelJs.setSize(990, 550);
+                        MesClient.indexPanelJs.add(MesClient.jfxPanelJs);
+                        System.out.println("url:"+url);
+                    }
+
 
                     MesClient.initWarehouseData();
                     UpdateQualityTimer.start();  // 开启更新质量的定时任务

src/com/mes/ui/MesClient.java

@@ -52,6 +52,10 @@ public class MesClient extends JFrame {
     public static JScrollPane searchScrollPane;
     public static JScrollPane searchScrollPaneDj;
 
+    public static JScrollPane searchScrollPaneJs;
+    public static JPanel indexPanelJs;
+    public static MesWebView jfxPanelJs = null;
+
 
     public static JButton heart_beat_menu;
     public static JButton status_menu;
@@ -529,6 +533,13 @@ public class MesClient extends JFrame {
         tabbedPane.addTab("工作记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPane, null);
 
 
+        indexPanelJs = new JPanel();
+        searchScrollPaneJs = new JScrollPane(indexPanelJs);
+        indexPanelJs.setLayout(null);
+
+        tabbedPane.addTab("胶水寿命", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPaneJs, null);
+
+
         tabbedPane.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {

src/com/mes/util/ErrorMsg.java

@@ -44,6 +44,8 @@ public class ErrorMsg {
                 lmsg = "静置时间未到";
             } else if (processMsgRet.equalsIgnoreCase("CS")) {
                 lmsg = "未在规定时间内";
+            }else if(processMsgRet.equalsIgnoreCase("JL")) {
+                lmsg = "胶水失效或未绑定";
             }
         }catch (Exception e){ }
         return lmsg;

src/resources/config/config.properties

@@ -1,6 +1,6 @@
 mes.gw=OP210A
-#mes.server_ip=127.0.0.1
-mes.server_ip=192.168.21.99
+mes.server_ip=127.0.0.1
+#mes.server_ip=192.168.21.99
 mes.tcp_port=3000
 
 mes.heart_beat_cycle=60