优化

src/com/mes/ui/MesClient.java

@@ -911,7 +911,9 @@ public class MesClient extends JFrame {
                         MesClient.sminA = "";
                         MesClient.curA = "";
 
-                        ModbusUtil.upResult();
+                        if (MesClient.zdStatusB == 0 && MesClient.zdStatusA == 0){
+                            ModbusUtil.upResult();
+                        }
                         ModbusUtil.setPowerOn(plcA);
                     }else{
                         MesClient.setMenuStatus("NG中断未审核",-1);
@@ -945,7 +947,9 @@ public class MesClient extends JFrame {
                         MesClient.smaxA = "";
                         MesClient.sminA = "";
                         MesClient.curA = "";
-                        ModbusUtil.upResult();
+                        if (MesClient.zdStatusB == 0 && MesClient.zdStatusA == 0){
+                            ModbusUtil.upResult();
+                        }
                         ModbusUtil.setPowerOn(plcA);
 
                     }else{
@@ -1017,7 +1021,9 @@ public class MesClient extends JFrame {
                         MesClient.curB = "";
                         ModbusUtil.setPowerOn(plcB);
 
-                        ModbusUtil.upResult();
+                        if (MesClient.zdStatusB == 0 && MesClient.zdStatusA == 0){
+                            ModbusUtil.upResult();
+                        }
                     }else{
                         MesClient.setMenuStatus("NG中断未审核",-1);
                     }
@@ -1054,7 +1060,9 @@ public class MesClient extends JFrame {
                         ModbusUtil.setPowerOn(plcB);
 
 
-                        ModbusUtil.upResult();
+                        if (MesClient.zdStatusB == 0 && MesClient.zdStatusA == 0){
+                            ModbusUtil.upResult();
+                        }
                     }else{
                         MesClient.setMenuStatus("NG中断未审核",-1);
                     }

src/com/mes/ui/ModbusUtil.java

@@ -30,7 +30,7 @@ public class ModbusUtil {
             MesClient.param1.setText(String.valueOf(MesClient.aMax));
         }
 
-        if(MesClient.sortA == cur - 1){
+        if(MesClient.sortA < cur){
             MesClient.sortA = cur;
 //            MesClient.aFinish = plc.readInt16(1138);
             String fout = plc.readInt16(1064)+"";
@@ -68,7 +68,7 @@ public class ModbusUtil {
                 ModbusUtil.setPowerOff(plc);
 
                 if(!MesClient.product_sn.getText().isEmpty()){
-                    JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
+//                    JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
                     DataUtil.addNgData(MesClient.product_sn.getText(),"A");
                 }
             }
@@ -88,7 +88,7 @@ public class ModbusUtil {
 //                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",fout,sout,fmin,smin,fmax,smax,"1",cur+"", MesClient.user_menu.getText());
 //            }
         }
-        if (MesClient.zdStatusA == 0){
+        if (MesClient.zdStatusA == 0 && MesClient.zdStatusB == 0){
             upResult();
         }
 
@@ -116,7 +116,7 @@ public class ModbusUtil {
             MesClient.param3.setText(String.valueOf(MesClient.bMax));
         }
 
-        if(MesClient.sortB == cur - 1){
+        if(MesClient.sortB < cur){
             MesClient.sortB = cur;
             String fout = plc.readInt16(1064)+"";
             String sout = (float)plc.readInt16(1065)/1000+"";
@@ -151,7 +151,7 @@ public class ModbusUtil {
                 ModbusUtil.setPowerOff(MesClient.plcB);
 
                 if(!MesClient.product_sn.getText().isEmpty()){
-                    JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
+//                    JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",fout,sout,fmin,smin,fmax,smax,qty,cur+"", MesClient.user_menu.getText());
                     DataUtil.addNgData(MesClient.product_sn.getText(),"B");
                 }
 
@@ -169,7 +169,7 @@ public class ModbusUtil {
                 JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",fout,sout,fmin,smin,fmax,smax,"1",cur+"", MesClient.user_menu.getText());
             }
         }
-        if (MesClient.zdStatusB == 0){
+        if (MesClient.zdStatusB == 0 && MesClient.zdStatusA == 0){
             upResult();
         }
 
@@ -178,7 +178,7 @@ public class ModbusUtil {
 
     // 上传总结果
     public static void upResult(){
-        if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA && MesClient.bMax > 0 && MesClient.bMax == MesClient.sortB){
+        if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax <= MesClient.sortA && MesClient.bMax > 0 && MesClient.bMax <= MesClient.sortB){
             MesClient.finish_ok_bt.setEnabled(true);
             MesClient.finish_ng_bt.setEnabled(true);
 

src/resources/config/config.properties

@@ -1,6 +1,6 @@
 mes.gw=OP320A
-mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.18.99
+#mes.server_ip=127.0.0.1
+mes.server_ip=192.168.18.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT