优化

src/com/mes/ui/DataUtil.java

@@ -295,25 +295,6 @@ public class DataUtil {
         return result;
     }
 
-    // 获取工件类型
-    public static String checkSnType(String sn){
-        if(sn.length() < 22){
-            return "";
-        }
-        String str = sn.substring(0,22);
-        String gdStr1 = "151245P000012131001010"; // MX11-2
-        String gdStr2 = "151245P000017812001010"; // MX11-2S
-        String gdStr3 = "151245P000012131002010"; // MX11-2
-        String gdStr4 = "151245P000017812002010"; // MX11-2S
-        if(str.equals(gdStr1)||str.equals(gdStr3)){
-            return "MX11-2";
-        }else if(str.equals(gdStr2)||str.equals(gdStr4)){
-            return "MX11-2S";
-        }else{
-            return "";
-        }
-    }
-
     public static JSONObject sendQualitySub(String sn,String result,String pos,String subNums,String ucode) {
         try{
             String enconding = "UTF-8";

src/com/mes/ui/MesRevice.java

@@ -28,8 +28,8 @@ public class MesRevice {
                 ErrorMsg.setErrorMsg(mes_msg);
 
                 MesClient.check_quality_result2 = false;
+                ModbusUtil.setPowerOff(MesClient.plcA); // 远程关机
                 ModbusUtil.setPowerOff(MesClient.plcB); // 远程关机
-                ModbusUtil.setPowerOff(MesClient.plcC); // 远程关机
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -46,25 +46,19 @@ public class MesRevice {
                 MesClient.f_scan_data_bt_2.setEnabled(false);
                 MesClient.tjStatus2 = 0;
 
-                String snType = DataUtil.checkSnType(sn);
-                if(snType.equals("MX11-2S")){
-                    MesClient.cSetNum = Short.valueOf(MesClient.configParam.deviceMaxNumVal2SC);
-                    MesClient.bSetNum = Short.valueOf(MesClient.configParam.deviceMaxNumVal2SB);
-                }else{
-                    MesClient.cSetNum = Short.valueOf(MesClient.configParam.deviceMaxNumValC);
-                    MesClient.bSetNum = Short.valueOf(MesClient.configParam.deviceMaxNumValB);
-                }
+                MesClient.aSetNum = Short.valueOf(MesClient.configParam.deviceMaxNumValA);
+                MesClient.bSetNum = Short.valueOf(MesClient.configParam.deviceMaxNumValB);
 
                 log.info("sn:"+ sn);
+                log.info("aSetNum:"+ MesClient.aSetNum);
                 log.info("bSetNum:"+ MesClient.bSetNum);
-                log.info("cSetNum:"+ MesClient.cSetNum);
 
-                ModbusUtil.setPowerOn(MesClient.plcB); // 远程开机
-                ModbusUtil.setPowerOn(MesClient.plcC);
+                ModbusUtil.setPowerOn(MesClient.plcA); // 远程开机
+                ModbusUtil.setPowerOn(MesClient.plcB);
+                ModbusUtil.setTask(MesClient.plcA,MesClient.aSetNum);
                 ModbusUtil.setTask(MesClient.plcB,MesClient.bSetNum);
-                ModbusUtil.setTask(MesClient.plcC,MesClient.cSetNum);
+                ModbusUtil.setTaskA(MesClient.plcA);
                 ModbusUtil.setTaskB(MesClient.plcB);
-                ModbusUtil.setTaskC(MesClient.plcC);
             }
         }catch (Exception e){
             e.printStackTrace();

src/com/mes/ui/ModbusUtil.java

@@ -8,7 +8,7 @@ import java.nio.charset.Charset;
 
 public class ModbusUtil {
 
-    public static void getDataB(ModbusTcp plc){
+    public static void getDataA(ModbusTcp plc){
 
         // 41065=F-out  41066=S-out
         // 41069=F-min  41071=S-min 41070=F-max  41072=S-max
@@ -16,14 +16,14 @@ public class ModbusUtil {
 
         Short cur = plc.readInt16(1136);
 
-        if(MesClient.bMax <= 0){
-            MesClient.bMax = plc.readInt16(1128);
-            MesClient.param3.setText(String.valueOf(MesClient.bMax));
+        if(MesClient.aMax <= 0){
+            MesClient.aMax = plc.readInt16(1128);
+            MesClient.param3.setText(String.valueOf(MesClient.aMax));
         }
 
-        if(MesClient.sortB == cur - 1){
-            MesClient.sortB = cur;
-//            MesClient.bFinish = plc.readInt16(1138);
+        if(MesClient.sortA == cur - 1){
+            MesClient.sortA = cur;
+//            MesClient.aFinish = plc.readInt16(1138);
             String fout = plc.readInt16(1064)+"";
             String sout = (float)plc.readInt16(1065)/1000+"";
 
@@ -34,8 +34,8 @@ public class ModbusUtil {
             String smax = (float)plc.readInt16(1071)/1000+"";
 
             MesClient.param4.setText(cur+"");
-            MesClient.foutParamB.setText(fout+"");
-            MesClient.soutParamB.setText(sout+"");
+            MesClient.foutParamA.setText(fout+"");
+            MesClient.soutParamA.setText(sout+"");
 
             String qty = "1";
             if(Integer.valueOf(fout) < Integer.valueOf(fmin) || Integer.valueOf(fout) > Integer.valueOf(fmax)){
@@ -46,40 +46,40 @@ public class ModbusUtil {
             }
 
             if(qty.equals("0")){
-                MesClient.zdStatusB = 1;
-                MesClient.foutB = fout;
-                MesClient.soutB = sout;
-                MesClient.fmaxB = fmax;
-                MesClient.fminB = fmin;
-                MesClient.sminB = smin;
-                MesClient.smaxB = smax;
-                MesClient.curB = cur+"";
+                MesClient.zdStatusA = 1;
+                MesClient.foutA = fout;
+                MesClient.soutA = sout;
+                MesClient.fmaxA = fmax;
+                MesClient.fminA = fmin;
+                MesClient.sminA = smin;
+                MesClient.smaxA = smax;
+                MesClient.curA = cur+"";
                 MesClient.resetResultB.setEnabled(true);
                 MesClient.okResultB.setEnabled(true);
                 MesClient.ngResultB.setEnabled(true);
 
+                ModbusUtil.setPowerOff(MesClient.plcA);
                 ModbusUtil.setPowerOff(MesClient.plcB);
-                ModbusUtil.setPowerOff(MesClient.plcC);
 
                 if(!MesClient.product_sn2.getText().isEmpty()){
-                    DataUtil.addNgData(MesClient.product_sn2.getText(),"B");
+                    DataUtil.addNgData(MesClient.product_sn2.getText(),"A");
                 }
             }
 
 //            String qty = plc.readInt16(1072)+"";
 //            System.out.println("cur:"+cur);
             if(qty.equals("1") && !MesClient.product_sn2.getText().isEmpty()){
-                MesClient.bFinish++;
-               JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn2.getText(),"B",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
+                MesClient.aFinish++;
+               JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn2.getText(),"A",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
             }
         }
-        if(MesClient.zdStatusB == 0 && MesClient.zdStatusC == 0){
+        if(MesClient.zdStatusA == 0 && MesClient.zdStatusB == 0){
             upResult2();
         }
 
     }
 
-    public static void getDataC(ModbusTcp plc){
+    public static void getDataB(ModbusTcp plc){
 
         // 41065=F-out  41066=S-out
         // 41069=F-min  41071=S-min 41070=F-max  41072=S-max
@@ -87,14 +87,14 @@ public class ModbusUtil {
 
         Short cur = plc.readInt16(1136);
 
-        if(MesClient.cMax <= 0){
-            MesClient.cMax = plc.readInt16(1128);
-            MesClient.param5.setText(String.valueOf(MesClient.cMax));
+        if(MesClient.bMax <= 0){
+            MesClient.bMax = plc.readInt16(1128);
+            MesClient.param5.setText(String.valueOf(MesClient.bMax));
         }
 
-        if(MesClient.sortC == cur - 1){
-            MesClient.sortC = cur;
-//            MesClient.cFinish = plc.readInt16(1138);
+        if(MesClient.sortB == cur - 1){
+            MesClient.sortB = cur;
+//            MesClient.bFinish = plc.readInt16(1138);
             String fout = plc.readInt16(1064)+"";
             String sout = (float)plc.readInt16(1065)/1000+"";
 
@@ -105,8 +105,8 @@ public class ModbusUtil {
             String smax = (float)plc.readInt16(1071)/1000+"";
 
             MesClient.param6.setText(cur+"");
-            MesClient.foutParamC.setText(fout+"");
-            MesClient.soutParamC.setText(sout+"");
+            MesClient.foutParamB.setText(fout+"");
+            MesClient.soutParamB.setText(sout+"");
 
 //            String qty = plc.readInt16(1072)+"";
 
@@ -119,51 +119,63 @@ public class ModbusUtil {
             }
 
             if(qty.equals("0")){
-                MesClient.zdStatusC = 1;
-                MesClient.foutC = fout;
-                MesClient.soutC = sout;
-                MesClient.fmaxC = fmax;
-                MesClient.fminC = fmin;
-                MesClient.sminC = smin;
-                MesClient.smaxC = smax;
-                MesClient.curC = cur+"";
+                MesClient.zdStatusB = 1;
+                MesClient.foutB = fout;
+                MesClient.soutB = sout;
+                MesClient.fmaxB = fmax;
+                MesClient.fminB = fmin;
+                MesClient.sminB = smin;
+                MesClient.smaxB = smax;
+                MesClient.curB = cur+"";
                 MesClient.resetResultB.setEnabled(true);
                 MesClient.okResultB.setEnabled(true);
                 MesClient.ngResultB.setEnabled(true);
 
+                ModbusUtil.setPowerOff(MesClient.plcA);
                 ModbusUtil.setPowerOff(MesClient.plcB);
-                ModbusUtil.setPowerOff(MesClient.plcC);
 
                 if(!MesClient.product_sn2.getText().isEmpty()){
-                    DataUtil.addNgData(MesClient.product_sn2.getText(),"C");
+                    DataUtil.addNgData(MesClient.product_sn2.getText(),"B");
                 }
             }
 
             System.out.println("cur:"+cur);
             if(qty.equals("1") && !MesClient.product_sn2.getText().isEmpty()){
-                MesClient.cFinish++;
-                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn2.getText(),"C",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
+                MesClient.bFinish++;
+                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn2.getText(),"B",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
             }
         }
 
-        if(MesClient.zdStatusC == 0 && MesClient.zdStatusB == 0){
+        if(MesClient.zdStatusB == 0 && MesClient.zdStatusA == 0){
             upResult2();
         }
     }
 
     // 上传总结果
     public static void upResult2(){
-        if(!MesClient.product_sn2.getText().isEmpty() && MesClient.bMax > 0 && MesClient.bMax <= MesClient.sortB && MesClient.cMax > 0 && MesClient.cMax <= MesClient.sortC){
+        if(!MesClient.product_sn2.getText().isEmpty() && MesClient.aMax > 0 && MesClient.aMax <= MesClient.sortA && MesClient.bMax > 0 && MesClient.bMax <= MesClient.sortB){
             if(MesClient.tjStatus2 == 0 && MesClient.check_quality_result2){
                 MesClient.tjStatus2 = 1;
                 MesClient.getUser();
                 String retf = "OK";
-                if(MesClient.bFinish != MesClient.bMax){
+                if(MesClient.aFinish != MesClient.aMax){
                     retf = "NG";
                 }
-                if(MesClient.cFinish != MesClient.cMax){
+                if(MesClient.bFinish != MesClient.bMax){
                     retf = "NG";
                 }
+                // 先上传 pos="A" 子结果，使服务端 result1 被写入
+                JSONObject retObjA = DataUtil.sendQualitySub(MesClient.product_sn2.getText(), retf,"A","2", MesClient.user20);
+                if(retObjA == null || retObjA.get("result")==null || !retObjA.get("result").toString().equalsIgnoreCase("true")) {
+                    if(retObjA == null || retObjA.get("result")==null){
+                        MesClient.setMenuStatus("请求失败，请重试",-1);
+                    }else{
+                        MesClient.setMenuStatus(retObjA.getString("message"),-1);
+                    }
+                    MesClient.tjStatus2 = 0;
+                    return;
+                }
+                // 再上传 pos="B" 子结果，使服务端 result2 被写入，两次子结果到齐后服务端更新总结果
                 JSONObject retObj = DataUtil.sendQualitySub(MesClient.product_sn2.getText(), retf,"B","2", MesClient.user20);
                 if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
                     MesClient.resetScanB();
@@ -177,6 +189,7 @@ public class ModbusUtil {
                             MesClient.setMenuStatus(retObj.getString("message"),-1);
                         }
                     }
+                    MesClient.tjStatus2 = 0;
                 }
             }
 
@@ -275,12 +288,12 @@ public class ModbusUtil {
         }
     }
 
-    public static void setTaskB(ModbusTcp plc){
+    public static void setTaskA(ModbusTcp plc){
         try{
-            short fmax = Short.parseShort(MesClient.configParam.getMaxFoutValB());
-            short fmin = Short.parseShort(MesClient.configParam.getMinFoutValB());
-            float smaxf = Float.valueOf(MesClient.configParam.getMaxSoutValB())*1000;
-            float sminf = Float.valueOf(MesClient.configParam.getMinSoutValB())*1000;
+            short fmax = Short.parseShort(MesClient.configParam.getMaxFoutValA());
+            short fmin = Short.parseShort(MesClient.configParam.getMinFoutValA());
+            float smaxf = Float.valueOf(MesClient.configParam.getMaxSoutValA())*1000;
+            float sminf = Float.valueOf(MesClient.configParam.getMinSoutValA())*1000;
 
             short smax = (short) smaxf;
             short smin = (short) sminf;
@@ -296,12 +309,12 @@ public class ModbusUtil {
         }
     }
 
-    public static void setTaskC(ModbusTcp plc){
+    public static void setTaskB(ModbusTcp plc){
         try{
-            short fmax = Short.parseShort(MesClient.configParam.getMaxFoutValC());
-            short fmin = Short.parseShort(MesClient.configParam.getMinFoutValC());
-            float smaxf = Float.valueOf(MesClient.configParam.getMaxSoutValC())*1000;
-            float sminf = Float.valueOf(MesClient.configParam.getMinSoutValC())*1000;
+            short fmax = Short.parseShort(MesClient.configParam.getMaxFoutValB());
+            short fmin = Short.parseShort(MesClient.configParam.getMinFoutValB());
+            float smaxf = Float.valueOf(MesClient.configParam.getMaxSoutValB())*1000;
+            float sminf = Float.valueOf(MesClient.configParam.getMinSoutValB())*1000;
 
             short smax = (short) smaxf;
             short smin = (short) sminf;
@@ -317,20 +330,6 @@ public class ModbusUtil {
         }
     }
 
-    public static void setTask2S(ModbusTcp plc){
-        try{
-//            plc.writeInt16(1070,(short) 3600);
-//            plc.writeInt16(1071,(short) 4600);
-
-//            short v1 = Short.parseShort(MesClient.configParam.getSminb62());
-//            short v2 = Short.parseShort(MesClient.configParam.getSmaxb62());
-//            plc.writeInt16(1070,v1);
-//            plc.writeInt16(1071,v2);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
 
 //        A枪说明 192.168.1.7
 //        plc.writeCoil(3079,false);

src/com/mes/util/ConfigParam.java

@@ -4,24 +4,22 @@ package com.mes.util;
 public class ConfigParam {
     public Integer id;
 
+    public String deviceIpValA;
+    public String deviceNameValA;
+    public String deviceMaxNumValA;
+    public String maxFoutValA;
+    public String minFoutValA;
+    public String maxSoutValA;
+    public String minSoutValA;
+
     public String deviceIpValB;
     public String deviceNameValB;
     public String deviceMaxNumValB;
-    public String deviceMaxNumVal2SB;
     public String maxFoutValB;
     public String minFoutValB;
     public String maxSoutValB;
     public String minSoutValB;
 
-    public String deviceIpValC;
-    public String deviceNameValC;
-    public String deviceMaxNumValC;
-    public String deviceMaxNumVal2SC;
-    public String maxFoutValC;
-    public String minFoutValC;
-    public String maxSoutValC;
-    public String minSoutValC;
-
     public String ngStopVal;
 
     public Integer getId() {
@@ -32,132 +30,116 @@ public class ConfigParam {
         this.id = id;
     }
 
-    public String getDeviceIpValB() {
-        return deviceIpValB;
+    public String getDeviceIpValA() {
+        return deviceIpValA;
     }
 
-    public void setDeviceIpValB(String deviceIpValB) {
-        this.deviceIpValB = deviceIpValB;
+    public void setDeviceIpValA(String deviceIpValA) {
+        this.deviceIpValA = deviceIpValA;
     }
 
-    public String getDeviceNameValB() {
-        return deviceNameValB;
+    public String getDeviceNameValA() {
+        return deviceNameValA;
     }
 
-    public void setDeviceNameValB(String deviceNameValB) {
-        this.deviceNameValB = deviceNameValB;
+    public void setDeviceNameValA(String deviceNameValA) {
+        this.deviceNameValA = deviceNameValA;
     }
 
-    public String getDeviceMaxNumValB() {
-        return deviceMaxNumValB;
+    public String getDeviceMaxNumValA() {
+        return deviceMaxNumValA;
     }
 
-    public void setDeviceMaxNumValB(String deviceMaxNumValB) {
-        this.deviceMaxNumValB = deviceMaxNumValB;
+    public void setDeviceMaxNumValA(String deviceMaxNumValA) {
+        this.deviceMaxNumValA = deviceMaxNumValA;
     }
 
-    public String getDeviceMaxNumVal2SB() {
-        return deviceMaxNumVal2SB;
+    public String getMaxFoutValA() {
+        return maxFoutValA;
     }
 
-    public void setDeviceMaxNumVal2SB(String deviceMaxNumVal2SB) {
-        this.deviceMaxNumVal2SB = deviceMaxNumVal2SB;
+    public void setMaxFoutValA(String maxFoutValA) {
+        this.maxFoutValA = maxFoutValA;
     }
 
-    public String getMaxFoutValB() {
-        return maxFoutValB;
+    public String getMinFoutValA() {
+        return minFoutValA;
     }
 
-    public void setMaxFoutValB(String maxFoutValB) {
-        this.maxFoutValB = maxFoutValB;
-    }
-
-    public String getMinFoutValB() {
-        return minFoutValB;
-    }
-
-    public void setMinFoutValB(String minFoutValB) {
-        this.minFoutValB = minFoutValB;
-    }
-
-    public String getMaxSoutValB() {
-        return maxSoutValB;
-    }
-
-    public void setMaxSoutValB(String maxSoutValB) {
-        this.maxSoutValB = maxSoutValB;
+    public void setMinFoutValA(String minFoutValA) {
+        this.minFoutValA = minFoutValA;
     }
 
-    public String getMinSoutValB() {
-        return minSoutValB;
+    public String getMaxSoutValA() {
+        return maxSoutValA;
     }
 
-    public void setMinSoutValB(String minSoutValB) {
-        this.minSoutValB = minSoutValB;
+    public void setMaxSoutValA(String maxSoutValA) {
+        this.maxSoutValA = maxSoutValA;
     }
 
-    public String getDeviceIpValC() {
-        return deviceIpValC;
+    public String getMinSoutValA() {
+        return minSoutValA;
     }
 
-    public void setDeviceIpValC(String deviceIpValC) {
-        this.deviceIpValC = deviceIpValC;
+    public void setMinSoutValA(String minSoutValA) {
+        this.minSoutValA = minSoutValA;
     }
 
-    public String getDeviceNameValC() {
-        return deviceNameValC;
+    public String getDeviceIpValB() {
+        return deviceIpValB;
     }
 
-    public void setDeviceNameValC(String deviceNameValC) {
-        this.deviceNameValC = deviceNameValC;
+    public void setDeviceIpValB(String deviceIpValB) {
+        this.deviceIpValB = deviceIpValB;
     }
 
-    public String getDeviceMaxNumValC() {
-        return deviceMaxNumValC;
+    public String getDeviceNameValB() {
+        return deviceNameValB;
     }
 
-    public void setDeviceMaxNumValC(String deviceMaxNumValC) {
-        this.deviceMaxNumValC = deviceMaxNumValC;
+    public void setDeviceNameValB(String deviceNameValB) {
+        this.deviceNameValB = deviceNameValB;
     }
 
-    public String getDeviceMaxNumVal2SC() {
-        return deviceMaxNumVal2SC;
+    public String getDeviceMaxNumValB() {
+        return deviceMaxNumValB;
     }
 
-    public void setDeviceMaxNumVal2SC(String deviceMaxNumVal2SC) {
-        this.deviceMaxNumVal2SC = deviceMaxNumVal2SC;
+    public void setDeviceMaxNumValB(String deviceMaxNumValB) {
+        this.deviceMaxNumValB = deviceMaxNumValB;
     }
 
-    public String getMaxFoutValC() {
-        return maxFoutValC;
+    public String getMaxFoutValB() {
+        return maxFoutValB;
     }
 
-    public void setMaxFoutValC(String maxFoutValC) {
-        this.maxFoutValC = maxFoutValC;
+    public void setMaxFoutValB(String maxFoutValB) {
+        this.maxFoutValB = maxFoutValB;
     }
 
-    public String getMinFoutValC() {
-        return minFoutValC;
+    public String getMinFoutValB() {
+        return minFoutValB;
     }
 
-    public void setMinFoutValC(String minFoutValC) {
-        this.minFoutValC = minFoutValC;
+    public void setMinFoutValB(String minFoutValB) {
+        this.minFoutValB = minFoutValB;
     }
 
-    public String getMaxSoutValC() {
-        return maxSoutValC;
+    public String getMaxSoutValB() {
+        return maxSoutValB;
     }
 
-    public void setMaxSoutValC(String maxSoutValC) {
-        this.maxSoutValC = maxSoutValC;
+    public void setMaxSoutValB(String maxSoutValB) {
+        this.maxSoutValB = maxSoutValB;
     }
 
-    public String getMinSoutValC() {
-        return minSoutValC;
+    public String getMinSoutValB() {
+        return minSoutValB;
     }
 
-    public void setMinSoutValC(String minSoutValC) {
-        this.minSoutValC = minSoutValC;
+    public void setMinSoutValB(String minSoutValB) {
+        this.minSoutValB = minSoutValB;
     }
 
     public String getNgStopVal() {
@@ -172,22 +154,20 @@ public class ConfigParam {
     public String toString() {
         return "ConfigParam{" +
                 "id=" + id +
+                ", deviceIpValA='" + deviceIpValA + '\'' +
+                ", deviceNameValA='" + deviceNameValA + '\'' +
+                ", deviceMaxNumValA='" + deviceMaxNumValA + '\'' +
+                ", maxFoutValA='" + maxFoutValA + '\'' +
+                ", minFoutValA='" + minFoutValA + '\'' +
+                ", maxSoutValA='" + maxSoutValA + '\'' +
+                ", minSoutValA='" + minSoutValA + '\'' +
                 ", deviceIpValB='" + deviceIpValB + '\'' +
                 ", deviceNameValB='" + deviceNameValB + '\'' +
                 ", deviceMaxNumValB='" + deviceMaxNumValB + '\'' +
-                ", deviceMaxNumVal2SB='" + deviceMaxNumVal2SB + '\'' +
                 ", maxFoutValB='" + maxFoutValB + '\'' +
                 ", minFoutValB='" + minFoutValB + '\'' +
                 ", maxSoutValB='" + maxSoutValB + '\'' +
                 ", minSoutValB='" + minSoutValB + '\'' +
-                ", deviceIpValC='" + deviceIpValC + '\'' +
-                ", deviceNameValC='" + deviceNameValC + '\'' +
-                ", deviceMaxNumValC='" + deviceMaxNumValC + '\'' +
-                ", deviceMaxNumVal2SC='" + deviceMaxNumVal2SC + '\'' +
-                ", maxFoutValC='" + maxFoutValC + '\'' +
-                ", minFoutValC='" + minFoutValC + '\'' +
-                ", maxSoutValC='" + maxSoutValC + '\'' +
-                ", minSoutValC='" + minSoutValC + '\'' +
                 ", ngStopVal='" + ngStopVal + '\'' +
                 '}';
     }

src/resources/config/config.properties

@@ -1,4 +1,4 @@
-mes.gw=OP210A
+mes.gw=OP130
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.14.99
 mes.tcp_port=3000