优化

src/com/mes/ui/DataUtil.java

@@ -242,6 +242,25 @@ public class DataUtil {
         }
     }
 
+    public static JSONObject saveLife(String sn,String ps) {
+        try{
+            String url = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesProductCncLife/saveLife";
+            String params = "__ajax=json&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn+"&sn="+sn+"&params="+ps;
+            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 String doPost(String httpUrl, String param) {
         HttpURLConnection connection = null;
         InputStream is = null;
@@ -252,8 +271,8 @@ public class DataUtil {
             URL url = new URL(httpUrl);
             connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("POST");
-            connection.setConnectTimeout(15000);
-            connection.setReadTimeout(60000);
+            connection.setConnectTimeout(5000);
+            connection.setReadTimeout(10000);
             connection.setDoOutput(true);
             connection.setDoInput(true);
             connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");

src/com/mes/ui/MesClient.java

@@ -120,15 +120,10 @@ public class MesClient extends JFrame {
 
     public static int alarmFlag = 0; // 报警标志
 
-    // OP150寿命
-//    public static int[] toolNums = { 1,2,3,4,5,6,7,8,9,10};
-//    public static String[] toolTitle = { "合金铣刀", "插刀", "插刀", "合金钻头", "合金钻头", "合金钻头", "合金钻头", "合金铣刀", "切削丝锥", "倒角刀" };
-//    public static String[] toolLife = { "122", "", "", "", "", "", "", "", "", "" };
-
-    // OP160寿命
-    public static int[] toolNums = { 1,2,3,4,5,6,7,8,9};
-    public static String[] toolTitle = { "刀杆", "合金铣刀", "合金铣刀", "倒角刀", "合金钻头", "合金钻头", "合金铣刀", "合金插刀", "合金铣刀" };
-    public static String[] toolLife = { "", "", "", "", "", "", "", "", "", "" };
+    // OP130寿命
+    public static int[] toolNums = { 1};
+    public static String[] toolTitle = { "D16立铣刀" };
+    public static String[] toolLife = { "" };
 
     public static void main(String[] args) {
         if (LockUtil.getInstance().isAppActive() == true){
@@ -178,15 +173,13 @@ public class MesClient extends JFrame {
             public void run() {
                 if(work_status == 1){
 
-                    if(CommonUtils.formatOprno(mes_gw).equals("OP150")){
-                        int program = ModbusUitl.getProgram(modbusTcp);
-                        int program2 = CommonUtils.getProductProgram(product_sn.getText().trim());
-                        if(program != program2){
-                            MesClient.setMenuStatus("工件码与程序不匹配",-1);
-                        }
-                    }
-
-
+//                    if(CommonUtils.formatOprno(mes_gw).equals("OP150")){
+//                        int program = ModbusUitl.getProgram(modbusTcp);
+//                        int program2 = CommonUtils.getProductProgram(product_sn.getText().trim());
+//                        if(program != program2){
+//                            MesClient.setMenuStatus("工件码与程序不匹配",-1);
+//                        }
+//                    }
                     ModbusUitl.getParamData(modbusTcp);
                 }else{
                     int qdstatus = ModbusUitl.getEnable(modbusTcp);
@@ -1267,162 +1260,4 @@ public class MesClient extends JFrame {
         MesClient.status_menu.setText(msg);
     }
 
-    public static void getMaterailData(){
-        try{
-            JSONObject retObj = DataUtil.getBindMaterail();
-            if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
-                java.util.List<BindMaterialResp> arrs = retObj.getList("data",BindMaterialResp.class);
-                int i = 0;
-                rowData = new Object[arrs.size()][7];
-                for (BindMaterialResp bindMaterialResp:arrs){
-                    rowData[i][0] = bindMaterialResp.getMaterialTitle();
-                    rowData[i][1] = bindMaterialResp.getBatchSn();
-                    rowData[i][2] = bindMaterialResp.getLastTimes();
-                    rowData[i][3] = "";
-                    rowData[i][4] = bindMaterialResp.getCraft();
-                    rowData[i][5] = bindMaterialResp.getMaterialId();
-                    rowData[i][6] = bindMaterialResp.getType();
-                    i++;
-                }
-                bindBatchPanel();
-            }
-        }catch (Exception e){
-            log.info(e.getMessage());
-        }
-    }
-
-    public static void updateMaterailData(){
-        try{
-            JSONObject retObj = DataUtil.getBindMaterail();
-            if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
-                List<BindMaterialResp> arrs = retObj.getList("data",BindMaterialResp.class);
-
-                int i = 0;
-                for (BindMaterialResp bindMaterialResp:arrs){
-                    rowData[i][0] = bindMaterialResp.getMaterialTitle();
-                    rowData[i][1] = bindMaterialResp.getBatchSn();
-                    rowData[i][2] = bindMaterialResp.getLastTimes();
-                    rowData[i][3] = "";
-                    rowData[i][4] = bindMaterialResp.getCraft();
-                    rowData[i][5] = bindMaterialResp.getMaterialId();
-                    rowData[i][6] = bindMaterialResp.getType();
-                    i++;
-                }
-
-                MesClient.table.repaint();
-            }
-        }catch (Exception e){
-            log.info(e.getMessage());
-        }
-    }
-
-    // 绑定物料批次码
-    public static void scanBatchSn(BindMaterialResp bindMaterialResp) {
-        //弹窗扫工件码
-        String scanBarcodeTitle = "请扫物料:"+bindMaterialResp.getMaterialTitle();
-        String scanBarcode = JOptionPane.showInputDialog(null, scanBarcodeTitle);
-        if(scanBarcode!=null&&!scanBarcode.equalsIgnoreCase("")) {
-
-            JSONObject retObj = DataUtil.saveBindMaterail(scanBarcode,bindMaterialResp.getCraft(),bindMaterialResp.getMaterialId(),bindMaterialResp.getType());
-            if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
-                MesClient.setMenuStatus("扫物料:"+bindMaterialResp.getMaterialTitle()+"成功",0);
-                updateMaterailData();
-            }else{
-                if(retObj.get("result")==null){
-                    MesClient.setMenuStatus("请求失败，请重试",-1);
-                }else{
-                    if(retObj.get("result").toString().equalsIgnoreCase("false")){
-                        MesClient.setMenuStatus(retObj.getString("message"),-1);
-                    }
-                }
-            }
-        }
-    }
-
-    public static void bindBatchPanel(){
-        JPanel indexPanelBB = new JPanel();
-        JPanel panel = new JPanel();
-        panel.setBounds(0, 0, 990, 550);
-//        panel.setBounds(81, 50, 810, 479);
-        indexPanelBB.add(panel);
-
-        panel.setLayout(new GridLayout(0, 1, 0, 0));
-        table = new JTable(rowData, columnNames){
-            public boolean isCellEditable(int row, int column) {
-                if(column == 3){
-                    return true;
-                }
-                return false;
-            }
-        };
-        table.setRowHeight(40);
-        table.setEnabled(true);
-        table.setFont(new Font("微软雅黑", Font.PLAIN, 14));
-
-        table.getColumnModel().getColumn(3).setCellRenderer(new TableCellRendererButton());
-        table.getColumnModel().getColumn(3).setCellEditor(new TableCellEditorButton());
-
-
-        JScrollPane scrollPane = new JScrollPane(table);
-        panel.add(scrollPane);
-
-        JScrollPane indexScrollPaneB = new JScrollPane(indexPanelBB);
-        indexPanelBB.setLayout(null);
-        tabbedPane.addTab("绑定物料", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), indexScrollPaneB, null);
-    }
-
-    // 开启发送结果定时任务
-    public static void startUpdateQualityTimer(){
-        // 创建异步线程池
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
-        // 提交任务
-        executorService.submit(() -> {
-            log.info("异步任务执行中...");
-            // 模拟耗时操作
-            try {
-                while (true){
-                    try {
-                        // 确保连接已经打开
-                        if (JdbcUtils.conn == null || JdbcUtils.conn.isClosed()) {
-                            JdbcUtils.openConnection();
-                        }
-
-                        Statement statement = JdbcUtils.conn.createStatement();
-                        String selectSql = "SELECT id, bw FROM submit_record\n" +
-                                "WHERE state = 0 ORDER BY id DESC LIMIT 10";
-                        String updateSql = "UPDATE submit_record \n" +
-                                "SET state = '1'\n" +
-                                "WHERE id = ";
-                        ResultSet rs = statement.executeQuery(selectSql);
-                        while(rs.next()){
-                            int id = rs.getInt("id");
-                            String bw = rs.getString("bw");
-                            // 发送请求
-                            String url = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/updateQualityByTiming";
-                            log.info("质量："+bw);
-                            String s = HttpUtils.sendPostRequestJson(url, bw );
-                            log.info("结果："+s);
-                            Boolean result = JSONObject.parseObject(s).getBoolean("result");
-                            if(result) {
-                                // 更改状态为 1
-                                statement.executeUpdate(updateSql + id);
-                            }
-                        }
-                        rs.close();
-                        statement.close();
-                    } catch (Exception e) {
-                        log.info(e.getMessage());
-                    }
-                    try {
-                        Thread.sleep(2000);
-                    }catch (Exception e){
-                        log.info(e.getMessage());
-                    }
-                }
-            } catch (Exception e) {
-                log.info(e.getMessage());
-            }
-            log.info("异步任务执行完毕");
-        });
-    }
 }

src/com/mes/ui/MesRevice.java

@@ -24,10 +24,10 @@ public class MesRevice {
 //                MesClient.finish_ng_bt.setEnabled(true);
                 MesClient.tjFlag = 1;
 
-                if(CommonUtils.formatOprno(MesClient.mes_gw).equals("OP150")){
-                    int program = CommonUtils.getProductProgram(sn);
-                    ModbusUitl.changeProgram(MesClient.modbusTcp, program);
-                }
+//                if(CommonUtils.formatOprno(MesClient.mes_gw).equals("OP150")){
+//                    int program = CommonUtils.getProductProgram(sn);
+//                    ModbusUitl.changeProgram(MesClient.modbusTcp, program);
+//                }
 
                 int i = 0;
                 for(Integer toolNum:MesClient.toolNums){

src/com/mes/ui/ModbusUitl.java

@@ -3,6 +3,9 @@ package com.mes.ui;
 import com.github.xingshuangs.iot.protocol.common.buff.EByteBuffFormat;
 import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ModbusUitl {
 
     public static void getParamData(ModbusTcp modbusTcp){
@@ -33,7 +36,7 @@ public class ModbusUitl {
             if(MesClient.tjFlag == 2){
                 MesClient.yxtime++;
                 System.out.println("yxtime:"+MesClient.yxtime);
-//                getToolLife(modbusTcp);
+                getToolLife(modbusTcp);
             }else if(MesClient.tjFlag == 3){
 
                 if(MesClient.tjStatus == 0){
@@ -54,15 +57,21 @@ public class ModbusUitl {
     public static void getToolLife(ModbusTcp modbusTcp){
         try{
             if(MesClient.smStatus == 0){
-//                MesClient.param1.setText(String.valueOf(getLife(modbusTcp,1)));
-//                MesClient.param2.setText(String.valueOf(getLife(modbusTcp,2)));
-//                MesClient.param3.setText(String.valueOf(getLife(modbusTcp,3)));
-//                MesClient.param4.setText(String.valueOf(getLife(modbusTcp,4)));
-//                MesClient.param5.setText(String.valueOf(getLife(modbusTcp,5)));
-//                MesClient.param6.setText(String.valueOf(getLife(modbusTcp,6)));
-//                if(!MesClient.param1.getText().isEmpty()){
-//                    MesClient.smStatus = 1;
-//                }
+                int i=0;
+                List<String> ps = new ArrayList<>();
+                for(Integer toolNum : MesClient.toolNums){
+                    String life = String.valueOf(getLife(modbusTcp,toolNum));
+                    MesClient.toolLife[i] = life;
+                    ps.add(toolNum+"_"+life);
+                    i++;
+                }
+                if(!MesClient.toolLife[i] .isEmpty()){
+                    MesClient.smStatus = 1;
+
+                    ToolConfig.setToolParamsVal();
+
+                    DataUtil.saveLife(MesClient.product_sn.getText(),String.join("\\|",ps));
+                }
             }
         }catch (Exception e){
             e.printStackTrace();

src/com/mes/ui/OprnoUtil.java

@@ -19,7 +19,7 @@ public class OprnoUtil {
     };
     public static String[] xtoprnodes = new String[]{
             "右边梁镭雕二维码","左边梁防爆阀拉铆","CMT框架一序焊接",
-            "人工补焊", "框架CMT二序焊接", "人工补焊", "焊道检查", "总成正面CNC",
+            "人工补焊", "框架CMT二序焊接", "焊道铣削", "焊道检查", "总成正面CNC",
             "总成反面CNC", "框架去毛刺+清洁", "封堵片焊接+打磨", "边框气密", "焊道补焊",
             "框架反面涂胶", "液冷板安装", "正面溢胶清理,补胶", "液冷板激光点固", "液冷板水嘴处焊接",
             "焊道打磨", "液冷板FSW", "匙孔补焊打磨", "总成反面拉铆", "总成正面拉铆1",

src/com/mes/ui/TableCellEditorButton.java

@@ -30,7 +30,7 @@ public class TableCellEditorButton extends DefaultCellEditor {
                 bindMaterialResp.setMaterialId(MesClient.rowData[selectedRow][5] + "");
                 bindMaterialResp.setType(MesClient.rowData[selectedRow][6] + "");
 
-                MesClient.scanBatchSn(bindMaterialResp);
+//                MesClient.scanBatchSn(bindMaterialResp);
             }
         });
 

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP150D
-#mes.server_ip=127.0.0.1
-mes.server_ip=192.168.21.99
+mes.gw=OP130A
+mes.server_ip=127.0.0.1
+#mes.server_ip=192.168.22.99
 mes.tcp_port=3000
 
 mes.heart_beat_cycle=60