名称修改

src/com/mes/ui/MultiStationClient.java

@@ -10,8 +10,6 @@ import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.IOException;
@@ -19,8 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.mes.ui.MesClient.mes_server_ip;
-import static com.mes.ui.MesClient.resetScanA;
 import static com.mes.ui.WorkStationPanel.*;
 
 public class MultiStationClient extends JFrame {
@@ -119,90 +115,6 @@ public class MultiStationClient extends JFrame {
         settingMenu.setIcon(new ImageIcon(getClass().getResource("/bg/menu_setting.png")));
         settingMenu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
         menuBar.add(settingMenu);
-        JMenuItem resetTcpMenu_1 = new JMenuItem("刷新OP050A工件");
-        resetTcpMenu_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
-        resetTcpMenu_1.setFont(new Font("微软雅黑", Font.PLAIN, 20));
-        resetTcpMenu_1.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                super.mouseClicked(e);
-                if (!MultiStationClient.mainFrame.stationPanels.isEmpty()) {
-                    MultiStationClient.mainFrame.stationPanels.get(0).resetScanA();
-                }
-            }
-        });
-        settingMenu.add(resetTcpMenu_1);
-
-        JMenuItem resetTcpMenu_2 = new JMenuItem("刷新OP060A工件");
-        resetTcpMenu_2.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
-        resetTcpMenu_2.setFont(new Font("微软雅黑", Font.PLAIN, 20));
-        resetTcpMenu_2.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                super.mouseClicked(e);
-                if (!MultiStationClient.mainFrame.stationPanels.isEmpty()) {
-                    MultiStationClient.mainFrame.stationPanels.get(1).resetScanA();
-                }
-            }
-        });
-        settingMenu.add(resetTcpMenu_2);
-
-        JMenuItem resetTcpMenu_3 = new JMenuItem("刷新OP070A工件");
-        resetTcpMenu_3.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
-        resetTcpMenu_3.setFont(new Font("微软雅黑", Font.PLAIN, 20));
-        resetTcpMenu_3.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                super.mouseClicked(e);
-                if (!MultiStationClient.mainFrame.stationPanels.isEmpty()) {
-                    MultiStationClient.mainFrame.stationPanels.get(2).resetScanA();
-                }
-            }
-        });
-        settingMenu.add(resetTcpMenu_3);
-
-        JMenuItem resetTcpMenu_4 = new JMenuItem("刷新OP080A工件");
-        resetTcpMenu_4.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
-        resetTcpMenu_4.setFont(new Font("微软雅黑", Font.PLAIN, 20));
-        resetTcpMenu_4.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                super.mouseClicked(e);
-                if (!MultiStationClient.mainFrame.stationPanels.isEmpty()) {
-                    MultiStationClient.mainFrame.stationPanels.get(3).resetScanA();
-                }
-            }
-        });
-        settingMenu.add(resetTcpMenu_4);
-
-        JMenuItem resetTcpMenu_5 = new JMenuItem("刷新OP090A工件");
-        resetTcpMenu_5.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
-        resetTcpMenu_5.setFont(new Font("微软雅黑", Font.PLAIN, 20));
-        resetTcpMenu_5.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                super.mouseClicked(e);
-                if (!MultiStationClient.mainFrame.stationPanels.isEmpty()) {
-                    MultiStationClient.mainFrame.stationPanels.get(4).resetScanA();
-                }
-            }
-        });
-        settingMenu.add(resetTcpMenu_5);
-
-        JMenuItem resetTcpMenu_6 = new JMenuItem("刷新OP160A工件");
-        resetTcpMenu_6.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
-        resetTcpMenu_6.setFont(new Font("微软雅黑", Font.PLAIN, 20));
-        resetTcpMenu_6.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                super.mouseClicked(e);
-                if (!MultiStationClient.mainFrame.stationPanels.isEmpty()) {
-                    MultiStationClient.mainFrame.stationPanels.get(5).resetScanA();
-                }
-            }
-        });
-        settingMenu.add(resetTcpMenu_6);
-        
         JToolBar toolBar = new JToolBar();
         toolBar.setFloatable(false);
         
@@ -257,6 +169,7 @@ public class MultiStationClient extends JFrame {
                 WorkStationPanel panel = new WorkStationPanel(config);
                 stationPanels.add(panel);
                 mainPanel.add(panel);
+                addResetMenuItem(settingMenu, panel, config);
             }
             
             tabbedPane.addTab("工作面板",new ImageIcon(MesClient.class.getResource("/bg/a_side.png")), new JScrollPane(mainPanel));
@@ -286,4 +199,12 @@ public class MultiStationClient extends JFrame {
             }
         }
     }
+
+    private void addResetMenuItem(JMenu settingMenu, WorkStationPanel panel, StationConfig config) {
+        JMenuItem resetMenu = new JMenuItem("刷新" + config.getGw() + "工件");
+        resetMenu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
+        resetMenu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        resetMenu.addActionListener(e -> panel.resetScanA());
+        settingMenu.add(resetMenu);
+    }
 }

src/resources/config/config.properties

@@ -145,7 +145,7 @@ mes.station.OP160A.robot2.voltage=D7012
  #  OP140A -> PLC OP100 \uFF08Q26UDV_CPU 192.168.0.35\uFF0C4\u53F7\u7AD92\u53F7\u5DE5\u4F4D\uFF09
  #  OP150A -> PLC OP110 \uFF08Q26UDV_CPU 192.168.0.35\uFF0C5\u53F7\u7AD92\u53F7\u5DE5\u4F4D\uFF09
  #\u540C\u4E00\u4E2A\u7AD9\u7684 1\u53F7/2\u53F7\u5DE5\u4F4D\u9664\u5141\u8BB8\u542F\u52A8\u3001\u5141\u8BB8\u4E0B\u6599\u3001\u5F00\u59CB\u52A0\u5DE5\u3001\u52A0\u5DE5\u7ED3\u675F\u3001\u6545\u969C\u5916\uFF0C\u5176\u4F59\u710A\u70B9\u548C\u53C2\u6570\u70B9\u5171\u7528\u3002
-mes.station.OP100A.name=FX5U 1\u53F7\u7AD92\u53F7\u5DE5\u4F4D\u710A\u70B9\u4FE1\u53F7
+mes.station.OP100A.name=\u7535\u6C60\u58F3\u5206\u603B\u62102\u70B9\u710A\u8865\u710A
 mes.station.OP100A.allowStart=M6011
 mes.station.OP100A.allowDown=M6012
 mes.station.OP100A.startMethod=M6013
@@ -167,7 +167,7 @@ mes.station.OP100A.robot2.current=D6012
 mes.station.OP100A.robot1.time=D6003
 mes.station.OP100A.robot2.time=D6013
 
-mes.station.OP110A.name=1\u53F7\u7AD92\u53F7\u5DE5\u4F4D\u710A\u70B9\u4FE1\u53F7
+mes.station.OP110A.name=\u7535\u6C60\u58F3\u5206\u603B\u62103\u70B9\u710A
 mes.station.OP110A.allowStart=M6611
 mes.station.OP110A.allowDown=M6612
 mes.station.OP110A.startMethod=M6613
@@ -189,7 +189,7 @@ mes.station.OP110A.robot2.current=D7061
 mes.station.OP110A.robot1.time=D7052
 mes.station.OP110A.robot2.time=D7062
 
-mes.station.OP120A.name=2\u53F7\u7AD92\u53F7\u5DE5\u4F4D\u710A\u70B9\u4FE1\u53F7
+mes.station.OP120A.name=\u7535\u6C60\u58F3\u5206\u603B\u62104\u70B9\u710A
 mes.station.OP120A.allowStart=M6631
 mes.station.OP120A.allowDown=M6632
 mes.station.OP120A.startMethod=M6633
@@ -211,7 +211,7 @@ mes.station.OP120A.robot2.current=D7081
 mes.station.OP120A.robot1.time=D7072
 mes.station.OP120A.robot2.time=D7082
 
-mes.station.OP130A.name=3\u53F7\u7AD92\u53F7\u5DE5\u4F4D\u710A\u70B9\u4FE1\u53F7
+mes.station.OP130A.name=\u7535\u6C60\u58F3\u5206\u603B\u62105\u70B9\u710A\u8865\u710A
 mes.station.OP130A.allowStart=M6651
 mes.station.OP130A.allowDown=M6652
 mes.station.OP130A.startMethod=M6653
@@ -233,7 +233,7 @@ mes.station.OP130A.robot2.current=D7101
 mes.station.OP130A.robot1.time=D7092
 mes.station.OP130A.robot2.time=D7102
 
-mes.station.OP140A.name=4\u53F7\u7AD92\u53F7\u5DE5\u4F4D\u57FA\u7840\u4FE1\u53F7
+mes.station.OP140A.name=\u7535\u6C60\u58F3\u5206\u603B\u62106\u5F27\u710A
 mes.station.OP140A.allowStart=M6671
 mes.station.OP140A.allowDown=M6672
 mes.station.OP140A.startMethod=M6673
@@ -249,7 +249,7 @@ mes.station.OP140A.robot1.voltage=D7042
 mes.station.OP140A.robot2.current=D7031
 mes.station.OP140A.robot2.voltage=D7032
 
-mes.station.OP150A.name=5\u53F7\u7AD92\u53F7\u5DE5\u4F4D\u57FA\u7840\u4FE1\u53F7
+mes.station.OP150A.name=\u7535\u6C60\u58F3\u5206\u603B\u62107\u5F27\u710A
 mes.station.OP150A.allowStart=M6691
 mes.station.OP150A.allowDown=M6692
 mes.station.OP150A.startMethod=M6693