修改

src/com/mes/ui/MesClient.java

@@ -130,7 +130,7 @@ public class MesClient extends JFrame {
     public static MesWebView jfxPanel = null;
     public static MesRadio mesRadioHj;
 
-    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.100"); //100 AB工位
+    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "10.85.10.131"); //100 AB工位
 
     public static List<String> hjparams = new ArrayList<>();
 

src/com/mes/ui/OprnoUtil.java

@@ -6,24 +6,28 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP040", "OP090", "OP110", "OP120", "OP130",
-            "OP140", "OP150", "OP160", "OP170", "OP180",
-            "OP190", "OP200", "OP210", "OP220", "OP280",
-            "OP290", "OP300", "OP310", "OP320", "OP330",
-            "OP340", "OP350", "OP360", "OP370", "OP380",
-            "OP390", "OP400", "OP410", "OP420", "OP430",
-            "OP440", "OP450", "OP460", "OP470", "OP480",
-            "OP490", "OP500", "OP510", "OP520"
+            "OP040","OP050","OP060","OP070","OP080","OP090", "OP100","OP110A","OP110B","OP110C",
+            "OP120","OP130","OP140","OP150","OP160", "OP170A","OP170B","OP170C","OP170D",
+            "OP180", "OP190A","OP190B","OP190C", "OP200", "OP210A","OP210B", "OP210C","OP220",
+            "OP230", "OP240A","OP240B", "OP250", "OP260", "OP270", "OP275", "OP280A","OP280B",
+            "OP290", "OP300", "OP305", "OP310", "OP315", "OP320", "OP330A","OP330B", "OP340A",
+            "OP340B", "OP350", "OP360", "OP370", "OP380", "OP390", "OP400", "OP410", "OP420",
+            "OP430", "OP440", "OP450", "OP460"
     };
+
     public static String[] xtoprnodes = new String[]{
-            "镭雕二维码", "框架总成CMT焊接", "总成焊接", "螺栓复拧", "框架正面补焊",
-            "框架反面补焊", "焊缝铣削", "焊道检查", "框架气密检测", "箱体反面CNC",
-            "箱体正面CNC", "箱体正面上盖CNC", "框架总成清洁+去毛刺", "封堵片焊接", "框架干冰清洁",
-            "反面液冷板拉铆+水冷板激光焊", "液冷板FSW", "FSW匙孔补焊+打磨", "框架反面装配", "框架正面装配",
-            "模组/冷板涂密封胶", "箱体封堵", "恒温静置", "半成品气密检测", "安装底护板",
-            "底护板螺栓复拧", "总成气密检测", "冷板气密检测", "安装快换螺栓", "总成检具检验",
-            "总成清洁", "粘贴TC带01/02/保温泡棉片/PET膜", "粘贴PC绝缘片/MPP泡棉/绝缘条", "粘贴外部保温泡棉/安装上盖密封圈", "总成CCD检测",
-            "终检", "GP12", "下线拍照", "包装"
+            "单部件压铆+涂胶", "压铆", "单部件装配", "左边梁镭雕", "CMT框架焊接", "人工补焊",
+            "焊缝打磨", "框架反面CNC(1序)", "框架反面CNC(2序)", "框架反面CNC(3序)", "框架去毛刺+清洁+牙套",
+            "液冷板拉铆", "液冷板点焊+水嘴焊接", "液冷板FSW", "半总成找漏", "总成反面CNC（1序）",
+            "总成反面CNC（2序）", "总成反面CNC（3序）", "总成反面CNC（4序）", "匙孔补焊打磨+搅拌焊道打磨",
+            "总成正面CNC(1序)", "总成正面CNC(2序)", "总成正面CNC(3序)", "总成清洁", "总成反面装配1（1序）",
+            "总成反面装配1（2序）", "总成反面装配1（3序）", "总成反面装配2", "总成正面装配1",
+            "总成正面装配2（1序）", "总成正面装配2（2序）", "中吊点安装", "边梁套筒涂胶+压合",
+            "箱体封堵", "胶水固化+静置", "半成品气密（1序）", "半成品气密（2序）", "密封件装配+加强板安装",
+            "双层拉铆螺母涂胶", "胶水固化", "焊道涂胶", "胶水固化", "加强板压紧工装拆卸+泡棉粘贴", "底护板装配（1序）",
+            "底护板装配（2序）", "总成气密（1序）", "总成气密（2序）", "底护板螺栓复拧", "液冷板气密", "反面终检",
+            "PC条+陶瓷复合带粘贴+水嘴封堵", "总成清洁+PET粘贴", "CCD", "总成检具检验", "模拟客户安装界面（装拆）",
+            "正面终检", "正面GP12", "反面GP12", "称重"
     };
     public static String[] lboprnos = new String[]{
 

src/com/mes/ui/PlcUtil.java

@@ -256,7 +256,7 @@ public class PlcUtil {
     // 获取B启动状态
     public static Boolean getBStart(S7PLC s7PLC){
         try{
-            return s7PLC.readBoolean("DB1.2.6");
+            return s7PLC.readBoolean("DB1.2.3");
         }catch (Exception e){
             e.printStackTrace();
             return false;
@@ -282,7 +282,7 @@ public class PlcUtil {
         try{
             // DB9.26.4 A B
             System.out.println("调用允许启动");
-            s7PLC.writeBoolean("DB9.26.4",result);
+            s7PLC.writeBoolean("DB9.25.7",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;
         }catch (Exception e){

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP090
+mes.gw=OP080
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.13.99
+mes.server_ip=192.168.14.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT