src/com/mes/ui/LoginFarme.java

@@ -23,7 +23,7 @@ public class LoginFarme extends JFrame {
     static JButton scanLoginButton = new JButton("扫  码  登  录");
 
     public LoginFarme(){
-        setTitle("MES系统客户端115："+MesClient.mes_gw+" - "+MesClient.mes_gw_des);
+        setTitle("MES系统客户端HEV："+MesClient.mes_gw+" - "+MesClient.mes_gw_des);
 
         ImageIcon bg = new ImageIcon(MesClient.class.getResource("/background.png"));
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -181,8 +181,6 @@ public class LoginFarme extends JFrame {
                     MesClient.welcomeWin.setVisible(false);
                     MesClient.mesClientFrame.setVisible(true);
                     MesClient.startGetCurSn();
-                    // 上报设备运行状态并启动定时上报
-                    MesClient.reportDeviceRunning();
 
                     if(MesClient.jfxPanel == null){
                         String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/work?__sid="+urlEncode(MesClient.sessionid)+"&oprno="+urlEncode(MesClient.mes_gw)+"&lineSn="+urlEncode(MesClient.mes_line_sn);

src/com/mes/ui/OprnoUtil.java

@@ -18,14 +18,14 @@ public class OprnoUtil {
             "电池壳分总成5点焊补焊", "电池壳分总成6弧焊", "电池壳分总成7弧焊", "电池壳分总成8弧焊", "气密检测",
             "拉铆", "总成气密检测"
     };
-    public static String[] lboprnos = new String[]{
+    public static String[] oprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",
             "OP120","OP130","OP140","OP150","OP160","OP170","OP180","OP190",
             "OP200","OP210","OP220"
     };
-    public static String[] lboprnodes = new String[]{
+    public static String[] oprnodes = new String[]{
             "左右冷板FSW（反面）","左右冷板FSW（正面）","左右冷板正面CNC","左右冷板反面CNC","去毛刺吹铝屑","超声波清洗","冷板FSW堵头反面焊接","冷板FSW堵头正面焊接",
-            "打磨焊道","水嘴自动激光焊","底护板支撑柱+BDU柱+线束支架焊接","液冷板装配拉铆","冷板总成正面CNC","冷板总成反面CNC","去毛刺吹铝屑，清洁","高压冲洗",
+            "打磨焊道","拉铆框架正面","底护板支撑柱+BDU柱+线束支架焊接","液冷板装配拉铆","冷板总成正面CNC","冷板总成反面CNC","去毛刺吹铝屑，清洁","高压冲洗",
             "M5+M6钢丝牙套安装","冷板汽检","冷板氦检"
     };
     public static String getGwDes(String lineSn,String oprno){
@@ -42,9 +42,9 @@ public class OprnoUtil {
             }
         }else if(lineSn.equals("115XT")){
             int i = 0;
-            for (String gw:lboprnos){
+            for (String gw:oprnos){
                 if(gw.equals(oprno)){
-                    des = lboprnodes[i];
+                    des = oprnodes[i];
                     break;
                 }
                 i++;

src/resources/config/config.properties

@@ -3,13 +3,4 @@ mes.gw=OP150A
 mes.server_ip=192.168.9.180
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
-mes.line_sn=115XT
-mes.device.heartbeat.minutes=5
-# \u00E5\u00AE\u00A2\u00E6\u0088\u00B7\u00E7\u00AB\u00AF\u00E7\u0089\u0088\u00E6\u009C\u00AC\u00E5\u008F\u00B7\u00EF\u00BC\u009B\u00E5\u008D\u0087\u00E7\u00BA\u00A7\u00E7\u00A8\u008B\u00E5\u00BA\u008F\u00E4\u00B9\u009F\u00E5\u008F\u00AF\u00E4\u00BB\u00A5\u00E8\u00AF\u00BB\u00E5\u008F\u0096 client-version.properties
-mes.client.version=100
-# \u00E6\u0098\u00AF\u00E5\u0090\u00A6\u00E5\u0090\u00AF\u00E7\u0094\u00A8\u00E5\u00AE\u00A2\u00E6\u0088\u00B7\u00E7\u00AB\u00AF\u00E6\u009B\u00B4\u00E6\u0096\u00B0\u00E6\u00A3\u0080\u00E6\u009F\u00A5
-mes.update.enabled=true
-# exe \u00E5\u0090\u00AF\u00E5\u008A\u00A8\u00E5\u0099\u00A8 classpath \u00E4\u00BD\u00BF\u00E7\u0094\u00A8\u00E7\u009A\u0084\u00E4\u00B8\u009A\u00E5\u008A\u00A1 jar \u00E5\u0090\u008D\u00E7\u00A7\u00B0
-mes.update.jar=mesclient-sd.jar
-# \u00E6\u009B\u00B4\u00E6\u0096\u00B0\u00E5\u00AE\u008C\u00E6\u0088\u0090\u00E5\u0090\u008E\u00E9\u0087\u008D\u00E6\u0096\u00B0\u00E5\u0090\u00AF\u00E5\u008A\u00A8\u00E7\u009A\u0084 exe \u00E5\u0090\u008D\u00E7\u00A7\u00B0
-mes.update.exe=mesclient-sd.exe
+mes.line_sn=115XT