带胶水管控的扭力扳手

src/com/mes/ui/LoginFarme.java

@@ -206,10 +206,12 @@ public class LoginFarme extends JFrame {
                         MesClient.jfxPanel2.setSize(990, 550);
                         MesClient.indexPanelC.add(MesClient.jfxPanel2);
                     }
+                    // 胶水寿命
                     if(MesClient.jfxPanelJs == null){
                         String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesGlueRecord/olist?ucode="+user_id+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
                         MesClient.jfxPanelJs = new MesWebView(url);
                         MesClient.jfxPanelJs.setSize(990, 550);
+                        MesClient.jfxPanelJs.setBounds(0, 0, 990, 550);
                         MesClient.indexPanelJs.add(MesClient.jfxPanelJs);
                     }
                     if(MesClient.jfxPanel3 == null){

src/com/mes/ui/MesClient.java

@@ -805,8 +805,7 @@ public class MesClient extends JFrame {
         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.addTab("胶水寿命", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPaneJs, null);
 
         indexPanelD = new JPanel();
         searchScrollPaneD = new JScrollPane(indexPanelD);

src/com/mes/ui/OprnoUtil.java

@@ -21,18 +21,10 @@ public class OprnoUtil {
 //    };
 
     public static String[] xtoprnos = new String[]{
-            "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",
-            "OP120","OP130","OP140","OP150","OP160","OP170","OP180","OP190",
-            "OP200","OP210","OP220","OP230","OP240","OP250","OP260","OP270",
-            "OP280","OP290","OP300","OP310","OP320","OP330","OP335","OP340","OP350",
-            "OP360","OP370","OP380","OP390","OP400","OP410","OP420","OP430","OP440"
+            "OP340","OP250"
     };
     public static String[] xtoprnodes = new String[]{
-            "镭雕二维码","小总成焊接（边梁、后梁）","框架焊接","人工补焊","框架矫形","焊道检验","CNC总成反面（1序）","总成反面清洁",
-            "框架找漏","冷板安装+拉铆","清理溢胶","水冷板FSW","CNC总成反面（2序）","CNC总成正面加工","总成正面清洁","框架终检",
-            "恒温静置","正面安装钢丝螺套","反面安装钢丝螺套","反面拉铆","半成品气密","涂液冷板加强件结构胶","涂密封胶 安装加强件","清胶",
-            "胶水固化","底护板预装+水嘴安装","底护板装配","成品气密","液冷板气密","人工清洁","底护板复拧","贴PI膜/限位条","正面涂胶+拉铆",
-            "安装复合横梁","贴EPDM保温棉","绝缘耐压测试","在线检测（错漏）","在线检测（尺寸）","终检","GP12","包装","底护板螺栓复拧"
+            "底护板装配","中吊点安装"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",

src/com/mes/util/ErrorMsg.java

@@ -50,6 +50,8 @@ public class ErrorMsg {
                 lmsg = "物料过期";
             }else if(processMsgRet.equalsIgnoreCase("JL")) {
                 lmsg = "胶水失效或未绑定";
+            }else if(processMsgRet.equalsIgnoreCase("YH")) {
+                lmsg = "易耗品超时未更换";
             }else if(processMsgRet.equalsIgnoreCase("BD")) {//OP280底护板装配专用
                 lmsg = "未绑定底护板";
             }else if(processMsgRet.equalsIgnoreCase("JZ")) {

src/resources/config/config.properties

@@ -1,8 +1,8 @@
 # ???
-mes.gw=OP440A
+mes.gw=OP340A
 # ???IP
-#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.24.99
 # TCP????
 mes.tcp_port=3000
 # TCP????