优化

src/com/mes/ui/MesClient.java

@@ -190,7 +190,6 @@ public class MesClient extends JFrame {
                         List<Boolean> yxstatus = plcA.readCoil(456,1);
                         if(yxstatus.size() >= 1 && !yxstatus.get(0)){
                             ModbusUtil.setPowerOn(MesClient.plcA); // 远程关机
-//                            ModbusUtil.setMesAllow(MesClient.plcA, MesClient.deviceHeartTimer);
                         }
                     }
                 }catch (Exception e){
@@ -939,11 +938,10 @@ public class MesClient extends JFrame {
                 if(zdStatusA == 1){
                     JSONObject retObj = DataUtil.checkNgData(product_sn.getText(),"A");
                     if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
-//                        if(!MesClient.product_sn.getText().isEmpty()){
-//
-////                            JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",foutA,soutA,fminA,sminA,fmaxA,smaxA,"1",curA+"", MesClient.user_menu.getText());
-//                        }
-                        MesClient.aFinish++;
+                        if(!MesClient.product_sn.getText().isEmpty()){
+                            MesClient.aFinish++;
+                            JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",foutA,soutA,fminA,sminA,fmaxA,smaxA,"1",curA+"", MesClient.user_menu.getText());
+                        }
                         MesClient.zdStatusA = 0;
                         MesClient.resetResultA.setEnabled(false);
                         MesClient.okResultA.setEnabled(false);
@@ -999,6 +997,7 @@ public class MesClient extends JFrame {
                 }
             }
         });
+
         ngResultA.setEnabled(false);
         ngResultA.setForeground(new Color(255, 0, 0));
         ngResultA.setFont(new Font("微软雅黑", Font.PLAIN, 16));

src/com/mes/ui/ModbusUtil.java

@@ -8,29 +8,13 @@ import java.nio.charset.Charset;
 public class ModbusUtil {
 
     public static void getDataA(ModbusTcp plc){
-
-        // 说明预设数量有变化不能修改
-        // 打钉数应按实际监听数算
-
-        // 41065=F-out  41066=S-out
-        // 41069=F-min  41071=S-min 41070=F-max  41072=S-max
-        // 预设数量=41129  完成数=41137
-
         Short cur = plc.readInt16(1136);
-//        System.out.println("F-out:"+plc.readInt16(1064));
-//        System.out.println("S-out:"+plc.readInt16(1065));
-//        System.out.println("F-min:"+plc.readInt16(1068));
-//        System.out.println("S-min:"+plc.readInt16(1070));
-//        System.out.println("F-max:"+plc.readInt16(1069));
-//        System.out.println("S-max:"+plc.readInt16(1071));
-//        System.out.println("预设数量:"+plc.readInt16(1128));
-        //System.out.println("当前数量:"+cur);
         if(MesClient.aMax <= 0){
             MesClient.aMax = plc.readInt16(1128); // 任务数量
             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)+"";
@@ -69,7 +53,6 @@ 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());
                     DataUtil.addNgData(MesClient.product_sn.getText(),"A");
                 }
             }
@@ -77,9 +60,6 @@ public class ModbusUtil {
                 MesClient.aFinish++;
                 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());
             }
-//            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,"1",cur+"", MesClient.user_menu.getText());
-//            }
         }
 
         if(MesClient.zdStatusA == 0){
@@ -138,7 +118,7 @@ public class ModbusUtil {
 
     // 上传总结果
     public static void upResult(){
-        if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA){
+        if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax <= MesClient.sortA){
             MesClient.finish_ok_bt.setEnabled(true);
             MesClient.finish_ng_bt.setEnabled(true);