更新自动线FSW&激光焊

src/com/mes/component/WorkJPanelDevice.java

@@ -32,9 +32,9 @@ public class WorkJPanelDevice extends JPanel {
 
     public final Logger log =  LoggerFactory.getLogger(WorkJPanelDevice.class);
 
-    public String oprno = "OP140";
+    public String oprno = "";
 
-    public String pos = "A";
+    public String pos = "";
 
     public String lastSn = ""; // 最近的码
 
@@ -72,7 +72,7 @@ public class WorkJPanelDevice extends JPanel {
 
     public ImageIcon imageGray;
 
-    public String plcIp = "192.168.22.201";
+    public String plcIp = "192.168.15.201";
 
     public String deviceIp = "192.168.88.99";
 
@@ -154,6 +154,10 @@ public class WorkJPanelDevice extends JPanel {
             } else if (position.equals("C")) {
                 plcDb = "DB3012";
                 deviceIp = "";
+            } else if (position.equals("200A")) {
+                this.oprno = "OP200";
+                this.pos = "A";
+                plcDb = "DB3009";
             }
         }else if(oprno.equals("OP140")){        //CNC反面
             if(position.equals("A")){
@@ -456,17 +460,17 @@ public class WorkJPanelDevice extends JPanel {
                             e.printStackTrace();
                         }
 
-                        try{ // CNC上线
-                            ReplyPlc("DB3000",s7PLC);
-                        }catch (Exception e){
-                            e.printStackTrace();
-                        }
-
-                        try{ // 涂胶上线
-                            ReplyPlc("DB3010",s7PLC);
-                        }catch (Exception e){
-                            e.printStackTrace();
-                        }
+//                        try{ // CNC上线
+//                            ReplyPlc("DB3000",s7PLC);
+//                        }catch (Exception e){
+//                            e.printStackTrace();
+//                        }
+//
+//                        try{ // 铆接上线
+//                            ReplyPlc("DB3008",s7PLC);
+//                        }catch (Exception e){
+//                            e.printStackTrace();
+//                        }
                     }
                 }
             }
@@ -486,7 +490,7 @@ public class WorkJPanelDevice extends JPanel {
     private void ReplyPlc(String db,S7PLC s7PLC){
         Boolean ret = s7PLC.readBoolean(db+".12.0");
         if(ret){ // 允许MES读工件码
-            if(!db.equals("DB3010")){
+            if(!db.equals("DB3008")){
                 String sn = s7PLC.readString(db+".24.0",33).trim();
                 if(!sn.isEmpty()){
                     // TODO::判断是否可上件
@@ -637,9 +641,6 @@ public class WorkJPanelDevice extends JPanel {
                                     tjStatus = 1;
                                     String result = readResult();
                                     result = result.equals("OK")?"OK":"NG";
-                                    if(oprno.equals("OP220")||oprno.equals("OP230")){
-                                        result = "OK";
-                                    }
                                     JSONObject retObj = DataUtil.sendQuality(productSnFeeding.getText(),oprno+pos,result,MesClient.user_menu.getText());
                                     if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
                                         resetBlanking();

src/com/mes/ui/MesClient.java

@@ -405,7 +405,7 @@ public class MesClient extends JFrame {
             JPanel indexPanel20A = new JPanel();
             indexPanel20A.setLayout(null);
             indexPanel20A.setBackground(Color.WHITE);
-            workJPanelDeviceA = new WorkJPanelDevice("D");
+            workJPanelDeviceA = new WorkJPanelDevice("A");
             workJPanelDeviceA.setBounds(10, 10, workJPanelDeviceA.workWidth, workJPanelDeviceA.workHeight);
             indexPanel20A.add(workJPanelDeviceA);
             indexPanelA.add(indexPanel20A);
@@ -413,7 +413,7 @@ public class MesClient extends JFrame {
             JPanel indexPanel20B = new JPanel();
             indexPanel20B.setLayout(null);
             indexPanel20B.setBackground(Color.WHITE);
-            workJPanelDeviceB = new WorkJPanelDevice("E");
+            workJPanelDeviceB = new WorkJPanelDevice("B");
             workJPanelDeviceB.setBounds(10, 10, workJPanelDeviceB.workWidth, workJPanelDeviceB.workHeight);
             indexPanel20B.add(workJPanelDeviceB);
             indexPanelA.add(indexPanel20B);
@@ -421,7 +421,7 @@ public class MesClient extends JFrame {
             JPanel indexPanel20C = new JPanel();
             indexPanel20C.setLayout(null);
             indexPanel20C.setBackground(Color.WHITE);
-            workJPanelDeviceC = new WorkJPanelDevice("F");
+            workJPanelDeviceC = new WorkJPanelDevice("C");
             workJPanelDeviceC.setBounds(10, 10, workJPanelDeviceC.workWidth, workJPanelDeviceC.workHeight);
             indexPanel20C.add(workJPanelDeviceC);
             indexPanelA.add(indexPanel20C);
@@ -441,6 +441,40 @@ public class MesClient extends JFrame {
             workJPanelDeviceA.setBounds(10, 10, workJPanelDeviceA.workWidth, workJPanelDeviceA.workHeight);
             indexPanel20A.add(workJPanelDeviceA);
             indexPanelA.add(indexPanel20A);
+        }else if(mes_gw.equals("OP210")){
+            // 新增：OP200A 工位面板
+            JPanel indexPanel200A = new JPanel();
+            indexPanel200A.setLayout(null);
+            indexPanel200A.setBackground(Color.WHITE);
+            workJPanelDeviceG = new WorkJPanelDevice("200A"); // 用特殊标识区分
+            workJPanelDeviceG.setBounds(10, 10, workJPanelDeviceG.workWidth, workJPanelDeviceG.workHeight);
+            indexPanel200A.add(workJPanelDeviceG);
+            indexPanelA.add(indexPanel200A);
+
+            JPanel indexPanel20A = new JPanel();
+            indexPanel20A.setLayout(null);
+            indexPanel20A.setBackground(Color.WHITE);
+            workJPanelDeviceA = new WorkJPanelDevice("A");
+            workJPanelDeviceA.setBounds(10, 10, workJPanelDeviceA.workWidth, workJPanelDeviceA.workHeight);
+            indexPanel20A.add(workJPanelDeviceA);
+            indexPanelA.add(indexPanel20A);
+
+            JPanel indexPanel20B = new JPanel();
+            indexPanel20B.setLayout(null);
+            indexPanel20B.setBackground(Color.WHITE);
+            workJPanelDeviceB = new WorkJPanelDevice("B");
+            workJPanelDeviceB.setBounds(10, 10, workJPanelDeviceB.workWidth, workJPanelDeviceB.workHeight);
+            indexPanel20B.add(workJPanelDeviceB);
+            indexPanelA.add(indexPanel20B);
+
+            JPanel indexPanel20C = new JPanel();
+            indexPanel20C.setLayout(null);
+            indexPanel20C.setBackground(Color.WHITE);
+            workJPanelDeviceC = new WorkJPanelDevice("C");
+            workJPanelDeviceC.setBounds(10, 10, workJPanelDeviceC.workWidth, workJPanelDeviceC.workHeight);
+            indexPanel20C.add(workJPanelDeviceC);
+            indexPanelA.add(indexPanel20C);
+
         }
 
         tabbedPane.addTab("工作面板", null, indexScrollPaneA, null);

src/resources/config/config.properties

@@ -1,5 +1,5 @@
 mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.22.99
+#mes.server_ip=192.168.15.99
 mes.line_sn=XT
-mes.gw=OP140
+mes.gw=OP210
 mes.line_pos=west