气枪拉铆双枪+ng复判

src/com/mes/ui/MesClient.java

@@ -86,10 +86,15 @@ public class MesClient extends JFrame {
     public static JTextField param3;
     public static JTextField param4;
 
-//    public static ModbusTcp plcA = new ModbusTcp(1, "192.168.1.7");
-//    public static ModbusTcp plcB = new ModbusTcp(1, "192.168.1.8");
-    public static ModbusTcp plcA = new ModbusTcp(1, "192.168.1.27");
-    public static ModbusTcp plcB = new ModbusTcp(1, "192.168.1.28");
+
+
+//    tw -210b
+//    public static ModbusTcp plcA = new ModbusTcp(1, "192.168.1.7");//81
+//    public static ModbusTcp plcB = new ModbusTcp(1, "192.168.1.8");//1
+
+//    tw-op130b
+    public static ModbusTcp plcA = new ModbusTcp(1, "192.168.1.7");//29
+    public static ModbusTcp plcB = new ModbusTcp(1, "192.168.1.8");//26
 
     public static Timer cjTimer;
 
@@ -97,14 +102,15 @@ public class MesClient extends JFrame {
 
     public static Timer cjTimer3;
 
-    public static Short aSetNum = 19;
-//    public static Short aSetNum = 49;
+    public static Short aSetNum = 29;
+//public static Short aSetNum = 81;
+
     public static Short sortA = 0;
     public static Short aMax = 0;
     public static Short aFinish = 0;
     public static List<Map> alist = new ArrayList<>();
-    public static Short bSetNum = 50;
-//    public static Short bSetNum = 27;
+    public static Short bSetNum = 26;
+//public static Short bSetNum = 1;
     public static Short sortB = 0;
     public static Short bMax = 0;
     public static Short bFinish = 0;

src/com/mes/ui/ModbusUtil.java

@@ -45,9 +45,17 @@ public class ModbusUtil {
             MesClient.param2.setText(cur+"");
             System.out.println("cur:"+cur);
 
-//            if(MesClient.sortA == 4){
-//                    plc.writeInt16(1070,(short) 2000);
-//                    plc.writeInt16(1071,(short) 5000);
+
+//            op130
+            if(MesClient.sortA == 23){
+                plc.writeInt16(1070,(short) 4000);
+                plc.writeInt16(1071,(short) 5000);
+            }
+
+            //210
+//            if(MesClient.sortA == 75){
+//                plc.writeInt16(1070,(short) 2500);
+//                plc.writeInt16(1071,(short) 3500);
 //            }
 
             if(!MesClient.product_sn.getText().isEmpty()){
@@ -275,16 +283,24 @@ public class ModbusUtil {
             plc.writeInt16(1136,(short) 0);
             plc.writeInt16(1138,(short) 0);
 
-//            if(setNum == 22){
-//                plc.writeInt16(1070,(short) 2500);
-//                plc.writeInt16(1071,(short) 4500);
-//            }
-//
-//            if (setNum == 40){
-//                plc.writeInt16(1070,(short) 2000);
+//            if(setNum == 81){
+//                plc.writeInt16(1070,(short) 3000);
 //                plc.writeInt16(1071,(short) 4000);
 //            }
 
+
+//            op130
+            if(setNum == 29){
+                plc.writeInt16(1070,(short) 3200);
+                plc.writeInt16(1071,(short) 4200);
+            }
+
+//            op130
+            if(setNum == 26){
+                plc.writeInt16(1070,(short) 3200);
+                plc.writeInt16(1071,(short) 4200);
+            }
+
         }catch (Exception e){
             e.printStackTrace();
         }

src/com/mes/ui/OprnoUtil.java

@@ -5,11 +5,13 @@ import java.util.List;
 import java.util.Map;
 
 public class OprnoUtil {
+
     public static String[] xtoprnos = new String[]{
-            "OP310"
+
+            "OP210","OP130"
     };
     public static String[] xtoprnodes = new String[]{
-            "反面装配"
+            "总成反面装配1","液冷板拉铆"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP310B
+mes.gw=OP130B
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.22.99
+mes.server_ip=192.168.24.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT