修改

src/com/mes/component/WorkJPanelDevice.java

@@ -144,44 +144,41 @@ public class WorkJPanelDevice extends JPanel {
         log.info("deviceIp:"+deviceIp);
         fswDeviceName = OprnoUtil.getGwDes(lineSn, oprno);
 
-        if(oprno.equals("OP160")){
+        if(oprno.equals("OP110")){
             if(position.equals("A")){
-                plcDb = "DB3001";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4003";
+                deviceIp = "10.85.10.1";
             }else if(position.equals("B")){
-                plcDb = "DB3002";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4004";
+                deviceIp = "10.85.10.1";
             } else if (position.equals("C")) {
-                plcDb = "DB3003";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4005";
+                deviceIp = "10.85.10.1";
             }
         }else if(oprno.equals("OP170")){
             if(position.equals("A")){
-                plcDb = "DB3004";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4012";
+                deviceIp = "10.85.10.3";
             }else if(position.equals("B")){
-                plcDb = "DB3005";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4013";
+                deviceIp = "10.85.10.3";
             }else if (position.equals("C")) {
-                plcDb = "DB3006";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4014";
+                deviceIp = "10.85.10.3";
             }else if (position.equals("D")) {
-                plcDb = "DB3007";
-                deviceIp = "192.168.88.99";
-            }else if (position.equals("E")) {
-                plcDb = "DB3008";
-                deviceIp = "192.168.88.99";
-            }else if (position.equals("F")) {
-                plcDb = "DB3009";
-                deviceIp = "192.168.88.99";
+                plcDb = "DB4015";
+                deviceIp = "10.85.10.3";
             }
-        }else if(oprno.equals("OP230")){
+        }else if(oprno.equals("OP190")){
             if(position.equals("A")){
-                plcDb = "DB3012";
+                plcDb = "DB4017";
+                deviceIp = "10.85.10.4";
             }else if(position.equals("B")){
-                plcDb = "DB3013";
+                plcDb = "DB4018";
+                deviceIp = "10.85.10.4";
             } else if (position.equals("C")) {
-                plcDb = "DB3014";
+                plcDb = "DB4019";
+                deviceIp = "10.85.10.4";
             }
         }else if(oprno.equals("OP220")){
             if(position.equals("A")){

src/com/mes/ui/MesClient.java

@@ -93,6 +93,8 @@ public class MesClient extends JFrame {
     public static WorkJPanelDevice workJPanelDeviceA;
     public static WorkJPanelDevice workJPanelDeviceB;
     public static WorkJPanelDevice workJPanelDeviceC;
+    public static WorkJPanelDevice workJPanelDeviceD;
+
 
     public static JFrame tcframe = null;
 
@@ -343,7 +345,7 @@ public class MesClient extends JFrame {
         indexPanelA.setBackground(Color.LIGHT_GRAY);
 
 
-        if(mes_gw.equals("OP160") || mes_gw.equals("OP170A") || mes_gw.equals("OP230")){
+        if(mes_gw.equals("OP110") || mes_gw.equals("OP170A") || mes_gw.equals("OP230")){
             JPanel indexPanel20A = new JPanel();
             indexPanel20A.setLayout(null);
             indexPanel20A.setBackground(Color.WHITE);
@@ -367,11 +369,11 @@ public class MesClient extends JFrame {
             workJPanelDeviceC.setBounds(10, 10, workJPanelDeviceC.workWidth, workJPanelDeviceC.workHeight);
             indexPanel20C.add(workJPanelDeviceC);
             indexPanelA.add(indexPanel20C);
-        }else if(mes_gw.equals("OP170B")){
+        }else if(mes_gw.equals("OP170")){
             JPanel indexPanel20A = new JPanel();
             indexPanel20A.setLayout(null);
             indexPanel20A.setBackground(Color.WHITE);
-            workJPanelDeviceA = new WorkJPanelDevice("D");
+            workJPanelDeviceA = new WorkJPanelDevice("A");
             workJPanelDeviceA.setBounds(10, 10, workJPanelDeviceA.workWidth, workJPanelDeviceA.workHeight);
             indexPanel20A.add(workJPanelDeviceA);
             indexPanelA.add(indexPanel20A);
@@ -379,7 +381,7 @@ public class MesClient extends JFrame {
             JPanel indexPanel20B = new JPanel();
             indexPanel20B.setLayout(null);
             indexPanel20B.setBackground(Color.WHITE);
-            workJPanelDeviceB = new WorkJPanelDevice("E");
+            workJPanelDeviceB = new WorkJPanelDevice("B");
             workJPanelDeviceB.setBounds(10, 10, workJPanelDeviceB.workWidth, workJPanelDeviceB.workHeight);
             indexPanel20B.add(workJPanelDeviceB);
             indexPanelA.add(indexPanel20B);
@@ -387,11 +389,19 @@ public class MesClient extends JFrame {
             JPanel indexPanel20C = new JPanel();
             indexPanel20C.setLayout(null);
             indexPanel20C.setBackground(Color.WHITE);
-            workJPanelDeviceC = new WorkJPanelDevice("F");
+            workJPanelDeviceC = new WorkJPanelDevice("C");
             workJPanelDeviceC.setBounds(10, 10, workJPanelDeviceC.workWidth, workJPanelDeviceC.workHeight);
             indexPanel20C.add(workJPanelDeviceC);
             indexPanelA.add(indexPanel20C);
-        }else if(mes_gw.equals("OP220")){
+
+            JPanel indexPanel20D = new JPanel();
+            indexPanel20D.setLayout(null);
+            indexPanel20D.setBackground(Color.WHITE);
+            workJPanelDeviceD = new WorkJPanelDevice("D");
+            workJPanelDeviceD.setBounds(10, 10, workJPanelDeviceD.workWidth, workJPanelDeviceD.workHeight);
+            indexPanel20D.add(workJPanelDeviceD);
+            indexPanelA.add(indexPanel20D);
+        }else if(mes_gw.equals("OP190")){
             JPanel indexPanel20A = new JPanel();
             indexPanel20A.setLayout(null);
             indexPanel20A.setBackground(Color.WHITE);
@@ -399,6 +409,22 @@ public class MesClient extends JFrame {
             workJPanelDeviceA.setBounds(10, 10, workJPanelDeviceA.workWidth, workJPanelDeviceA.workHeight);
             indexPanel20A.add(workJPanelDeviceA);
             indexPanelA.add(indexPanel20A);
+
+            JPanel indexPanel20B = new JPanel();
+            indexPanel20B.setLayout(null);
+            indexPanel20B.setBackground(Color.WHITE);
+            workJPanelDeviceB = new WorkJPanelDevice("B");
+            workJPanelDeviceB.setBounds(10, 10, workJPanelDeviceB.workWidth, workJPanelDeviceB.workHeight);
+            indexPanel20B.add(workJPanelDeviceB);
+            indexPanelA.add(indexPanel20B);
+
+            JPanel indexPanel20C = new JPanel();
+            indexPanel20C.setLayout(null);
+            indexPanel20C.setBackground(Color.WHITE);
+            workJPanelDeviceC = new WorkJPanelDevice("C");
+            workJPanelDeviceC.setBounds(10, 10, workJPanelDeviceC.workWidth, workJPanelDeviceC.workHeight);
+            indexPanel20C.add(workJPanelDeviceC);
+            indexPanelA.add(indexPanel20C);
         }
 
         tabbedPane.addTab("工作面板", null, indexScrollPaneA, null);

src/com/mes/ui/OprnoUtil.java

@@ -5,10 +5,10 @@ import java.util.List;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP160", "OP170", "OP220", "OP230",
+            "OP110", "OP170", "OP220", "OP190",
     };
     public static String[] xtoprnodes = new String[]{
-            "总成正面CNC", "总成反面CNC", "激光点焊", "水冷板FSW"
+            "框架反面CNC", "总成反面CNC", "激光点焊", "总成正面CNC"
     };
     public static String[] lboprnos = new String[]{
 

src/resources/config/config.properties

@@ -1,5 +1,5 @@
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.13.99
+mes.server_ip=192.168.14.99
 mes.line_sn=XT
-mes.gw=OP170B
+mes.gw=OP110
 mes.line_pos=west