优化

src/com/mes/ui/MesClient.java

@@ -135,7 +135,7 @@ public class MesClient extends JFrame {
     public static JPanel indexPanelC;
     public static MesWebView jfxPanel2 = null;
 
-    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.100"); //100 B工位
+    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.100"); //100 B工位 新设备
 
     public static List<String> hjparams = new ArrayList<>();
 
@@ -270,7 +270,7 @@ public class MesClient extends JFrame {
                     e.printStackTrace();
                 }
             }
-        }, 1000,500);
+        }, 1000,1000);
     }
 
     //鐠囧鍘ょ純顔芥瀮娴狅拷

src/com/mes/ui/MesRevice.java

@@ -18,19 +18,19 @@ public class MesRevice {
                 String oprno = ProtocolParam.getOprno(mes_msg).trim();
                 String sn = ProtocolParam.getSn(mes_msg).trim();
                 System.out.println(":"+oprno);
-                if(oprno.equals("OP070A")){
+                if(oprno.equals("OP110A")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP070B")){
+                }else if(oprno.equals("OP110B")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");
-                }else if(oprno.equals("OP070C")){
+                }else if(oprno.equals("OP110C")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP070D")){
+                }else if(oprno.equals("OP110D")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");

src/com/mes/ui/OprnoUtil.java

@@ -19,7 +19,7 @@ public class OprnoUtil {
 
     public static String[] xtoprnodes = new String[]{
             "镭雕二维码", "前边梁小总成（焊接）", "前边梁小总成（拉铆）+右边梁小总成（拉铆）", "前边梁小总成气密", "前边梁小总成/左边梁小总成压铆",
-            "前边梁小总成/左边梁小总成涂胶", "框架CMT焊接", "人工补焊", "焊道铣削", "焊道缺陷检验",
+            "前边梁小总成/左边梁小总成涂胶", "框架CMT焊接", "框架CMT焊接", "焊道铣削", "焊道缺陷检验",
             "框架气密", "总成正面CNC", "总成反面CNC", "框架清洁", "框架涂胶+液冷板安装",
             "反面铆接", "激光点焊", "水冷板FSW", "清除FSW飞边", "TIG焊接水嘴",
             "TIG补焊尾孔+封堵片焊接", "总成清洁+涂封堵胶", "涂胶+压套筒", "胶水固化", "正面装配",

src/com/mes/ui/PlcUtil.java

@@ -273,7 +273,7 @@ public class PlcUtil {
     public static Boolean changeEnable(S7PLC s7PLC,Boolean result){
         try{
             //DB9.21.7 A//DB9.26.4 B
-            s7PLC.writeBoolean("DB9.28.0",result);
+            s7PLC.writeBoolean("DB9.23.7",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;
         }catch (Exception e){

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP100B
+mes.gw=OP110
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.20.99
+mes.server_ip=192.168.22.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT