src/com/mes/ui/LoginFarme.java

@@ -10,6 +10,8 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.time.LocalDateTime;
 
 public class LoginFarme extends JFrame {
@@ -25,7 +27,15 @@ public class LoginFarme extends JFrame {
         setTitle("MES系统客户端："+MesClient.mes_gw+" - "+MesClient.mes_gw_des);
 
         ImageIcon bg = new ImageIcon(MesClient.class.getResource("/background.png"));
-        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                if (MesClient.confirmClose(LoginFarme.this)) {
+                    System.exit(0);
+                }
+            }
+        });
         JLabel imgLabel = new JLabel(bg);//将背景图放在标签里。
         getLayeredPane().add(imgLabel, new Integer(Integer.MIN_VALUE));//注意这里是关键，将背景标签添加到jfram的LayeredPane面板里。
         imgLabel.setBounds(0,0,bg.getIconWidth(), bg.getIconHeight());//设置背景标签的位置

src/com/mes/ui/MesClient.java

@@ -24,6 +24,8 @@ import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -584,10 +586,23 @@ public class MesClient extends JFrame {
         connect_request_flag = false;
     }
 
+    public static boolean confirmClose(Component parent) {
+        return JOptionPane.showConfirmDialog(parent, "确定要关闭MES系统客户端吗？", "确认关闭",
+                JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION;
+    }
+
     public MesClient() {
         setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
         setTitle("MES系统客户端："+mes_gw + "- " + mes_gw_des);
-        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                if (confirmClose(MesClient.this)) {
+                    System.exit(0);
+                }
+            }
+        });
         setBounds(0, 0, 1024, 768);
         
         // 确保标题栏正确显示
@@ -741,8 +756,13 @@ public class MesClient extends JFrame {
         laser_reset_bt = new JButton("复位");
         laser_reset_bt.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                laserFlowManager.manualReset();
-                resetManualSubmitPanel(true);
+                int result = JOptionPane.showConfirmDialog(MesClient.this,
+                        "复位会取消当前镭雕流程，确定要继续吗？", "确认复位",
+                        JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+                if (result == JOptionPane.YES_OPTION) {
+                    laserFlowManager.manualReset();
+                    resetManualSubmitPanel(true);
+                }
             }
         });
         laser_reset_bt.setFont(new Font("微软雅黑", Font.PLAIN, 24));