wangxichen 6 dagen geleden
bovenliggende
commit
fb7bd03794

+ 5 - 5
src/com/mes/component/WorkJPanel70Xh.java

@@ -180,17 +180,17 @@ public class WorkJPanel70Xh extends JPanel {
             isScan = 1;
         }
 
-        // 设备DB对照(鑫政自动线PLC点位说明_MES_20261010 OP70_OP80FSW页):反面FSW1=DB7001、反面FSW2=DB7002
+        // 设备DB对照:反面FSW1=DB7002、反面FSW2=DB7003
         if(pos.equals("A")){
-            plcDb = "DB7001";
-        }else if(pos.equals("B")){
             plcDb = "DB7002";
+        }else if(pos.equals("B")){
+            plcDb = "DB7003";
         }else if(pos.equals("C")){
             plcDb = "DB7004";
         }else if(pos.equals("D")){
-            plcDb = "DB7001";
-        }else if(pos.equals("E")){
             plcDb = "DB7002";
+        }else if(pos.equals("E")){
+            plcDb = "DB7003";
         }else if(pos.equals("F")) {
             plcDb = "DB7004";
         }

+ 6 - 6
src/com/mes/component/WorkJPanelOP70.java

@@ -142,19 +142,19 @@ public class WorkJPanelOP70 extends JPanel {
         s7PLC.setConnectTimeout(1000);
         s7PLC.setReceiveTimeout(1000);
 
-        // 设备DB对照(鑫政自动线PLC点位说明_MES_20261010 OP70_OP80FSW页):反面FSW1=DB7001、反面FSW2=DB7002
-        // 原西侧/东侧3号机(DB7003)、4号机(DB7004)已取消,C/F位不再实例化
+        // 设备DB对照:反面FSW1=DB7002、反面FSW2=DB7003
+        // 原3号机、4号机已取消,C/F位不再实例化
         if(pos.equals("A")){
-            plcDb = "DB7001";
+            plcDb = "DB7002";
             fswDeviceName = "西侧1号机";
         }else if(pos.equals("B")){
-            plcDb = "DB7002";
+            plcDb = "DB7003";
             fswDeviceName = "西侧2号机";
         }else if(pos.equals("D")){
-            plcDb = "DB7001";
+            plcDb = "DB7002";
             fswDeviceName = "东侧1号机";
         }else if(pos.equals("E")){
-            plcDb = "DB7002";
+            plcDb = "DB7003";
             fswDeviceName = "东侧2号机";
         }
 

+ 3 - 3
src/com/mes/ui/MesClient.java

@@ -382,7 +382,7 @@ public class MesClient extends JFrame {
 
         }
 
-        // 中转车已取消(鑫政自动线PLC点位说明_MES_20261010标注取消;正面中转车原DB7001已分配给封板反面FSW1,保留实例会干扰反面FSW1信号,故不再创建)
+        // 中转车已取消(鑫政自动线PLC点位说明_MES_20261010标注取消,故不再创建)
 //        JPanel indexPanel60BB = new JPanel();
 //        indexPanel60BB.setLayout(null);
 //        indexPanel60BB.setBackground(Color.WHITE);
@@ -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(DB7001),避免与正面FSW2的DB7004冲突
+            workJPanel70Xh = new WorkJPanel70Xh("A"); // 反面换型台心跳/监控挂反面FSW1(DB7002),避免与正面FSW2的DB7004冲突
             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(DB7001),避免与正面FSW2的DB7004冲突
+            workJPanel70Xh = new WorkJPanel70Xh("A"); // 反面换型台心跳/监控挂反面FSW1(DB7002),避免与正面FSW2的DB7004冲突
             workJPanel70Xh.setBounds(10, 10, workJPanel70Xh.workWidth, workJPanel70Xh.workHeight);
             indexPanel70D.add(workJPanel70Xh);
             indexPanelD.add(indexPanel70D);