优化

src/com/mes/component/WorkJPanelOP10.java

@@ -201,14 +201,16 @@ public class WorkJPanelOP10 extends JPanel {
         resetBtn.setBounds(this.workWidth - 150, 130, 150, 60);
         this.add(resetBtn);
 
-        feedinglabel = new JLabel("请求镭雕码");
+        feedinglabel = new JLabel("请求镭雕码(" + plcDb + ".0.0)");
+        feedinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
         feedinglabel.setBounds(0, 220, workWidth/5, 30);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES镭雕码反馈");
+        feedingmeslabel = new JLabel("MES镭雕码反馈(" + plcDb + ".0.3)");
+        feedingmeslabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);
@@ -224,21 +226,24 @@ public class WorkJPanelOP10 extends JPanel {
         });
         this.add(feedingmeslabel);
 
-        runlabel = new JLabel("设备运行中");
+        runlabel = new JLabel("设备运行中(" + plcDb + ".0.1)");
+        runlabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         runlabel.setHorizontalAlignment(SwingConstants.LEFT);
         runlabel.setIcon(imageGreen);
         runlabel.setForeground(Color.BLACK);
         runlabel.setBounds(workWidth*2/5, 220, workWidth/5, 30);
         this.add(runlabel);
 
-        blankinglabel = new JLabel("请求下料(DB7020.38.3)");
+        blankinglabel = new JLabel("请求下料(" + plcDb + ".38.3)");
+        blankinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         blankinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankinglabel.setIcon(imageGreen);
         blankinglabel.setForeground(Color.BLACK);
         blankinglabel.setBounds(workWidth*3/5, 220, workWidth/5, 30);
         this.add(blankinglabel);
 
-        blankingmeslabelOP10 = new JLabel("MES下料反馈(DB7020.0.5)");
+        blankingmeslabelOP10 = new JLabel("MES下料反馈(" + plcDb + ".0.5)");
+        blankingmeslabelOP10.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         blankingmeslabelOP10.setHorizontalAlignment(SwingConstants.LEFT);
         blankingmeslabelOP10.setIcon(imageGreen);
         blankingmeslabelOP10.setForeground(Color.BLACK);

src/com/mes/component/WorkJPanelOP20.java

@@ -261,14 +261,16 @@ public class WorkJPanelOP20 extends JPanel {
         imageGray = new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png"));
         imageGray.setImage(imageGray.getImage().getScaledInstance(20, 20, Image.SCALE_SMOOTH));
 
-        feedinglabel = new JLabel("请求扫码");
+        feedinglabel = new JLabel("请求扫码(" + plcDb + ".0.0)");
+        feedinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
         feedinglabel.setBounds(0, 150, workWidth/3, 30);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES扫码反馈");
+        feedingmeslabel = new JLabel("MES扫码反馈(" + plcDb + ".0.4)");
+        feedingmeslabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);
@@ -284,21 +286,24 @@ public class WorkJPanelOP20 extends JPanel {
         });
         this.add(feedingmeslabel);
 
-        runlabel = new JLabel("设备运行中");
+        runlabel = new JLabel("设备运行中(" + plcDb + ".0.2)");
+        runlabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         runlabel.setHorizontalAlignment(SwingConstants.LEFT);
         runlabel.setIcon(imageGreen);
         runlabel.setForeground(Color.BLACK);
         runlabel.setBounds(workWidth*2/3, 150, workWidth/3, 30);
         this.add(runlabel);
 
-        blankinglabel = new JLabel("下料请求");
+        blankinglabel = new JLabel("下料请求(" + plcDb + ".0.1)");
+        blankinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         blankinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankinglabel.setIcon(imageGreen);
         blankinglabel.setForeground(Color.BLACK);
         blankinglabel.setBounds(0, 190, workWidth/3, 30);
         this.add(blankinglabel);
 
-        blankingmeslabel = new JLabel("MES下料反馈");
+        blankingmeslabel = new JLabel("MES下料反馈(" + plcDb + ".0.5)");
+        blankingmeslabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         blankingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankingmeslabel.setIcon(imageGreen);
         blankingmeslabel.setForeground(Color.BLACK);

src/com/mes/component/WorkJPanelOP30.java

@@ -257,14 +257,16 @@ public class WorkJPanelOP30 extends JPanel {
         imageGray = new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png"));
         imageGray.setImage(imageGray.getImage().getScaledInstance(20, 20, Image.SCALE_SMOOTH));
 
-        feedinglabel = new JLabel("请求扫码");
+        feedinglabel = new JLabel("请求扫码(" + plcDb + ".0.0)");
+        feedinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
         feedinglabel.setBounds(0, 150, workWidth/3, 30);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES扫码反馈");
+        feedingmeslabel = new JLabel("MES扫码反馈(" + plcDb + ".0.4)");
+        feedingmeslabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);
@@ -280,21 +282,24 @@ public class WorkJPanelOP30 extends JPanel {
         });
         this.add(feedingmeslabel);
 
-        runlabel = new JLabel("设备运行中");
+        runlabel = new JLabel("设备运行中(" + plcDb + ".0.2)");
+        runlabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         runlabel.setHorizontalAlignment(SwingConstants.LEFT);
         runlabel.setIcon(imageGreen);
         runlabel.setForeground(Color.BLACK);
         runlabel.setBounds(workWidth*2/3, 150, workWidth/3, 30);
         this.add(runlabel);
 
-        blankinglabel = new JLabel("下料请求");
+        blankinglabel = new JLabel("下料请求(" + plcDb + ".0.1)");
+        blankinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         blankinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankinglabel.setIcon(imageGreen);
         blankinglabel.setForeground(Color.BLACK);
         blankinglabel.setBounds(0, 190, workWidth/3, 30);
         this.add(blankinglabel);
 
-        blankingmeslabel = new JLabel("MES下料反馈");
+        blankingmeslabel = new JLabel("MES下料反馈(" + plcDb + ".0.5)");
+        blankingmeslabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         blankingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankingmeslabel.setIcon(imageGreen);
         blankingmeslabel.setForeground(Color.BLACK);

src/com/mes/component/WorkJPanelScan.java

@@ -189,14 +189,16 @@ public class WorkJPanelScan extends JPanel {
         imageGray = new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png"));
         imageGray.setImage(imageGray.getImage().getScaledInstance(20, 20, Image.SCALE_SMOOTH));
 
-        feedinglabel = new JLabel("请求扫码");
+        feedinglabel = new JLabel("请求扫码(" + plcDb + ".0.0)");
+        feedinglabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
         feedinglabel.setBounds(0, 150, workWidth/3, 30);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES扫码反馈");
+        feedingmeslabel = new JLabel("MES扫码反馈(" + plcDb + ".0.1)");
+        feedingmeslabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);