Browse Source

换刀记录

hzd 3 days ago
parent
commit
605d23e3ed

+ 18 - 1
src/com/mes/component/WorkJPanelDevice.java

@@ -67,6 +67,8 @@ public class WorkJPanelDevice extends JPanel {
 
     public JButton toolBtn;
 
+    public JButton toolBtn2;
+
     public JButton resetFeedingBtn;
 
     public ImageIcon imageGreen;
@@ -360,8 +362,18 @@ public class WorkJPanelDevice extends JPanel {
                 }
             });
             toolBtn.setFont(new Font("微软雅黑", Font.PLAIN, 18));
-            toolBtn.setBounds(workWidth*1/2 - workWidth/8, 220*yScale, workWidth/4, 35);
+            toolBtn.setBounds(workWidth*1/2 - workWidth/4, 220*yScale, workWidth/4, 35);
             this.add(toolBtn);
+
+            toolBtn2 = new JButton("换刀记录");
+            toolBtn2.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    showReplaceDialog();
+                }
+            });
+            toolBtn2.setFont(new Font("微软雅黑", Font.PLAIN, 18));
+            toolBtn2.setBounds(workWidth*1/2, 220*yScale, workWidth/4, 35);
+            this.add(toolBtn2);
         }
 
         imageGreen = new ImageIcon(MesClient.class.getResource("/bg/green_dot.png"));
@@ -437,6 +449,11 @@ public class WorkJPanelDevice extends JPanel {
 
     }
 
+    private void showReplaceDialog() {
+        String url = "http://" + MesClient.mes_server_ip + ":8980/js/a/mes/mesProductCncReplace/ulist?ucode=" + MesClient.user_menu.getText() + "&oprno=" + oprno + pos + "&lineSn=" + MesClient.mes_line_sn;
+        new WebViewDialog(MesClient.mesClientFrame,"开班点检 - " + oprno + pos,url);
+    }
+
     private void showCheckDialog() {
         String url = "http://" + MesClient.mes_server_ip + ":8980/js/a/mes/mesProcessCheckRecord/ulist?ucode=" + MesClient.user_menu.getText() + "&oprno=" + oprno + pos + "&lineSn=" + MesClient.mes_line_sn;
         new WebViewDialog(MesClient.mesClientFrame,"开班点检 - " + oprno + pos,url);

+ 1 - 1
src/resources/config/config.properties

@@ -1,5 +1,5 @@
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.14.99
 mes.line_sn=XT
-mes.gw=OP170
+mes.gw=OP110
 mes.line_pos=west