拧紧+胶水管控

src/com/mes/ui/LoginFarme.java

@@ -198,6 +198,15 @@ public class LoginFarme extends JFrame {
                         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);
+                    }
+
                     MesClient.initWarehouseData();
 
                     MesClient.initGunPanels();

src/com/mes/ui/MesClient.java

@@ -61,6 +61,9 @@ 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 Boolean check_quality_result = false;
     public static Integer work_status = 0;
@@ -952,6 +955,11 @@ 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);
+
         // 增加工具配置页面
         JPanel indexConfigPanel = new JPanel();
         indexConfigPanel.setLayout(null);

src/com/mes/ui/OprnoUtil.java

@@ -6,28 +6,10 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP070", "OP100",
-            "OP110", "OP120", "OP130", "OP140", "OP150",
-            "OP160", "OP170", "OP180", "OP190", "OP200",
-            "OP210", "OP220", "OP230", "OP240", "OP250",
-            "OP260", "OP270", "OP280", "OP290", "OP300",
-            "OP310", "OP320", "OP330", "OP340", "OP350",
-            "OP360", "OP370", "OP380", "OP390", "OP400",
-            "OP410", "OP420", "OP430", "OP440", "OP450",
-            "OP460", "OP470", "OP480", "OP490", "OP500",
-            "OP510", "OP520", "OP550"
+            "OP290"
     };
     public static String[] xtoprnodes = new String[]{
-            "右边梁镭雕二维码","CMT框架一序焊接",
-            "人工补焊", "框架CMT二序焊接", "人工补焊", "焊道检查", "总成正面CNC",
-            "总成反面CNC", "框架去毛刺+清洁", "封堵片焊接+打磨", "边框气密", "焊道补焊",
-            "框架反面涂胶", "液冷板安装", "正面溢胶清理,补胶", "液冷板激光点固", "液冷板水嘴处焊接",
-            "焊道打磨", "液冷板FSW", "匙孔补焊打磨", "总成反面拉铆", "总成正面拉铆1",
-            "总成正面拉铆2", "边梁套筒涂胶+压合", "箱体封堵", "胶水固化", "半成品气密",
-            "补强板安装", "胶水固化", "拆卸补强板压紧工装", "底护板螺栓复拧", "人工抹胶",
-            "胶水固化", "反面部件装配", "底护板装配+底部套筒螺母安装", "底护板螺栓复拧", "总成气密",
-            "液冷板气密", "总成正面装配", "总成清洁", "总成检具检验", "模拟客户安装界面（装）",
-            "CCD", "GP12", "称重"
+            "底护板密封垫+加强板安装"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",

src/com/mes/util/ErrorMsg.java

@@ -38,6 +38,10 @@ public class ErrorMsg {
                 lmsg = "工件码格式不正确";
             }else if(processMsgRet.equalsIgnoreCase("CF")) {
                 lmsg = "工件码重复";
+            }else if(processMsgRet.equalsIgnoreCase("JL")) {
+                lmsg = "胶水失效或未绑定";
+            }else if(processMsgRet.equalsIgnoreCase("YH")) {
+                lmsg = "易耗品超时未更换";
             }
         }catch (Exception e){ }
         return lmsg;

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP390A
+mes.gw=OP290A
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.18.99
+mes.server_ip=192.168.24.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT