优化

src/com/mes/ui/MesRevice.java

@@ -19,9 +19,11 @@ public class MesRevice {
                 MesClient.check_quality_result = true;//质量合格，可以绑定加工
                 MesClient.status_menu.setText("该工件可以加工");
                 if(MesClient.work_status == 0 ){
-                    String barcode36 = MesClient.getBarcode(MesClient.product_sn.getText());//处理36为码
-                    MesClient.getUser();
-                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20);
+
+                    MesClient.work_status = 1;
+                    MesClient.f_scan_data_bt_1.setEnabled(false);
+                    MesClient.tjFlag = 1;
+                    S7Util.sendStartSignal(false);
                 }
                 // 获取设备程序号，判断程序号是否正确
 //                String programName = S7Util.getProgramName(MesClient.s7PLC);

src/com/mes/ui/S7Util.java

@@ -16,28 +16,27 @@ public class S7Util {
         try {
             Boolean deviceStatus = getDeviceStatus();
             if(MesClient.tjFlag == 1) {
-                if (deviceStatus) {
-                    sendStartSignal(false);
-                }
+                MesClient.tjTime++;
                 if (!deviceStatus) {
                     MesClient.tjFlag = 2;
                     MesClient.status_menu.setText(MesClient.tjFlagText2);
                 }
+                if (deviceStatus || MesClient.tjTime >= 120) { // 120秒内去除MES允许
+                    sendStartSignal(false);
+                }
             }else if(MesClient.tjFlag == 2){
-                if(deviceStatus){
+                MesClient.tjTime++;
+                if(deviceStatus || MesClient.tjTime >= 380){
                     MesClient.tjFlag = 3;
                     MesClient.status_menu.setText(MesClient.tjFlagText3);
-//                    MesClient.finish_ok_bt.setEnabled(true);
-//                    MesClient.finish_ng_bt.setEnabled(true);
                 }
             }else if(MesClient.tjFlag == 3) {
+                DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20);
+
                 if (!deviceStatus) {
                     //禁止启动
                     sendStartSignal(true);
-
                 }
-                DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20);
-
             }else{
                 //未扫码  如果程序没结束  禁止设备
                 if(!deviceStatus){

src/resources/config/config.properties

@@ -1,4 +1,4 @@
-/mes.gw=OP280A*******
+mes.gw=OP280A
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.18.99
 mes.tcp_port=3000