修改

src/com/mes/component/PlcSignalMonitor02.java

@@ -9,7 +9,7 @@ import java.awt.*;
 
 /**
  * PLC信号监控组件02
- * 精简版监控面板，仅显示请求扫码、扫码完成、中转车上料到设备三个核心状态
+ * 扫码枪监控面板，仅显示请求扫码(.0.0)、MES扫码反馈(.0.5)两个核心状态
  */
 public class PlcSignalMonitor02 {
 
@@ -23,7 +23,6 @@ public class PlcSignalMonitor02 {
     // 核心信号标签（用于对话框中的实时更新）
     private JLabel signal_requestScan;
     private JLabel signal_scanComplete;
-    private JLabel signal_transferToDevice;
 
     /**
      * 构造函数
@@ -104,11 +103,10 @@ public class PlcSignalMonitor02 {
      * 创建信号详情面板
      */
     private JPanel createSignalDetailPanel() {
-        // 注意：这里的地址和方向（.0.0 / .0.1 / .1.1 等）请根据你实际的 PLC 变量表进行修改
+        // 扫码枪点位（DB7006/DB7010一致）：.0.0 请求扫码，.0.5 MES扫码反馈
         String[][] signals = {
                 {"请求扫码", plcDb + ".0.0", "PLC→MES"},
-                {"扫码完成", plcDb + ".0.1", "MES→PLC"},
-                {"中转车上料到设备", plcDb + ".0.2", "PLC→MES"}
+                {"MES扫码反馈", plcDb + ".0.5", "MES→PLC"}
         };
 
         JPanel panel = new JPanel(new GridLayout(signals.length + 1, 4, 5, 5));
@@ -123,12 +121,10 @@ public class PlcSignalMonitor02 {
         // 初始化核心信号标签
         signal_requestScan = createStatusLabel();
         signal_scanComplete = createStatusLabel();
-        signal_transferToDevice = createStatusLabel();
 
         JLabel[] statusLabels = {
                 signal_requestScan,
-                signal_scanComplete,
-                signal_transferToDevice
+                signal_scanComplete
         };
 
         // 添加信号行
@@ -175,14 +171,12 @@ public class PlcSignalMonitor02 {
 
             // 读取核心信号 (注意地址要和 createSignalDetailPanel 中保持一致)
             boolean requestScan = s7PLC.readBoolean(plcDb + ".0.0");
-            boolean scanComplete = s7PLC.readBoolean(plcDb + ".0.1");
-            boolean transferToDevice = s7PLC.readBoolean(plcDb + ".1.1");
+            boolean scanComplete = s7PLC.readBoolean(plcDb + ".0.5");
 
             // 在EDT线程中更新UI
             SwingUtilities.invokeLater(() -> {
                 updateStatusLabel(signal_requestScan, requestScan);
                 updateStatusLabel(signal_scanComplete, scanComplete);
-                updateStatusLabel(signal_transferToDevice, transferToDevice);
             });
 
         } catch (Exception e) {
@@ -203,8 +197,7 @@ public class PlcSignalMonitor02 {
     private void showConnectionError() {
         JLabel[] labels = {
                 signal_requestScan,
-                signal_scanComplete,
-                signal_transferToDevice
+                signal_scanComplete
         };
 
         for (JLabel label : labels) {

src/com/mes/component/WorkJPanel70Xh.java

@@ -78,21 +78,18 @@ public class WorkJPanel70Xh extends JPanel {
 
     public String plcDb2 = "DB7010";
 
-    // 扫码信号地址（反面OP080沿用DB7010原有地址；正面OP070复用原OP060设备面板的DB7000地址）
-    public String addrScanFeeding = plcDb2 + ".0.0";      // 请求扫码
-    public String addrScanFinish = plcDb2 + ".0.1";       // 扫码完成/MES允许上料反馈
-    public String addrTransferToDevice = plcDb2 + ".0.2"; // 中转车上料到设备
-    public String addrTransferNo = plcDb2 + ".2.0";       // 中转车号
-    public String addrTransferFloor = plcDb2 + ".4.0";    // 中转车层数
-
-    // 正面换型台第二路扫码请求（封板正面FSW2=DB7004，鑫政自动线PLC点位说明_MES_20261010新增设备）
-    public String addrScanFeeding2 = "";
+    // 扫码信号地址（反面OP080沿用DB7010原有地址；正面OP070使用扫码枪独立块DB7006）
+    public String addrScanFeeding = plcDb2 + ".0.0";      // 请求扫码（PLC→MES）
+    public String addrScanFinish = plcDb2 + ".0.5";       // MES扫码反馈（MES→PLC）
+    public String addrTransferToDevice = plcDb2 + ".0.2"; // 中转车上料到设备（中转车已取消，不再读取）
+    public String addrTransferNo = plcDb2 + ".2.0";       // 中转车号（不再读取）
+    public String addrTransferFloor = plcDb2 + ".4.0";    // 中转车层数（不再读取）
 
     // 扫码枪通道：1/3=正面（原OP060），2/4=反面（原OP070）
     public int scanWest = 2;
     public int scanEast = 4;
 
-    // 是否由本面板写扫码完成反馈位（正面OP070的反馈位即DB7000.0.4 MES允许上料，由设备面板自行管理，此处不写）
+    // 是否由本面板写扫码反馈位（正面DB7006.0.5、反面DB7010.0.5均由本面板写）
     public boolean ownsScanFeedback = true;
 
     public String preSn = ""; // 扫码内容
@@ -143,17 +140,15 @@ public class WorkJPanel70Xh extends JPanel {
         this.setBackground(Color.WHITE);
         this.pos = position;
 
-        if("OP070".equals(oprno)){ // 正面换型台：复用原OP060设备面板的DB7000扫码信号，扫码枪用1/3通道
-            plcDb = "DB7000";
-            addrScanFeeding = plcDb + ".0.0";      // 原OP060：请求上料/扫码（正面FSW1）
-            addrScanFeeding2 = "DB7004" + ".0.0";  // 封板正面FSW2：请求上料/扫码（新增设备）
-            addrScanFinish = plcDb + ".0.4";       // 原OP060：MES允许上料
-            addrTransferToDevice = plcDb + ".1.1"; // 原OP060：中转车上料到设备
+        if("OP070".equals(oprno)){ // 正面换型台：扫码枪DB7006，点位与反面DB7010一致，扫码枪用1/3通道
+            plcDb = "DB7006";
+            addrScanFeeding = plcDb + ".0.0";      // 请求扫码
+            addrScanFinish = plcDb + ".0.5";       // MES扫码反馈
+            addrTransferToDevice = plcDb + ".1.1"; // 中转车（不再读取）
             addrTransferNo = plcDb + ".2.0";
             addrTransferFloor = plcDb + ".4.0";
             scanWest = 1;
             scanEast = 3;
-            ownsScanFeedback = false; // DB7000.0.4 由WorkJPanelOP60按质检结果写入（FSW2的DB7004.0.4同理由其面板写入）
         }
 
         cacheName = "cache_scan_"+oprno+pos;
@@ -194,8 +189,8 @@ public class WorkJPanel70Xh extends JPanel {
         }else if(pos.equals("F")) {
             plcDb = "DB7004";
         }
-        if("OP070".equals(oprno)){ // 正面换型台保持DB7000，不被position覆盖
-            plcDb = "DB7000";
+        if("OP070".equals(oprno)){ // 正面换型台保持DB7006，不被position覆盖
+            plcDb = "DB7006";
         }
 
         JLabel oprnoLabel = new JLabel(oprno);
@@ -291,18 +286,19 @@ public class WorkJPanel70Xh 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("请求扫码");
+        // 信号灯布局：请求扫码 | MES扫码反馈 同一行，名称后显示PLC点位
+        feedinglabel = new JLabel(withAddr("请求扫码", addrScanFeeding));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
-        feedinglabel.setBounds(0, 150, workWidth/3, 30);
+        feedinglabel.setBounds(0, 145, workWidth/2, 27);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES扫码反馈");
+        feedingmeslabel = new JLabel(withAddr("MES扫码反馈", addrScanFinish));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);
-        feedingmeslabel.setBounds(workWidth/3, 150, workWidth/3, 30);
+        feedingmeslabel.setBounds(workWidth/2, 145, workWidth/2, 27);
         feedingmeslabel.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
                 boolean ret = readScanFinish();
@@ -314,13 +310,6 @@ public class WorkJPanel70Xh extends JPanel {
         });
         this.add(feedingmeslabel);
 
-        transfertodevicelabel = new JLabel("中转车上料到设备");
-        transfertodevicelabel.setHorizontalAlignment(SwingConstants.LEFT);
-        transfertodevicelabel.setIcon(imageGreen);
-        transfertodevicelabel.setForeground(Color.BLACK);
-        transfertodevicelabel.setBounds(workWidth*2/3, 150, workWidth/3, 30);
-        this.add(transfertodevicelabel);
-
         // 手动输入行（占用原加工行位置，该行在换型台未使用）
         manualLabel = new JLabel("手动");
         manualLabel.setHorizontalAlignment(SwingConstants.CENTER);
@@ -350,8 +339,9 @@ public class WorkJPanel70Xh extends JPanel {
 
 //        resetScanA();
 
-        // 信号监控按钮
-        signalMonitor = new PlcSignalMonitor02(s7PLC, plcDb, oprno + pos, MesClient.mesClientFrame);
+        // 信号监控按钮：监控扫码枪块（正面OP070=DB7006，反面OP080=DB7010），不再挂设备块
+        String monitorDb = "OP070".equals(oprno) ? plcDb : plcDb2;
+        signalMonitor = new PlcSignalMonitor02(s7PLC, monitorDb, oprno + pos, MesClient.mesClientFrame);
         signalBtn = signalMonitor.createSignalButton();
         signalBtn.setBounds(workWidth*2/3 + 63, 230, 90, 26);
         this.add(signalBtn);
@@ -430,17 +420,11 @@ public class WorkJPanel70Xh extends JPanel {
                         Boolean retFeeding = readScanFeeding();
                         feedinglabel.setIcon(retFeeding?imageGreen:imageGray);
 
-                        transferToDevice = readFeedingTransferToDevice();
-                        transfertodevicelabel.setIcon(transferToDevice?imageGreen:imageGray);
-
                         Boolean retFeedingAllow = readScanFinish();
                         feedingmeslabel.setIcon(retFeedingAllow?imageGreen:imageGray);
 
-                        //真扫码（正面换型台同时监听FSW1 DB7000.0.0与FSW2 DB7004.0.0两路请求，任一请求即扫码）
-                        Boolean retScanFeeding = readScanFeeding() || readScanFeeding2();
-                        if(retScanFeeding){
-                            transferSn = readTransferNo();
-                            transferFloor = readTransferFloor();
+                        //真扫码（中转车已取消，transferToDevice恒为false，固定走扫码枪）
+                        if(retFeeding){
                             barCode2();
                         }else{
                             zzflag = 0;
@@ -615,14 +599,6 @@ public class WorkJPanel70Xh extends JPanel {
         }
     }
 
-    // 请求扫码（第二路，正面FSW2；未配置地址时恒为false）
-    public boolean readScanFeeding2(){
-        if(isLocal == 1 || addrScanFeeding2 == null || addrScanFeeding2.isEmpty()){
-            return false;
-        }else{
-            return readBoolean(addrScanFeeding2);  //扫码请求
-        }
-    }
     // 扫码完成
     public boolean readScanFinish(){
         if(isLocal == 1){
@@ -668,6 +644,11 @@ public class WorkJPanel70Xh extends JPanel {
         }
     }
 
+    // 信号灯文字：名称(点位)
+    private String withAddr(String name, String addr){
+        return name + "(" + addr + ")";
+    }
+
     // 控制扫码枪读取二维码
     public String readQrcode(){
         String sn = "";

src/com/mes/component/WorkJPanelOP60.java

@@ -244,18 +244,19 @@ public class WorkJPanelOP60 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("请求扫码");
+        // 信号灯布局：2列×4行，名称后显示PLC点位
+        feedinglabel = new JLabel(withAddr("请求扫码", plcDb+".0.0"));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
-        feedinglabel.setBounds(0, 150, workWidth/3, 30);
+        feedinglabel.setBounds(0, 145, workWidth/2, 27);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES扫码反馈");
+        feedingmeslabel = new JLabel(withAddr("MES扫码反馈", plcDb+".0.4"));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);
-        feedingmeslabel.setBounds(workWidth/3, 150, workWidth/3, 30);
+        feedingmeslabel.setBounds(workWidth/2, 145, workWidth/2, 27);
         feedingmeslabel.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
                 boolean ret = readAllowFeeding();
@@ -267,25 +268,25 @@ public class WorkJPanelOP60 extends JPanel {
         });
         this.add(feedingmeslabel);
 
-        runlabel = new JLabel("设备运行中");
+        runlabel = new JLabel(withAddr("设备运行中", plcDb+".0.2"));
         runlabel.setHorizontalAlignment(SwingConstants.LEFT);
         runlabel.setIcon(imageGreen);
         runlabel.setForeground(Color.BLACK);
-        runlabel.setBounds(workWidth*2/3, 150, workWidth/3, 30);
+        runlabel.setBounds(0, 199, workWidth/2, 27);
         this.add(runlabel);
 
-        blankinglabel = new JLabel("下料请求");
+        blankinglabel = new JLabel(withAddr("下料请求", plcDb+".0.1"));
         blankinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankinglabel.setIcon(imageGreen);
         blankinglabel.setForeground(Color.BLACK);
-        blankinglabel.setBounds(0, 190, workWidth/3, 30);
+        blankinglabel.setBounds(0, 172, workWidth/2, 27);
         this.add(blankinglabel);
 
-        blankingmeslabel = new JLabel("MES下料反馈");
+        blankingmeslabel = new JLabel(withAddr("MES下料反馈", plcDb+".0.5"));
         blankingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankingmeslabel.setIcon(imageGreen);
         blankingmeslabel.setForeground(Color.BLACK);
-        blankingmeslabel.setBounds(workWidth/3, 190, workWidth/3, 30);
+        blankingmeslabel.setBounds(workWidth/2, 172, workWidth/2, 27);
         this.add(blankingmeslabel);
         blankingmeslabel.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
@@ -297,25 +298,25 @@ public class WorkJPanelOP60 extends JPanel {
             }
         });
 
-        feedingtodevicelabel = new JLabel("上料到设备");
+        feedingtodevicelabel = new JLabel(withAddr("上料到设备", plcDb+".0.7"));
         feedingtodevicelabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingtodevicelabel.setIcon(imageGreen);
         feedingtodevicelabel.setForeground(Color.BLACK);
-        feedingtodevicelabel.setBounds(workWidth*2/3, 190, workWidth/3, 30);
+        feedingtodevicelabel.setBounds(workWidth/2, 199, workWidth/2, 27);
         this.add(feedingtodevicelabel);
 
-        feedingtotransferlabel = new JLabel("上料到中转车");
+        feedingtotransferlabel = new JLabel(withAddr("上料到中转车", plcDb+".1.0"));
         feedingtotransferlabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingtotransferlabel.setIcon(imageGreen);
         feedingtotransferlabel.setForeground(Color.BLACK);
-        feedingtotransferlabel.setBounds(0, 230, workWidth/3, 30);
+        feedingtotransferlabel.setBounds(0, 226, workWidth/2, 27);
         this.add(feedingtotransferlabel);
 
-        transfertodevicelabel = new JLabel("中转车上料到设备");
+        transfertodevicelabel = new JLabel(withAddr("中转车上料到设备", plcDb+".1.1"));
         transfertodevicelabel.setHorizontalAlignment(SwingConstants.LEFT);
         transfertodevicelabel.setIcon(imageGreen);
         transfertodevicelabel.setForeground(Color.BLACK);
-        transfertodevicelabel.setBounds(workWidth/3, 230, workWidth/3, 30);
+        transfertodevicelabel.setBounds(workWidth/2, 226, workWidth/2, 27);
         this.add(transfertodevicelabel);
 
 
@@ -327,7 +328,7 @@ public class WorkJPanelOP60 extends JPanel {
         // 信号监控按钮
         signalMonitor = new PlcSignalMonitor(s7PLC, plcDb, oprno + pos, MesClient.mesClientFrame);
         signalBtn = signalMonitor.createSignalButton();
-        signalBtn.setBounds(workWidth*2/3 + 63, 230, 90, 26);
+        signalBtn.setBounds(workWidth*2/3 + 63, 255, 90, 26); // 信号灯改为4行后下移
         this.add(signalBtn);
 
 
@@ -766,6 +767,11 @@ public class WorkJPanelOP60 extends JPanel {
         }
     }
 
+    // 信号灯文字：名称(点位)
+    private String withAddr(String name, String addr){
+        return name + "(" + addr + ")";
+    }
+
     // 控制扫码枪读取二维码
     public String readQrcode(){
         // 产线改造：扫码按OP070方式，由正面换型台（WorkJPanel70Xh OP070实例）集中扫码，设备面板直接取码

src/com/mes/component/WorkJPanelOP70.java

@@ -258,18 +258,19 @@ public class WorkJPanelOP70 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("请求扫码");
+        // 信号灯布局：2列×4行，名称后显示PLC点位
+        feedinglabel = new JLabel(withAddr("请求扫码", plcDb+".0.0"));
         feedinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedinglabel.setIcon(imageGreen);
         feedinglabel.setForeground(Color.BLACK);
-        feedinglabel.setBounds(0, 150, workWidth/3, 30);
+        feedinglabel.setBounds(0, 145, workWidth/2, 27);
         this.add(feedinglabel);
 
-        feedingmeslabel = new JLabel("MES扫码反馈");
+        feedingmeslabel = new JLabel(withAddr("MES扫码反馈", plcDb+".0.4"));
         feedingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingmeslabel.setIcon(imageGreen);
         feedingmeslabel.setForeground(Color.BLACK);
-        feedingmeslabel.setBounds(workWidth/3, 150, workWidth/3, 30);
+        feedingmeslabel.setBounds(workWidth/2, 145, workWidth/2, 27);
         feedingmeslabel.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
                 boolean ret = readAllowFeeding();
@@ -281,25 +282,25 @@ public class WorkJPanelOP70 extends JPanel {
         });
         this.add(feedingmeslabel);
 
-        runlabel = new JLabel("设备运行中");
+        runlabel = new JLabel(withAddr("设备运行中", plcDb+".0.2"));
         runlabel.setHorizontalAlignment(SwingConstants.LEFT);
         runlabel.setIcon(imageGreen);
         runlabel.setForeground(Color.BLACK);
-        runlabel.setBounds(workWidth*2/3, 150, workWidth/3, 30);
+        runlabel.setBounds(0, 199, workWidth/2, 27);
         this.add(runlabel);
 
-        blankinglabel = new JLabel("下料请求");
+        blankinglabel = new JLabel(withAddr("下料请求", plcDb+".0.1"));
         blankinglabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankinglabel.setIcon(imageGreen);
         blankinglabel.setForeground(Color.BLACK);
-        blankinglabel.setBounds(0, 190, workWidth/3, 30);
+        blankinglabel.setBounds(0, 172, workWidth/2, 27);
         this.add(blankinglabel);
 
-        blankingmeslabel = new JLabel("MES下料反馈");
+        blankingmeslabel = new JLabel(withAddr("MES下料反馈", plcDb+".0.5"));
         blankingmeslabel.setHorizontalAlignment(SwingConstants.LEFT);
         blankingmeslabel.setIcon(imageGreen);
         blankingmeslabel.setForeground(Color.BLACK);
-        blankingmeslabel.setBounds(workWidth/3, 190, workWidth/3, 30);
+        blankingmeslabel.setBounds(workWidth/2, 172, workWidth/2, 27);
         this.add(blankingmeslabel);
         blankingmeslabel.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
@@ -311,25 +312,25 @@ public class WorkJPanelOP70 extends JPanel {
             }
         });
 
-        feedingtodevicelabel = new JLabel("上料到设备");
+        feedingtodevicelabel = new JLabel(withAddr("上料到设备", plcDb+".0.7"));
         feedingtodevicelabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingtodevicelabel.setIcon(imageGreen);
         feedingtodevicelabel.setForeground(Color.BLACK);
-        feedingtodevicelabel.setBounds(workWidth*2/3, 190, workWidth/3, 30);
+        feedingtodevicelabel.setBounds(workWidth/2, 199, workWidth/2, 27);
         this.add(feedingtodevicelabel);
 
-        feedingtotransferlabel = new JLabel("上料到中转车");
+        feedingtotransferlabel = new JLabel(withAddr("上料到中转车", plcDb+".1.0"));
         feedingtotransferlabel.setHorizontalAlignment(SwingConstants.LEFT);
         feedingtotransferlabel.setIcon(imageGreen);
         feedingtotransferlabel.setForeground(Color.BLACK);
-        feedingtotransferlabel.setBounds(0, 230, workWidth/3, 30);
+        feedingtotransferlabel.setBounds(0, 226, workWidth/2, 27);
         this.add(feedingtotransferlabel);
 
-        transfertodevicelabel = new JLabel("中转车上料到设备");
+        transfertodevicelabel = new JLabel(withAddr("中转车上料到设备", plcDb+".1.1"));
         transfertodevicelabel.setHorizontalAlignment(SwingConstants.LEFT);
         transfertodevicelabel.setIcon(imageGreen);
         transfertodevicelabel.setForeground(Color.BLACK);
-        transfertodevicelabel.setBounds(workWidth/3, 230, workWidth/3, 30);
+        transfertodevicelabel.setBounds(workWidth/2, 226, workWidth/2, 27);
         this.add(transfertodevicelabel);
 
         formatElementUI();
@@ -340,7 +341,7 @@ public class WorkJPanelOP70 extends JPanel {
         // 信号监控按钮
         signalMonitor = new PlcSignalMonitor(s7PLC, plcDb, oprno + pos, MesClient.mesClientFrame);
         signalBtn = signalMonitor.createSignalButton();
-        signalBtn.setBounds(workWidth*2/3 + 63, 230, 90, 26);
+        signalBtn.setBounds(workWidth*2/3 + 63, 255, 90, 26); // 信号灯改为4行后下移
         this.add(signalBtn);
 
 
@@ -807,6 +808,11 @@ public class WorkJPanelOP70 extends JPanel {
         }
     }
 
+    // 信号灯文字：名称(点位)
+    private String withAddr(String name, String addr){
+        return name + "(" + addr + ")";
+    }
+
     // 控制扫码枪读取二维码
     public String readQrcode(){
 //        String sn = "5001040043561010006";

src/com/mes/ui/MesClient.java

@@ -461,7 +461,7 @@ public class MesClient extends JFrame {
             JPanel indexPanel70D = new JPanel();
             indexPanel70D.setLayout(null);
             indexPanel70D.setBackground(Color.WHITE);
-            workJPanel70Xh = new WorkJPanel70Xh("A"); // 反面换型台心跳/监控挂反面FSW1（DB7002），避免与正面FSW2的DB7004冲突
+            workJPanel70Xh = new WorkJPanel70Xh("A"); // 反面换型台扫码枪DB7010，PLC信号按钮监控DB7010
             workJPanel70Xh.setBounds(10, 10, workJPanel70Xh.workWidth, workJPanel70Xh.workHeight);
             indexPanel70D.add(workJPanel70Xh);
             indexPanelD.add(indexPanel70D);
@@ -489,7 +489,7 @@ public class MesClient extends JFrame {
             JPanel indexPanel70D = new JPanel();
             indexPanel70D.setLayout(null);
             indexPanel70D.setBackground(Color.WHITE);
-            workJPanel70Xh = new WorkJPanel70Xh("A"); // 反面换型台心跳/监控挂反面FSW1（DB7002），避免与正面FSW2的DB7004冲突
+            workJPanel70Xh = new WorkJPanel70Xh("A"); // 反面换型台扫码枪DB7010，PLC信号按钮监控DB7010
             workJPanel70Xh.setBounds(10, 10, workJPanel70Xh.workWidth, workJPanel70Xh.workHeight);
             indexPanel70D.add(workJPanel70Xh);
             indexPanelD.add(indexPanel70D);