优化

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.7.100"); //100 B工位   100CD  120CD
 //    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.2"); //2 A工位
 
     public static List<String> hjparams = new ArrayList<>();
@@ -198,7 +198,7 @@ public class MesClient extends JFrame {
                 txtfa.requestFocusInWindow();
 
                 MesClient.curPage = PlcUtil.getCurAside(s7PLC);
-                if(MesClient.curPage .equals("A")){
+                if(MesClient.curPage.equals("A")){
                     page_text.setText("当前：A面");
                 }else{
                     page_text.setText("当前：B面");

src/com/mes/ui/MesRevice.java

@@ -18,23 +18,39 @@ public class MesRevice {
                 String oprno = ProtocolParam.getOprno(mes_msg).trim();
                 String sn = ProtocolParam.getSn(mes_msg).trim();
                 System.out.println(":"+oprno);
-                if(oprno.equals("OP110A")){
-                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
-                    MesClient.getUser();
-                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP110B")){
-                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
-                    MesClient.getUser();
-                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");
-                }else if(oprno.equals("OP110C")){
-                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
-                    MesClient.getUser();
-                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP110D")){
-                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
-                    MesClient.getUser();
-                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");
+
+
+                if(oprno.equals(MesClient.mes_gw+"A") || oprno.equals(MesClient.mes_gw+"C")){
+                    MesClient.mesQualityFlagA = true;
+                    MesClient.pxstatus1.setText("A:可以加工，等待设备启动");
+                    MesClient.curSna = MesClient.product_sn.getText();
+                    MesClient.tjFlaga = 1;
+                }else{
+                    MesClient.mesQualityFlagB = true;
+                    MesClient.pxstatus2.setText("B:可以加工，等待设备启动");
+                    MesClient.curSnb = MesClient.product_sn2.getText();
+                    MesClient.tjFlagb = 1;
                 }
+                PlcUtil.changeEnable(MesClient.s7PLC,true);
+
+
+//                if(oprno.equals("OP110A")){
+//                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
+//                    MesClient.getUser();
+//                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
+//                }else if(oprno.equals("OP110B")){
+//                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
+//                    MesClient.getUser();
+//                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");
+//                }else if(oprno.equals("OP110C")){
+//                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
+//                    MesClient.getUser();
+//                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
+//                }else if(oprno.equals("OP110D")){
+//                    String barcode36 = MesClient.getBarcode(sn);//处理36为码
+//                    MesClient.getUser();
+//                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");
+//                }
 
             }else {
                 if(MesClient.curPage.equals("A")){

src/com/mes/ui/PlcUtil.java

@@ -274,7 +274,8 @@ public class PlcUtil {
         try{
             //DB9.21.7 A//DB9.26.4 B
             System.out.println("调用允许启动");
-            s7PLC.writeBoolean("DB9.26.4",result);
+            s7PLC.writeBoolean("DB9.30.4",result);// 100CD  120CD
+//            s7PLC.writeBoolean("DB9.26.4",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;
         }catch (Exception e){
@@ -284,7 +285,21 @@ public class PlcUtil {
     }
 
     // 获取当前是A面还是B面
-    public static String getCurAside(S7PLC s7PLC){
+    public static String getCurAside(S7PLC s7PLC){//120A
+        String str = "B";
+        try{
+            Boolean ret = s7PLC.readBoolean("DB1.2.0"); // 当前A面
+            if(!ret){
+                str = "A";
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return str;
+    }
+
+    public static String getCurAsideOther(S7PLC s7PLC){//120A
         String str = "A";
         try{
             Boolean ret = s7PLC.readBoolean("DB1.2.0"); // 当前A面

src/resources/config/config.properties

@@ -1,7 +1,7 @@
-mes.gw=OP100
+mes.gw=OP120
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.21.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT
-mes.gwflag=A
+mes.gwflag=B