优化

src/com/mes/ui/MesClient.java

@@ -140,7 +140,7 @@ public class MesClient extends JFrame {
     public static JLabel[] dj_b_lamps = new JLabel[6];
     public static JButton dj_start_btn;
 
-    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.100"); //100 B工位
+    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.0.1"); //100 B工位
 //    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.2"); //2 A工位
 
     public static List<String> hjparams = new ArrayList<>();
@@ -979,7 +979,7 @@ public class MesClient extends JFrame {
 
                         textField.setText("");
                         batch_scan_1.setEnabled(false);
-                        PlcUtil.changeEnable(s7PLC,false);
+                        PlcUtil.changeEnableA(s7PLC,false);
                     }else{
                         MesClient.formatScanType(2);
                         batch_scan_1.setEnabled(true);
@@ -1024,7 +1024,7 @@ public class MesClient extends JFrame {
                         MesClient.formatScanType(2);
                         textField_1.setText("");
                         batch_scan_2.setEnabled(false);
-                        PlcUtil.changeEnable(s7PLC,false);
+                        PlcUtil.changeEnableB(s7PLC,false);
                     }else{
                         if(retObj.get("result")==null){
                             MesClient.setMenuStatus("请求失败，前梁码解绑失败，请重试",-1);
@@ -1509,10 +1509,15 @@ public class MesClient extends JFrame {
     }
 
     public static void formatBatchSn(){
-        if((MesClient.batch_status == 1 && MesClient.tjFlaga == 1) || (MesClient.batch_status2 == 1 && MesClient.tjFlagb == 1)){
-            PlcUtil.changeEnable(MesClient.s7PLC,true);
+        if(MesClient.batch_status == 1 && MesClient.tjFlaga == 1){
+            PlcUtil.changeEnableA(MesClient.s7PLC,true);
         }else{
-            PlcUtil.changeEnable(MesClient.s7PLC,false);
+            PlcUtil.changeEnableA(MesClient.s7PLC,false);
+        }
+        if(MesClient.batch_status2 == 1 && MesClient.tjFlagb == 1){
+            PlcUtil.changeEnableB(MesClient.s7PLC,true);
+        }else{
+            PlcUtil.changeEnableB(MesClient.s7PLC,false);
         }
     }
 

src/com/mes/ui/MesRevice.java

@@ -45,7 +45,11 @@ public class MesRevice {
 
                 String lmsg = ErrorMsg.getErrorMsg(processMsgRet, mes_msg);
                 MesClient.setMenuStatus(lmsg,-1);
-                PlcUtil.changeEnable(MesClient.s7PLC,false);
+                if(MesClient.curPage.equals("A")){
+                    PlcUtil.changeEnableA(MesClient.s7PLC,false);
+                }else{
+                    PlcUtil.changeEnableB(MesClient.s7PLC,false);
+                }
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -65,16 +69,17 @@ public class MesRevice {
                     MesClient.pxstatus1.setText("A:可以加工，等待设备启动");
                     MesClient.curSna = MesClient.product_sn.getText();
                     MesClient.tjFlaga = 1;
+                    PlcUtil.changeEnableA(MesClient.s7PLC,true);
                 }else{
                     MesClient.mesQualityFlagB = true;
                     MesClient.pxstatus2.setText("B:可以加工，等待设备启动");
                     MesClient.curSnb = MesClient.product_sn2.getText();
                     MesClient.tjFlagb = 1;
+                    PlcUtil.changeEnableB(MesClient.s7PLC,true);
                 }
 //                System.out.println("scan_type1:"+MesClient.scan_type);
 //                MesClient.formatScanType(2);// 1=镭雕码 2=后梁码
 //                System.out.println("scan_type2:"+MesClient.scan_type);
-                PlcUtil.changeEnable(MesClient.s7PLC,true);
 
             }
         }catch (Exception e){

src/com/mes/ui/PlcUtil.java

@@ -15,8 +15,8 @@ import java.util.Arrays;
 public class PlcUtil {
 
     public static void getParamDyDl(S7PLC s7PLC){
-        Boolean starta = s7PLC.readBoolean("DB1.2.2"); //A启动中
-        Boolean startb = s7PLC.readBoolean("DB1.2.3"); //B启动中
+        Boolean starta = s7PLC.readBoolean("DB7.0.2"); //A面运行中
+        Boolean startb = s7PLC.readBoolean("DB7.1.2"); //B面运行中
 
         String oprno = MesClient.mes_gw+"A";
         if(startb){
@@ -173,11 +173,11 @@ public class PlcUtil {
                 MesClient.pxstatus1.setText("A:设备运行中");
 //                MesClient.formatScanType(1);
 //                MesClient.batch_scan_1.setEnabled(false);
-                PlcUtil.changeEnable(s7PLC,false);
             }
         }else if(MesClient.tjFlaga == 2){
             Boolean afinish = getAFinish(s7PLC); //A焊接完成
-            if(afinish){ // B启动中，A当做完成
+            if(afinish){
+                PlcUtil.changeEnableA(s7PLC,false);
                 MesClient.tjFlaga = 3;
                 MesClient.pxstatus1.setText("A:设备运行结束,提交结果中");
                 MesClient.finish_ok_bt.setEnabled(true);
@@ -201,11 +201,11 @@ public class PlcUtil {
                 MesClient.pxstatus2.setText("B:设备运行中");
                 MesClient.batch_scan_2.setEnabled(false);
                 MesClient.formatScanType(1);
-                PlcUtil.changeEnable(s7PLC,false);
             }
         }else if(MesClient.tjFlagb == 2){
             Boolean bfinish = getBFinish(s7PLC); //B焊接完成
             if(bfinish){
+                PlcUtil.changeEnableB(s7PLC,false);
                 MesClient.tjFlagb = 3;
                 MesClient.pxstatus2.setText("B:设备运行结束,提交结果中");
                 MesClient.finish_ng_bt2.setEnabled(true);
@@ -220,58 +220,51 @@ public class PlcUtil {
         }
     }
 
-    // 获取A启动状态
+    // 获取A面运行中
     public static Boolean getAStart(S7PLC s7PLC){
         try{
-            return s7PLC.readBoolean("DB1.2.2");
+            return s7PLC.readBoolean("DB7.0.2");
         }catch (Exception e){
             e.printStackTrace();
             return false;
         }
     }
 
-    // 获取A的结束状态
+    // 获取A面焊接完成
     public static Boolean getAFinish(S7PLC s7PLC){
         try{
-            boolean a = s7PLC.readBoolean("DB1.2.5");
-            boolean b = s7PLC.readBoolean("DB1.2.6");
-            return a || b;
+            return s7PLC.readBoolean("DB7.0.3");
         }catch (Exception e){
             e.printStackTrace();
             return false;
         }
     }
 
-    // 获取B启动状态
+    // 获取B面运行中
     public static Boolean getBStart(S7PLC s7PLC){
         try{
-            return s7PLC.readBoolean("DB1.2.6");
+            return s7PLC.readBoolean("DB7.1.2");
         }catch (Exception e){
             e.printStackTrace();
             return false;
         }
     }
 
-    // 获取B的结束状态
+    // 获取B面焊接完成
     public static Boolean getBFinish(S7PLC s7PLC){
         try{
-            boolean a = s7PLC.readBoolean("DB1.2.7");
-            boolean b = s7PLC.readBoolean("DB1.2.4");
-            return a || b;
+            return s7PLC.readBoolean("DB7.1.3");
         }catch (Exception e){
             e.printStackTrace();
             return false;
         }
     }
 
-    // 修改设备的禁用开关
-//    DB9.26.4  MES允许启动信号
-    public static Boolean changeEnable(S7PLC s7PLC,Boolean result){
+    // A面MES允许启动 DB7.0.0
+    public static Boolean changeEnableA(S7PLC s7PLC,Boolean result){
         try{
-            //DB9.21.7 A//DB9.26.4 B
-            System.out.println("调用允许启动");
-            s7PLC.writeBoolean("DB9.26.4",result);
-//            s7PLC.writeBoolean("DB9.21.7",result);
+            System.out.println("调用A面MES允许启动:" + result);
+            s7PLC.writeBoolean("DB7.0.0",result);
             return true;
         }catch (Exception e){
             e.printStackTrace();
@@ -279,15 +272,34 @@ public class PlcUtil {
         }
     }
 
+    // B面MES允许启动 DB7.1.0
+    public static Boolean changeEnableB(S7PLC s7PLC,Boolean result){
+        try{
+            System.out.println("调用B面MES允许启动:" + result);
+            s7PLC.writeBoolean("DB7.1.0",result);
+            return true;
+        }catch (Exception e){
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    // 同时设置A/B面MES允许启动
+    public static Boolean changeEnable(S7PLC s7PLC,Boolean result){
+        changeEnableA(s7PLC,result);
+        changeEnableB(s7PLC,result);
+        return true;
+    }
+
     // 获取当前是A面还是B面
     public static String getCurAside(S7PLC s7PLC){
         String str = "A";
         try{
-            Boolean ret = s7PLC.readBoolean("DB1.2.0"); // 当前A面
-            if(!ret){
+            Boolean aSide = s7PLC.readBoolean("DB7.0.1"); // A面识别
+            Boolean bSide = s7PLC.readBoolean("DB7.1.1"); // B面识别
+            if(bSide && !aSide){
                 str = "B";
             }
-
         }catch (Exception e){
             e.printStackTrace();
         }

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP030
-mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.21.99
+mes.gw=OP050
+#mes.server_ip=127.0.0.1
+mes.server_ip=192.168.16.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT