优化

src/com/mes/ui/MesClient.java

@@ -120,7 +120,9 @@ public class MesClient extends JFrame {
 
                     getMaterailData();
 
-                    startUpdateQualityTimer(); // 开启提交结果的定时任务
+//                    startUpdateQualityTimer(); // 开启提交结果的定时任务
+
+                    startPlcTimer();
 
                 }catch (Exception e){
                     log.error(e.getMessage());
@@ -249,10 +251,12 @@ public class MesClient extends JFrame {
         plcTimer.schedule(new TimerTask() {
             @Override
             public void run() {
-                if (s7plc.readBoolean("DB100.0.3")){
-                    // 可以提交
-                    MesClient.finish_ok_bt.setEnabled(true);
-                    MesClient.finish_ng_bt.setEnabled(true);
+                if(work_status == 1){
+                    if (s7plc.readBoolean("DB100.0.3")){
+                        // 可以提交
+                        MesClient.finish_ok_bt.setEnabled(true);
+                        MesClient.finish_ng_bt.setEnabled(true);
+                    }
                 }
             }
         }, 100,1000);

src/com/mes/ui/MesRevice.java

@@ -20,9 +20,9 @@ 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.s7plc.writeBoolean("DB100.0.2",true);
                 }
             }else {
                 MesClient.check_quality_result = false;
@@ -42,9 +42,6 @@ public class MesRevice {
     public static void startRevice(String processMsgRet,String mes_msg){
         try{
             if(processMsgRet.equalsIgnoreCase("OK")) {
-                MesClient.work_status = 1;
-                MesClient.f_scan_data_bt_1.setEnabled(false);
-                MesClient.s7plc.writeBoolean("DB100.0.2",true);
 
             }
         }catch (Exception e){

src/resources/config/config.properties

@@ -1,11 +1,6 @@
-# ???
-mes.gw=OP150B
-# ???IP
+mes.gw=OP150A
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.22.99
-# TCP????
 mes.tcp_port=3000
-# TCP????
 mes.heart_beat_cycle=60
-# ????
 mes.line_sn=XT