优化

src/com/mes/ui/DataUtil.java

@@ -148,6 +148,7 @@ public class DataUtil {
             if(!sn.isEmpty()){
                 JdbcUtils.insertSubmitRecord(gw, sn, aqdw_str);
             }
+            nettyClient.future.channel().writeAndFlush(aqdw_str);
             return true;
         }catch (Exception e){
             return false;

src/com/mes/ui/MesClient.java

@@ -100,7 +100,9 @@ public class MesClient extends JFrame {
 
     public static JLabel fxlabel;
 
-    public static String plcUrl = "192.168.88.99";
+    public static String plcUrl = "192.168.88.89"; // 180AF
+
+//    public static String plcUrl = "192.168.88.99"; // 180BE  280AB
 
     public static S7PLC s7PLC = new S7PLC(EPlcType.SINUMERIK_828D, plcUrl);
 
@@ -165,7 +167,12 @@ public class MesClient extends JFrame {
 
                     getMaterailData();
 
-                    startUpdateQualityTimer();
+//                    startUpdateQualityTimer();
+
+//                    S7Util.sendStartSignal(true);
+//
+//                    boolean ret = S7Util.getDeviceStart();
+//                    System.out.println(ret);
 
                     monitorDevice();
 
@@ -189,7 +196,7 @@ public class MesClient extends JFrame {
         mes_heart_beat_cycle = Integer.parseInt(pro.getProperty("mes.heart_beat_cycle"));
         mes_line_sn = pro.getProperty("mes.line_sn");
 
-//        mes_gw_des = OprnoUtil.getGwDes(mes_line_sn,mes_gw);
+        mes_gw_des = OprnoUtil.getGwDes(mes_line_sn,mes_gw);
 
         log.info(mes_gw + ";" + mes_gw_des + ";" + mes_server_ip + ";" + mes_tcp_port + ";" + mes_heart_beat_cycle);
     }
@@ -929,7 +936,10 @@ public class MesClient extends JFrame {
                             S7Util.getDeviceShield();
                         }else{
                             if (work_status == 0){
-                                S7Util.sendStartSignal(true);
+                                boolean ss = S7Util.getDeviceStart();
+                                if(!ss){
+                                    S7Util.sendStartSignal(true);
+                                }
                             }
                             S7Util.getDeviceState();
 

src/com/mes/ui/MesRevice.java

@@ -125,6 +125,7 @@ public class MesRevice {
                 MesClient.scan_type = 1;
                 MesClient.scanBarcode();
 
+
             }else{
                 MesClient.setMenuStatus("结果提交失败，请重试",-1);
 //                MesClient.status_menu.setText("结果提交失败，请重试");

src/com/mes/ui/OprnoUtil.java

@@ -6,19 +6,10 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP030", "OP040", "OP050", "OP060", "SP010", "OP070", "SP015", "OP080",
-            "OP090", "OP100", "OP110", "SP025", "OP150", "OP160", "OP170", "OP180",
-            "OP190", "OP200", "SP035", "OP210", "OP220", "SP040", "SP045", "SP050",
-            "SP055", "OP230", "OP240", "SP060", "OP250", "OP260"
+             "OP180", "OP280"
     };
     public static String[] xtoprnodes = new String[]{
-            "小总成装配", "框架拼装", "框架CMT焊接", "补焊", "焊道检验", "打磨", "框架气检",
-            "CNC正面加工", "CNC反面加工", "框架去毛刺+清洁", "封堵片点焊", "喷涂前GP12",
-            "反面装配（法兰面拉铆螺母+防爆阀拉铆螺母+钢丝牙套+边梁主副衬套+保护套）",
-            "框架涂胶+水冷板装配（双层拉铆螺母+抽芯铆钉）", "FDS", "清胶+钉头涂胶+封堵胶",
-            "胶水固化", "正面装配", "半成品气密", "挂载点装配", "底护板装配", "总成箱体气密",
-            "液冷板气密", "总成氦检", "总成检具", "箱体清洁+安装FDS套管",
-            "贴保温棉+塑料支架+泡棉+PI膜+横梁支架装配", "GP12", "打包", "储存"
+            "箱体正面CNC", "液冷板FSW"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",

src/com/mes/ui/S7Util.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 public class S7Util {
 
+    public static Integer db = 9015; // FSW=9014 CNC=9015
     // 监听状态
     public static void getDeviceState(){
         try {
@@ -35,15 +36,8 @@ public class S7Util {
                     sendStartSignal(true);
 
                 }
-                Boolean ret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20);
-                if(ret){
-                    MesClient.resetScanA();
-                    MesClient.scan_type = 1;
-                    MesClient.scanBarcode();
-                    MesClient.setMenuStatus("结果提交成功，请扫下一件",0);
-                }else{
-                    MesClient.setMenuStatus("消息发送失败，请重试",-1);
-                }
+                DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20);
+
             }else{
                 //未扫码  如果程序没结束  禁止设备
                 if(!deviceStatus){
@@ -196,7 +190,7 @@ public class S7Util {
         try {
             MesClient.initS7();
             // 读取 DB9015.DBB0（1字节，包含 DBX0.0~DBX0.7）        1个字节,从第0个字节开始
-            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, 9015, 1, 0);
+            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, S7Util.db, 1, 0);
             byte b9015 = data9015[0];
             Boolean result = (b9015 & (1 << 0)) != 0;
             return result;
@@ -212,7 +206,7 @@ public class S7Util {
         try {
             MesClient.initS7();
             // 读取 DB9015.DBB0（1字节，包含 DBX0.0~DBX0.7）        1个字节,从第0个字节开始
-            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, 9015, 1, 0);
+            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, S7Util.db, 1, 0);
             byte b9015 = data9015[0];
             Boolean result = (b9015 & (1 << 2)) != 0;
             return result;
@@ -228,7 +222,7 @@ public class S7Util {
         try {
             MesClient.initS7();
             // 读取 DB9015.DBB0（1字节，包含 DBX0.0~DBX0.7）        1个字节,从第0个字节开始
-            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, 9015, 1, 0);
+            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, S7Util.db, 1, 0);
             byte b9015 = data9015[0];
             Boolean result = (b9015 & (1 << 1)) != 0;
             return result;
@@ -298,7 +292,7 @@ public class S7Util {
             MesClient.initS7();
 
             // 读取 DB9015.DBB0（1字节，包含 DBX0.0~DBX0.7）        1个字节,从第0个字节开始
-            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, 9015, 1, 0);
+            byte[] data9015 = MesClient.s7Connector.read(DaveArea.DB, S7Util.db, 1, 0);
             byte b9015 = data9015[0];
 
             result.put("DB9015.DBX0.0", (b9015 & (1 << 0)) != 0);
@@ -321,7 +315,7 @@ public class S7Util {
     public static boolean sendStartSignal(boolean value){
         try {
             MesClient.initS7();
-            byte[] data = MesClient.s7Connector.read(DaveArea.DB, 9015, 1, 0);
+            byte[] data = MesClient.s7Connector.read(DaveArea.DB, S7Util.db, 1, 0);
             byte b = data[0];
             System.out.println(b);
             if (value) {
@@ -329,10 +323,12 @@ public class S7Util {
             } else {
                 b = (byte)(b & ~(1 << 1)); // 清0
             }
-            System.out.println(b);
+            System.out.println("b:"+b);
+//            b = 1;
             // 写回去
             byte[] toWrite = new byte[]{b};
-            MesClient.s7Connector.write(DaveArea.DB, 9015, 0, toWrite);
+            System.out.println(toWrite.toString());
+            MesClient.s7Connector.write(DaveArea.DB, S7Util.db, 0, toWrite);
             return true;
         } catch (Exception e) {
             e.printStackTrace();

src/resources/config/config.properties

@@ -1,4 +1,4 @@
-mes.gw=OP280B
+mes.gw=OP180F
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.18.99
 mes.tcp_port=3000