e38福尼斯小总成焊接op060

src/com/mes/ui/MesRevice.java

@@ -18,19 +18,11 @@ public class MesRevice {
                 String oprno = ProtocolParam.getOprno(mes_msg).trim();
                 String sn = ProtocolParam.getSn(mes_msg).trim();
                 System.out.println(":"+oprno);
-                if(oprno.equals("OP110A")){
+                if(oprno.equals("OP060A")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }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("OP110C")){
-                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
-                    MesClient.getUser();
-                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP110D")){
+                }else if(oprno.equals("OP060B")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");

src/com/mes/ui/OprnoUtil.java

@@ -6,27 +6,11 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP040", "OP050", "OP060", "OP070", "OP080",
-            "OP090", "OP100", "OP110", "OP120", "OP130",
-            "OP140", "OP150", "OP160", "OP170", "OP180",
-            "OP190", "OP200", "OP210", "OP220", "OP230",
-            "OP240", "OP250", "OP260", "OP270", "OP280",
-            "OP290", "OP300", "OP310", "OP320", "OP330",
-            "OP340", "OP350", "OP360", "OP370", "OP380",
-            "OP390", "OP400", "OP410", "OP420", "OP430",
-            "OP440", "OP450"
+            "OP060",
     };
 
     public static String[] xtoprnodes = new String[]{
-            "镭雕二维码", "前边梁小总成（焊接）", "前边梁小总成（拉铆）+右边梁小总成（拉铆）", "前边梁小总成气密", "前边梁小总成/左边梁小总成压铆",
-            "前边梁小总成/左边梁小总成涂胶", "框架CMT焊接", "框架CMT焊接", "焊道铣削", "焊道缺陷检验",
-            "框架气密", "总成正面CNC", "总成反面CNC", "框架清洁", "框架涂胶+液冷板安装",
-            "反面铆接", "激光点焊", "水冷板FSW", "清除FSW飞边", "TIG焊接水嘴",
-            "TIG补焊尾孔+封堵片焊接", "总成清洁+涂封堵胶", "涂胶+压套筒", "胶水固化", "正面装配",
-            "反面装配", "半成品气密", "箱体补强件位置涂胶", "安装补强件", "胶水固化",
-            "FSW焊道位置涂胶", "胶水固化", "底护板装配", "复拧螺栓", "成品气密",
-            "液冷板气检", "总成检具", "CCD", "总成清洁", "终检",
-            "GP12", "包装"
+            "横梁小总成焊接+左右边梁小总成焊接"
     };
     public static String[] lboprnos = new String[]{
 

src/com/mes/ui/PlcUtil.java

@@ -112,61 +112,61 @@ public class PlcUtil {
         }
     }
 
-    public static void getStatusBOld(S7PLC s7PLC){
-        String snb = "";
-        if(MesClient.tjFlagb == 0){ // 未扫码
-            snb = s7PLC.readString("DB8.100",50);
-            System.out.println("snb:"+snb);
-            if(!snb.isEmpty() && !MesClient.curSnb.equals(snb) && snb.length() == 33){
-                MesClient.product_sn2.setText(snb);
-            }else{
-                snb = "";
-            }
-            if(!MesClient.mesQualityFlagB && !snb.isEmpty() && MesClient.curSnb.isEmpty()){ // 查询工件质量
-                if(!MesClient.tcp_connect_flag) {
-                    MesClient.status_menu.setText("未连接MES服务器");
-                }else{
-                    if(MesClient.checkB == 0) {
-                        MesClient.checkB = 1;
-                        MesClient.getUser();
-                        Boolean sendret = DataUtil.checkQuality(MesClient.nettyClient,snb,MesClient.user20,"B");
-                        if(!sendret){
-                            MesClient.pxstatus2.setText("B:查询质量失败");
-                            MesClient.checkB = 0;
-                        }
-                    }
-                }
-            }
-        }else if(MesClient.tjFlagb == 1){ // 待运行
-            MesClient.checkB = 0;
-            Boolean startb = s7PLC.readBoolean("DB1.2.3"); //B启动中
-            if(startb){
-                MesClient.curFlag = "B";
-                MesClient.tjFlagb = 2;
-                MesClient.pxstatus2.setText("B:设备运行中");
-                PlcUtil.changeEnable(MesClient.s7PLC,false);
-            }
-        }else if(MesClient.tjFlagb == 2){ // 运行中
-            MesClient.batch_scan_2.setEnabled(false);
-            Boolean starta = s7PLC.readBoolean("DB1.2.7"); //B焊接完成
-            Boolean startb = s7PLC.readBoolean("DB1.2.2"); //A启动中
-            if(starta || startb){
-                MesClient.tjFlagb = 3;
-                MesClient.pxstatus2.setText("B:设备运行结束,提交结果中");
-                MesClient.finish_ng_bt.setEnabled(true);
-
-                Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn2.getText(),"OK",MesClient.user20,"B");
-                if(!sendret){
-                    MesClient.pxstatus2.setText("B:结果上传MES失败");
-                    MesClient.tjStatusb = 1;
-                }else{
-//                    MesClient.pxstatus2.setText("B:提交成功");
-//                    MesClient.status_menu.setText("B件提交成功");
-//                    MesClient.resetScanB();
-                }
-            }
-        }
-    }
+//    public static void getStatusBOld(S7PLC s7PLC){
+//        String snb = "";
+//        if(MesClient.tjFlagb == 0){ // 未扫码
+//            snb = s7PLC.readString("DB8.100",50);
+//            System.out.println("snb:"+snb);
+//            if(!snb.isEmpty() && !MesClient.curSnb.equals(snb) && snb.length() == 33){
+//                MesClient.product_sn2.setText(snb);
+//            }else{
+//                snb = "";
+//            }
+//            if(!MesClient.mesQualityFlagB && !snb.isEmpty() && MesClient.curSnb.isEmpty()){ // 查询工件质量
+//                if(!MesClient.tcp_connect_flag) {
+//                    MesClient.status_menu.setText("未连接MES服务器");
+//                }else{
+//                    if(MesClient.checkB == 0) {
+//                        MesClient.checkB = 1;
+//                        MesClient.getUser();
+//                        Boolean sendret = DataUtil.checkQuality(MesClient.nettyClient,snb,MesClient.user20,"B");
+//                        if(!sendret){
+//                            MesClient.pxstatus2.setText("B:查询质量失败");
+//                            MesClient.checkB = 0;
+//                        }
+//                    }
+//                }
+//            }
+//        }else if(MesClient.tjFlagb == 1){ // 待运行
+//            MesClient.checkB = 0;
+//            Boolean startb = s7PLC.readBoolean("DB1.2.3"); //B启动中
+//            if(startb){
+//                MesClient.curFlag = "B";
+//                MesClient.tjFlagb = 2;
+//                MesClient.pxstatus2.setText("B:设备运行中");
+//                PlcUtil.changeEnable(MesClient.s7PLC,false);
+//            }
+//        }else if(MesClient.tjFlagb == 2){ // 运行中
+//            MesClient.batch_scan_2.setEnabled(false);
+//            Boolean starta = s7PLC.readBoolean("DB1.2.7"); //B焊接完成
+//            Boolean startb = s7PLC.readBoolean("DB1.2.2"); //A启动中
+//            if(starta || startb){
+//                MesClient.tjFlagb = 3;
+//                MesClient.pxstatus2.setText("B:设备运行结束,提交结果中");
+//                MesClient.finish_ng_bt.setEnabled(true);
+//
+//                Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn2.getText(),"OK",MesClient.user20,"B");
+//                if(!sendret){
+//                    MesClient.pxstatus2.setText("B:结果上传MES失败");
+//                    MesClient.tjStatusb = 1;
+//                }else{
+////                    MesClient.pxstatus2.setText("B:提交成功");
+////                    MesClient.status_menu.setText("B件提交成功");
+////                    MesClient.resetScanB();
+//                }
+//            }
+//        }
+//    }
 
     public static void getStatusA(S7PLC s7PLC){
         if(MesClient.tjFlaga == 1){ // 已扫码，设备未运行
@@ -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.23.7",result);
+            s7PLC.writeBoolean("DB9.30.4",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;
         }catch (Exception e){

src/resources/config/config.properties

@@ -1,7 +1,7 @@
-mes.gw=OP110
+mes.gw=OP060
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.22.99
+mes.server_ip=192.168.15.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT
-mes.gwflag=B
+mes.gwflag=A