修改

src/com/mes/ui/MesClient.java

@@ -679,7 +679,7 @@ public class MesClient extends JFrame {
                             QmParam qmParam = PLCUtils.getParameter(plc);
                             // 发送参数
                             JSONObject retObj1 = DataUtil.sendQualityParam( user20, product_sn.getText().trim(), MesClient.mes_gw, MesClient.mes_line_sn,qmParam);
-                        System.out.println(qmParam);
+                            System.out.println(qmParam);
                             if(retObj1 != null && retObj1.get("result") != null && retObj1.get("result").toString().equalsIgnoreCase("true")) {
                                 //MesClient.resetScanA();
                                 MesClient.setMenuStatus("气密数据上传成功，请扫下一件",0);

src/com/mes/ui/OprnoUtil.java

@@ -20,7 +20,7 @@ public class OprnoUtil {
     public static String[] xtoprnodes = new String[]{
             "凸焊","左边梁防爆阀拉铆","CMT框架一序焊接",
             "人工补焊", "框架CMT二序焊接", "人工补焊", "焊道检查", "总成正面CNC",
-            "总成反面CNC", "框架去毛刺+清洁", "封堵片焊接+打磨", "边框气密", "焊道补焊",
+            "总成反面CNC", "框架去毛刺+清洁", "封堵片焊接+打磨", "白件气密检测", "焊道补焊",
             "框架反面涂胶", "液冷板安装", "正面溢胶清理,补胶", "液冷板激光点固", "液冷板水嘴处焊接",
             "焊道打磨", "液冷板FSW", "匙孔补焊打磨", "总成反面拉铆", "总成正面拉铆1",
             "总成正面拉铆2", "边梁套筒涂胶+压合", "箱体封堵", "胶水固化", "半成品气密",

src/com/mes/util/PLCUtils.java

@@ -28,9 +28,7 @@ public class PLCUtils {
     // 获取参数
     public static QmParam getParameter(S7PLC plc) {
         //  TODO
-        // 泄露值
         String leakageValue = "0.0";
-        leakageValue = plc.readString("VB307", 7);
         // 结果
         String result = getResult(plc);
         // 检测压
@@ -47,7 +45,6 @@ public class PLCUtils {
         String loopTime = Math.round(plc.readInt16("VW850") / 10.0) + "";
 
         QmParam qmParam = new QmParam();
-        qmParam.setLeakVal(leakageValue);
         qmParam.setLeakRateUnit("kPa");
         qmParam.setLeakValUnit("kPa");
         qmParam.setTestPressure(pressure);
@@ -58,6 +55,25 @@ public class PLCUtils {
         qmParam.setCsDuration(detectTime);
         qmParam.setDeviceType(MesClient.csyq);
         qmParam.setTestPace(loopTime);
+        long start = System.currentTimeMillis();
+        final long MAX_WAIT = 3000;
+        while (true){
+            leakageValue = plc.readString("VB307", 7);
+            // 条件1：读取到非空，直接跳出循环
+            if (leakageValue != null && !leakageValue.trim().isEmpty()) {
+                break;
+            }
+            long now = System.currentTimeMillis();
+            if (now - start >= MAX_WAIT) {
+                break;
+            }
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+                break;
+            }
+        }
+        qmParam.setLeakVal(leakageValue);
         return qmParam;
     }