工控机分辨率适配

src/com/mes/ui/DataUtil.java

@@ -23,8 +23,7 @@ public class DataUtil {
             String url = "http://"+serverIp+":8980/js/a/mes/mesProductRecord/getCurSn";
             String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&__sid="+MesClient.sessionid;
             JSONObject result = JSONObject.parseObject(doPost(url, params));
-            log.info("请求参数："+params);
-            log.info(result.toJSONString());
+            System.out.println("请求参数："+params);
             return result;
         } catch (Exception e) {
             log.info("e="+e.getMessage());
@@ -92,7 +91,7 @@ public class DataUtil {
             log.info("params="+params);
             String result = doPost(url,params);
             log.info("result="+result);
-
+            System.out.println("请求参数"+params);
             if(result.equalsIgnoreCase("false")) {
                 return null;
             }else {

src/com/mes/ui/MultiStationClient.java

@@ -280,4 +280,4 @@ public class MultiStationClient extends JFrame {
             }
         }
     }
-}
+}

src/com/mes/ui/WorkStationPanel.java

@@ -84,14 +84,14 @@ public class WorkStationPanel extends JPanel {
         productSnField = new JTextField();
         productSnField.setHorizontalAlignment(SwingConstants.CENTER);
         productSnField.setEditable(false);
-        productSnField.setFont(new Font("微软雅黑", Font.BOLD, 28));
+        productSnField.setFont(new Font("微软雅黑", Font.BOLD, 15));
         productSnField.setBorder(BorderFactory.createLineBorder(Color.BLACK, 1));
         productSnField.setColumns(18);
-        productSnField.setPreferredSize(new Dimension(150, 70));
+        productSnField.setPreferredSize(new Dimension(150, 35));
         scanButton = new JButton("扫码");
         scanButton.setIcon(new ImageIcon(getClass().getResource("/bg/scan_barcode.png")));
-        scanButton.setFont(new Font("微软雅黑", Font.BOLD, 40));
-        scanButton.setPreferredSize(new Dimension(200, 70));
+        scanButton.setFont(new Font("微软雅黑", Font.BOLD, 15));
+        scanButton.setPreferredSize(new Dimension(110, 35));
         scanButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -141,8 +141,8 @@ public class WorkStationPanel extends JPanel {
         buttonPanel.setBackground(Color.WHITE);
         finishOkButton = new JButton("OK");
         finishOkButton.setIcon(new ImageIcon(getClass().getResource("/bg/ok_bg.png")));
-        finishOkButton.setFont(new Font("微软雅黑", Font.PLAIN, 50));
-        finishOkButton.setPreferredSize(new Dimension(300, 120));
+        finishOkButton.setFont(new Font("微软雅黑", Font.PLAIN, 25));
+        finishOkButton.setPreferredSize(new Dimension(150, 60));
         finishOkButton.setEnabled(false);
         finishOkButton.addActionListener(new ActionListener() {
             @Override
@@ -152,10 +152,10 @@ public class WorkStationPanel extends JPanel {
         });
         buttonPanel.add(finishOkButton);
 
+        // 按钮改为刷新
         finishNgButton = new JButton("刷新");
-        finishNgButton.setIcon(new ImageIcon(getClass().getResource("/bg/ng_bg.png")));
-        finishNgButton.setFont(new Font("微软雅黑", Font.PLAIN, 50));
-        finishNgButton.setPreferredSize(new Dimension(300, 120));
+        finishNgButton.setFont(new Font("微软雅黑", Font.PLAIN, 25));
+        finishNgButton.setPreferredSize(new Dimension(150, 60));
         finishNgButton.setEnabled(true);
         finishNgButton.addActionListener(new ActionListener() {
             @Override
@@ -271,7 +271,6 @@ public class WorkStationPanel extends JPanel {
         checkQualityResult = false;
         productSnField.setText("");
         finishOkButton.setEnabled(false);
-        finishNgButton.setEnabled(false);
         fxLabel.setVisible(false);
     }
 
@@ -375,4 +374,4 @@ public class WorkStationPanel extends JPanel {
         
         dialog.setVisible(true);
     }
-}
+}

src/resources/config/config.properties

@@ -1,7 +1,7 @@
 # 产线配置
 mes.line_sn=HEVXT
-mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.21.99
+#mes.server_ip=127.0.0.1
+mes.server_ip=192.168.9.180
 
 # 工位列表（支持多个工位，逗号分隔）
 mes.stations=OP050A,OP060A,OP070A,OP080A,OP090A,OP160A