重新对接PLC

src/com/mes/ui/MesClient.java

@@ -460,15 +460,19 @@ public class MesClient extends JFrame {
             public void run() {
                 try{
                     if(work_status == 1){
-                        Boolean reta = plcA.readBoolean("DB4.DBX0.1");
-                        if(reta){
-                            PlcUtil.setPowerOn(plcA);
-                        }
+//                        Boolean reta = plcA.readBoolean("DB4.DBX0.1");
+//                        if(reta){
+//                            PlcUtil.setPowerOn(plcA);
+//                        }
+
+                        PlcUtil.setPowerOn(plcA);
                     }else{
-                        Boolean reta = plcA.readBoolean("DB4.DBX0.1");
-                        if(!reta){
-                            PlcUtil.setPowerOff(plcA);
-                        }
+                        PlcUtil.setPowerOffA(plcA);
+                        PlcUtil.setPowerOffB(plcA);
+//                        Boolean reta = plcA.readBoolean("DB4.DBX0.1");
+//                        if(!reta){
+//                            PlcUtil.setPowerOff(plcA);
+//                        }
                     }
                 }catch (Exception e){
                     e.printStackTrace();
@@ -579,7 +583,8 @@ public class MesClient extends JFrame {
             MesClient.soutB.setText("");
         }
 
-        PlcUtil.setPowerOff(MesClient.plcA);
+        PlcUtil.setPowerOffA(MesClient.plcA);
+        PlcUtil.setPowerOffB(MesClient.plcA);
         PlcUtil.setTask(MesClient.plcA,MesClient.aSetNum,MesClient.bSetNum);
 
         pzlabel.setVisible(false);

src/com/mes/ui/MesRevice.java

@@ -32,12 +32,12 @@ public class MesRevice {
 
                 MesClient.param2.setText("0");
                 MesClient.param4.setText("0");
-                try{
-                    MesClient.plcA.writeInt32("DB1.184.0",0);
-                    MesClient.plcA.writeInt32("DB1.714.0",0);
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
+//                try{
+//                    MesClient.plcA.writeInt32("DB1.184.0",0);
+//                    MesClient.plcA.writeInt32("DB1.714.0",0);
+//                }catch (Exception e){
+//                    e.printStackTrace();
+//                }
 
                 MesClient.setMenuStatus("该工件可以加工",0);
 //                if(MesClient.work_status == 0 ){
@@ -54,7 +54,8 @@ public class MesRevice {
 
                 MesClient.setMenuStatus(lmsg,-1);
 
-                PlcUtil.setPowerOff(MesClient.plcA);
+                PlcUtil.setPowerOffA(MesClient.plcA);
+                PlcUtil.setPowerOffB(MesClient.plcA);
             }
         }catch (Exception e){
             e.printStackTrace();

src/com/mes/ui/PlcUtil.java

@@ -15,9 +15,9 @@ public class PlcUtil {
 
         if(MesClient.sortA < cur){
             MesClient.sortA = cur;
-//            if (cur == 9){
-//                plc.writeUInt16("DB1.DBW54",2);
-//            }
+            if (cur == 16){
+                plc.writeUInt16("DB1.DBW54",2);
+            }
             int fout = plc.readInt32("DB1.144.0");
             Float sout = plc.readFloat32("DB1.148.0");
 
@@ -120,8 +120,17 @@ public class PlcUtil {
         boolean rivetDoneB = (MesClient.sortB >= MesClient.bMax); // 1
         boolean allDone = torqueDone && rivetDoneA && rivetDoneB;
 
-        if (rivetDoneA && rivetDoneB) {
-            PlcUtil.setPowerOff(MesClient.plcA);
+//        if (rivetDoneA && rivetDoneB) {
+//            PlcUtil.setPowerOff(MesClient.plcA);
+//        }
+
+        // A完成
+        if(rivetDoneA){
+            PlcUtil.setPowerOffA(MesClient.plcA);
+        }
+        // b 完成
+        if(rivetDoneB){
+            PlcUtil.setPowerOffB(MesClient.plcA);
         }
 
 
@@ -155,7 +164,8 @@ public class PlcUtil {
     public static Boolean setPowerOn(S7PLC plc){
         Boolean ret = false;
         try{
-            plc.writeBoolean("DB4.DBX0.1",false);
+            plc.writeBoolean("DB4.DBX0.1",true);
+            plc.writeBoolean("DB4.DBX204.0",true);
             ret = true;
         }catch (Exception e){
             e.printStackTrace();
@@ -163,6 +173,30 @@ public class PlcUtil {
         }
         return ret;
     }
+//
+//    public static Boolean setPowerOnA(S7PLC plc){
+//        Boolean ret = false;
+//        try{
+//            plc.writeBoolean("DB4.DBX0.1",true);
+//            ret = true;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            ret = false;
+//        }
+//        return ret;
+//    }
+//
+//    public static Boolean setPowerOnB(S7PLC plc){
+//        Boolean ret = false;
+//        try{
+//            plc.writeBoolean("DB4.DBX204.0",true);
+//            ret = true;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            ret = false;
+//        }
+//        return ret;
+//    }
 
     public static Boolean setPowerOff(S7PLC plc){
         Boolean ret = false;
@@ -176,6 +210,31 @@ public class PlcUtil {
         return ret;
     }
 
+    public static Boolean setPowerOffA(S7PLC plc){
+        Boolean ret = false;
+        try{
+            plc.writeBoolean("DB4.DBX0.1",false);
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+        return ret;
+    }
+
+    public static Boolean setPowerOffB(S7PLC plc){
+        Boolean ret = false;
+        try{
+            plc.writeBoolean("DB4.DBX204.0",false);
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+        return ret;
+    }
+
+
     public static void setTask(S7PLC plc,int setNumA,int setNumB){
         try{
             plc.writeUInt16("DB1.DBW54",1);