气枪双枪新增NG复判

src/com/mes/ui/DataUtil.java

@@ -292,4 +292,58 @@ public class DataUtil {
         }
         return result;
     }
+
+    public static JSONObject addNgData(String sn,String pos) {
+        try{
+            String enconding = "UTF-8";
+            InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
+            Properties pro = new Properties();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
+            pro.load(br);
+            String mes_server_ip = pro.getProperty("mes.server_ip");
+            String oprno = pro.getProperty("mes.gw").trim();
+            String lineSn = pro.getProperty("mes.line_sn").trim();
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductNg/addData";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&pos="+pos;
+            System.out.println("url="+url);
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    public static JSONObject checkNgData(String sn,String pos) {
+        try{
+            String enconding = "UTF-8";
+            InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
+            Properties pro = new Properties();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
+            pro.load(br);
+            String mes_server_ip = pro.getProperty("mes.server_ip");
+            String oprno = pro.getProperty("mes.gw").trim();
+            String lineSn = pro.getProperty("mes.line_sn").trim();
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductNg/ngcheck";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&pos="+pos;
+            System.out.println("url="+url);
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
 }

src/com/mes/ui/MesClient.java

@@ -86,10 +86,10 @@ 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");
+//    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");
 
     public static Timer cjTimer;
 
@@ -97,16 +97,17 @@ public class MesClient extends JFrame {
 
     public static Timer cjTimer3;
 
-    public static Short aSetNum = 40;
+    public static Short aSetNum = 19;
 //    public static Short aSetNum = 49;
     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 = 22;
+    public static Short bSetNum = 50;
 //    public static Short bSetNum = 27;
     public static Short sortB = 0;
     public static Short bMax = 0;
+    public static Short bFinish = 0;
     public static List<Map> blist = new ArrayList<>();
     public static Short deviceControl = 0; // 0=本地 1=远程
     public static Integer tjStatus = 0; // 1=提交失败
@@ -115,6 +116,29 @@ public class MesClient extends JFrame {
 
     public static String curSn = "";
 
+    public static Integer zdStatusA = 0;
+    public static Integer zdStatusB = 0;
+    public static String foutA = "";
+    public static String fmaxA = "";
+    public static String fminA = "";
+    public static String soutA = "";
+    public static String smaxA = "";
+    public static String sminA = "";
+    public static String curA = "";
+    public static String foutB = "";
+    public static String fmaxB = "";
+    public static String fminB = "";
+    public static String soutB = "";
+    public static String smaxB = "";
+    public static String sminB = "";
+    public static String curB = "";
+    public static JButton resetResultA;
+    public static JButton okResultA;
+    public static JButton ngResultA;
+    public static JButton resetResultB;
+    public static JButton okResultB;
+    public static JButton ngResultB;
+
     public static JTable table;
     public static Object[] columnNames = { "物料名称", "绑定批次", "剩余次数", "操作" };
     public static Object[][] rowData = null;
@@ -412,6 +436,7 @@ public class MesClient extends JFrame {
         MesClient.aMax = 0;
         MesClient.bMax = 0;
         MesClient.aFinish = 0;
+        MesClient.bFinish = 0;
         MesClient.alist = new ArrayList<>();
         MesClient.blist = new ArrayList<>();
         MesClient.sortB = 0;
@@ -421,6 +446,15 @@ public class MesClient extends JFrame {
         MesClient.param3.setText("");
         MesClient.param4.setText("");
 
+        zdStatusA = 0;
+        zdStatusB = 0;
+        resetResultA.setEnabled(false);
+        okResultA.setEnabled(false);
+        ngResultA.setEnabled(false);
+        resetResultB.setEnabled(false);
+        okResultB.setEnabled(false);
+        ngResultB.setEnabled(false);
+
         deviceControl = ModbusUtil.getControlModel(plcA);
         if(deviceControl == 1){
 
@@ -720,8 +754,7 @@ public class MesClient extends JFrame {
         });
         finish_ok_bt.setIcon(new ImageIcon(MesClient.class.getResource("/bg/ok_bg.png")));
         finish_ok_bt.setFont(new Font("微软雅黑", Font.PLAIN, 32));
-//        finish_ok_bt.setBounds(185, 291, 240, 80);
-        finish_ok_bt.setBounds(185, 371, 240, 80);
+        finish_ok_bt.setBounds(185, 395, 240, 80);
         finish_ok_bt.setEnabled(false);
         indexPanelA.add(finish_ok_bt);
 
@@ -737,7 +770,6 @@ public class MesClient extends JFrame {
                     Boolean sendret = DataUtil.sendQuality(nettyClient,sn,qret,user20);
                     if(!sendret){
                         MesClient.setMenuStatus("消息发送失败，请重试",-1);
-//                        JOptionPane.showMessageDialog(mesClientFrame,"消息发送失败，请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
                         return;
                     }
                 }
@@ -745,7 +777,7 @@ public class MesClient extends JFrame {
         });
         finish_ng_bt.setIcon(new ImageIcon(MesClient.class.getResource("/bg/ng_bg.png")));
         finish_ng_bt.setFont(new Font("微软雅黑", Font.PLAIN, 32));
-        finish_ng_bt.setBounds(508, 371, 240, 80);
+        finish_ng_bt.setBounds(508, 395, 240, 80);
         finish_ng_bt.setEnabled(false);
         indexPanelA.add(finish_ng_bt);
 
@@ -817,6 +849,218 @@ public class MesClient extends JFrame {
         param4.setBounds(608, 285, 83, 34);
         indexPanelA.add(param4);
 
+        JLabel lblNgJudgeA = new JLabel("NG\u590d\u5224");
+        lblNgJudgeA.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        lblNgJudgeA.setBounds(204, 322, 167, 22);
+        indexPanelA.add(lblNgJudgeA);
+
+        JLabel lblNgJudgeB = new JLabel("NG\u590d\u5224");
+        lblNgJudgeB.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        lblNgJudgeB.setBounds(525, 322, 167, 22);
+        indexPanelA.add(lblNgJudgeB);
+
+        resetResultA = new JButton("重拉");
+        resetResultA.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if(zdStatusA == 1){
+                    JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"A");
+                    if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        zdStatusA = 0;
+                        resetResultA.setEnabled(false);
+                        okResultA.setEnabled(false);
+                        ngResultA.setEnabled(false);
+                        sortA = (short)(sortA - 1);
+                        param2.setText(sortA+"");
+                        plcA.writeInt16(1136, sortA);
+                        foutA = "";
+                        soutA = "";
+                        fmaxA = "";
+                        fminA = "";
+                        smaxA = "";
+                        sminA = "";
+                        curA = "";
+                        ModbusUtil.setPowerOn(plcA);
+                    }else{
+                        setMenuStatus("NG中断未审核",-1);
+                    }
+                }
+            }
+        });
+        resetResultA.setEnabled(false);
+        resetResultA.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        resetResultA.setBounds(204, 348, 70, 36);
+        indexPanelA.add(resetResultA);
+
+        okResultA = new JButton("OK");
+        okResultA.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if(zdStatusA == 1){
+                    JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"A");
+                    if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        if(!product_sn.getText().isEmpty()){
+                            aFinish++;
+                            JdbcUtils.insertProdData(mes_gw, mes_line_sn, product_sn.getText(),"A",foutA,soutA,fminA,sminA,fmaxA,smaxA,"1",curA, user_menu.getText());
+                        }
+                        zdStatusA = 0;
+                        resetResultA.setEnabled(false);
+                        okResultA.setEnabled(false);
+                        ngResultA.setEnabled(false);
+                        foutA = "";
+                        soutA = "";
+                        fmaxA = "";
+                        fminA = "";
+                        smaxA = "";
+                        sminA = "";
+                        curA = "";
+                        ModbusUtil.upResult();
+                        ModbusUtil.setPowerOn(plcA);
+                    }else{
+                        setMenuStatus("NG中断未审核",-1);
+                    }
+                }
+            }
+        });
+        okResultA.setEnabled(false);
+        okResultA.setForeground(new Color(0, 128, 0));
+        okResultA.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        okResultA.setBounds(281, 348, 70, 36);
+        indexPanelA.add(okResultA);
+
+        ngResultA = new JButton("NG");
+        ngResultA.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if(zdStatusA == 1){
+                    JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"A");
+                    if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        if(!product_sn.getText().isEmpty()){
+                            JdbcUtils.insertProdData(mes_gw, mes_line_sn, product_sn.getText(),"A",foutA,soutA,fminA,sminA,fmaxA,smaxA,"0",curA, user_menu.getText());
+                        }
+                        zdStatusA = 0;
+                        resetResultA.setEnabled(false);
+                        okResultA.setEnabled(false);
+                        ngResultA.setEnabled(false);
+                        foutA = "";
+                        soutA = "";
+                        fmaxA = "";
+                        fminA = "";
+                        smaxA = "";
+                        sminA = "";
+                        curA = "";
+                        ModbusUtil.upResult();
+                        ModbusUtil.setPowerOn(plcA);
+                    }else{
+                        setMenuStatus("NG中断未审核",-1);
+                    }
+                }
+            }
+        });
+        ngResultA.setEnabled(false);
+        ngResultA.setForeground(new Color(255, 0, 0));
+        ngResultA.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        ngResultA.setBounds(358, 348, 70, 36);
+        indexPanelA.add(ngResultA);
+
+        resetResultB = new JButton("重拉");
+        resetResultB.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if(zdStatusB == 1){
+                    JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"B");
+                    if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        zdStatusB = 0;
+                        resetResultB.setEnabled(false);
+                        okResultB.setEnabled(false);
+                        ngResultB.setEnabled(false);
+                        sortB = (short)(sortB - 1);
+                        param4.setText(sortB+"");
+                        plcB.writeInt16(1136, sortB);
+                        foutB = "";
+                        soutB = "";
+                        fmaxB = "";
+                        fminB = "";
+                        smaxB = "";
+                        sminB = "";
+                        curB = "";
+                        ModbusUtil.setPowerOn(plcB);
+                    }else{
+                        setMenuStatus("NG中断未审核",-1);
+                    }
+                }
+            }
+        });
+        resetResultB.setEnabled(false);
+        resetResultB.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        resetResultB.setBounds(525, 348, 70, 36);
+        indexPanelA.add(resetResultB);
+
+        okResultB = new JButton("OK");
+        okResultB.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if(zdStatusB == 1){
+                    JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"B");
+                    if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        if(!product_sn.getText().isEmpty()){
+                            bFinish++;
+                            JdbcUtils.insertProdData(mes_gw, mes_line_sn, product_sn.getText(),"B",foutB,soutB,fminB,sminB,fmaxB,smaxB,"1",curB, user_menu.getText());
+                        }
+                        zdStatusB = 0;
+                        resetResultB.setEnabled(false);
+                        okResultB.setEnabled(false);
+                        ngResultB.setEnabled(false);
+                        foutB = "";
+                        soutB = "";
+                        fmaxB = "";
+                        fminB = "";
+                        smaxB = "";
+                        sminB = "";
+                        curB = "";
+                        ModbusUtil.upResult();
+                        ModbusUtil.setPowerOn(plcB);
+                    }else{
+                        setMenuStatus("NG中断未审核",-1);
+                    }
+                }
+            }
+        });
+        okResultB.setEnabled(false);
+        okResultB.setForeground(new Color(0, 128, 0));
+        okResultB.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        okResultB.setBounds(602, 348, 70, 36);
+        indexPanelA.add(okResultB);
+
+        ngResultB = new JButton("NG");
+        ngResultB.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if(zdStatusB == 1){
+                    JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"B");
+                    if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        if(!product_sn.getText().isEmpty()){
+                            JdbcUtils.insertProdData(mes_gw, mes_line_sn, product_sn.getText(),"B",foutB,soutB,fminB,sminB,fmaxB,smaxB,"0",curB, user_menu.getText());
+                        }
+                        zdStatusB = 0;
+                        resetResultB.setEnabled(false);
+                        okResultB.setEnabled(false);
+                        ngResultB.setEnabled(false);
+                        foutB = "";
+                        soutB = "";
+                        fmaxB = "";
+                        fminB = "";
+                        smaxB = "";
+                        sminB = "";
+                        curB = "";
+                        ModbusUtil.upResult();
+                        ModbusUtil.setPowerOn(plcB);
+                    }else{
+                        setMenuStatus("NG中断未审核",-1);
+                    }
+                }
+            }
+        });
+        ngResultB.setEnabled(false);
+        ngResultB.setForeground(new Color(255, 0, 0));
+        ngResultB.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+        ngResultB.setBounds(679, 348, 70, 36);
+        indexPanelA.add(ngResultB);
+
         tabbedPane.addTab("工作面板", new ImageIcon(MesClient.class.getResource("/bg/a_side.png")), indexScrollPaneA, null);
         tabbedPane.setEnabledAt(0, true);
 

src/com/mes/ui/ModbusUtil.java

@@ -45,18 +45,44 @@ 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);
-            }
-
+//            if(MesClient.sortA == 4){
+//                    plc.writeInt16(1070,(short) 2000);
+//                    plc.writeInt16(1071,(short) 5000);
+//            }
 
             if(!MesClient.product_sn.getText().isEmpty()){
-                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",fout,sout,fmin,smin,fmax,smax,"1",cur+"", MesClient.user_menu.getText());
+                String qty = "1";
+                if(Integer.valueOf(fout) < Integer.valueOf(fmin) || Integer.valueOf(fout) > Integer.valueOf(fmax)){
+                    qty = "0";
+                }
+                if(Float.valueOf(sout) < Float.valueOf(smin) || Float.valueOf(sout) > Float.valueOf(smax)){
+                    qty = "0";
+                }
+                // NG处理
+                if(qty.equals("0")){
+                    MesClient.zdStatusA = 1;
+                    MesClient.foutA = fout;
+                    MesClient.soutA = sout;
+                    MesClient.fmaxA = fmax;
+                    MesClient.fminA = fmin;
+                    MesClient.smaxA = smax;
+                    MesClient.sminA = smin;
+                    MesClient.curA = cur+"";
+                    MesClient.resetResultA.setEnabled(true);
+                    MesClient.okResultA.setEnabled(true);
+                    MesClient.ngResultA.setEnabled(true);
+                    setPowerOff(plc);
+                    DataUtil.addNgData(MesClient.product_sn.getText(),"A");
+                }
+                if(qty.equals("1")){
+                    JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
+                }
             }
         }
 
-        upResult();
+        if(MesClient.zdStatusA == 0 && MesClient.zdStatusB == 0){
+            upResult();
+        }
     }
 
     public static void getDataB(ModbusTcp plc){
@@ -83,6 +109,7 @@ public class ModbusUtil {
 
         if(MesClient.sortB == cur - 1){
             MesClient.sortB = cur;
+            MesClient.bFinish = plc.readInt16(1138);
             String fout = plc.readInt16(1064)+"";
             String sout = (float)plc.readInt16(1065)/1000+"";
 
@@ -92,28 +119,51 @@ public class ModbusUtil {
             String fmax = plc.readInt16(1069)+"";
             String smax = (float)plc.readInt16(1071)/1000+"";
 
-            if(MesClient.sortB == 18){
-//                if(MesClient.bMax == 36){
-//                    plc.writeInt16(1070,(short) 4000);
-//                    plc.writeInt16(1071,(short) 5500);
-//                }
-            }
-
 
             MesClient.param4.setText(cur+"");
 
             System.out.println("cur:"+cur);
             if(!MesClient.product_sn.getText().isEmpty()){
-               JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",fout,sout,fmin,smin,fmax,smax,"1",cur+"", MesClient.user_menu.getText());
+                String qty = "1";
+                if(Integer.valueOf(fout) < Integer.valueOf(fmin) || Integer.valueOf(fout) > Integer.valueOf(fmax)){
+                    qty = "0";
+                }
+                if(Float.valueOf(sout) < Float.valueOf(smin) || Float.valueOf(sout) > Float.valueOf(smax)){
+                    qty = "0";
+                }
+                // NG处理
+                if(qty.equals("0")){
+                    MesClient.zdStatusB = 1;
+                    MesClient.foutB = fout;
+                    MesClient.soutB = sout;
+                    MesClient.fmaxB = fmax;
+                    MesClient.fminB = fmin;
+                    MesClient.smaxB = smax;
+                    MesClient.sminB = smin;
+                    MesClient.curB = cur+"";
+                    MesClient.resetResultB.setEnabled(true);
+                    MesClient.okResultB.setEnabled(true);
+                    MesClient.ngResultB.setEnabled(true);
+                    setPowerOff(plc);
+                    DataUtil.addNgData(MesClient.product_sn.getText(),"B");
+                }
+                if(qty.equals("1")){
+                    JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
+                }
             }
         }
 
-        upResult();
+        if(MesClient.zdStatusA == 0 && MesClient.zdStatusB == 0){
+            upResult();
+        }
 
     }
 
     // 上传总结果
     public static void upResult(){
+        if (MesClient.zdStatusA != 0 || MesClient.zdStatusB != 0) {
+            return;
+        }
         if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA && MesClient.bMax > 0 && MesClient.bMax == MesClient.sortB){
             MesClient.finish_ok_bt.setEnabled(true);
             MesClient.finish_ng_bt.setEnabled(true);
@@ -125,6 +175,9 @@ public class ModbusUtil {
                 if(MesClient.aFinish != MesClient.aMax){
                     retf = "NG";
                 }
+                if(MesClient.bFinish != MesClient.bMax){
+                    retf = "NG";
+                }
                 Boolean ret = DataUtil.sendQuality(MesClient.nettyClient, MesClient.product_sn.getText(),retf, MesClient.user20);
                 if(!ret){
                     MesClient.setMenuStatus(MesClient.tjFlagTextErr,-1);
@@ -222,15 +275,15 @@ 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);
-                plc.writeInt16(1071,(short) 4000);
-            }
+//            if(setNum == 22){
+//                plc.writeInt16(1070,(short) 2500);
+//                plc.writeInt16(1071,(short) 4500);
+//            }
+//
+//            if (setNum == 40){
+//                plc.writeInt16(1070,(short) 2000);
+//                plc.writeInt16(1071,(short) 4000);
+//            }
 
         }catch (Exception e){
             e.printStackTrace();

src/com/mes/ui/OprnoUtil.java

@@ -6,28 +6,10 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP070","OP080", "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",
-            "OP460", "OP470", "OP480", "OP490", "OP500",
-            "OP510", "OP520", "OP550"
+            "OP310"
     };
     public static String[] xtoprnodes = new String[]{
-            "右边梁镭雕二维码","左右边梁防爆阀拉铆","CMT框架一序焊接",
-            "人工补焊", "框架CMT二序焊接", "人工补焊", "焊道检查", "总成正面CNC",
-            "总成反面CNC", "框架去毛刺+清洁", "封堵片焊接+打磨", "边框气密", "焊道补焊",
-            "框架反面涂胶", "液冷板安装", "正面溢胶清理,补胶", "液冷板激光点固", "液冷板水嘴处焊接",
-            "焊道打磨", "液冷板FSW", "匙孔补焊打磨", "总成反面拉铆", "总成正面拉铆1",
-            "总成正面拉铆2", "边梁套筒涂胶+压合", "箱体封堵", "胶水固化", "半成品气密",
-            "补强板安装", "胶水固化", "拆卸补强板压紧工装", "FSW焊道涂胶+双层拉铆螺母涂胶", "人工抹胶",
-            "胶水固化", "反面部件装配", "底护板装配+底部套筒螺母安装", "底护板螺栓复拧", "总成气密",
-            "液冷板气密", "总成正面装配", "总成清洁", "总成检具检验", "模拟客户安装界面（装）",
-            "CCD", "GP12", "称重"
+            "反面装配"
     };
     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=OP290A
-mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.21.99
+mes.gw=OP310B
+#mes.server_ip=127.0.0.1
+mes.server_ip=192.168.22.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT