Browse Source

泄露值提交参数

wangxichen 16 hours ago
parent
commit
1118056380
2 changed files with 11 additions and 1 deletions
  1. 3 1
      src/com/mes/plc/HeliumFlow.java
  2. 8 0
      src/com/mes/ui/DataUtil.java

+ 3 - 1
src/com/mes/plc/HeliumFlow.java

@@ -174,9 +174,11 @@ public class HeliumFlow {
 
         // 设备判定结果点位待补,当前按 OK 提交
         String result = "OK";
+        // ps 段格式:首字符 Y/N 表示结果,后面是值
+        String ps = leak.isEmpty() ? null : ("Y" + leak);
         ui.setState("上传中", StationPanel.STATE_BUSY);
         MesClient.getUser();
-        JSONObject ret = DataUtil.sendQuality(currentSn, result, MesClient.user20);
+        JSONObject ret = DataUtil.sendQuality(currentSn, result, MesClient.user20, ps);
         boolean ok = ret != null && "true".equalsIgnoreCase(String.valueOf(ret.get("result")));
         if (ok) {
             ui.setResult(result);

+ 8 - 0
src/com/mes/ui/DataUtil.java

@@ -62,6 +62,11 @@ public class DataUtil {
     }
 
     public static JSONObject sendQuality(String sn,String ret,String user){
+        return sendQuality(sn, ret, user, null);
+    }
+
+    /** ps 为工艺参数报文,多段用 | 分隔,每段首字符 Y/N 表示结果,如 Y3.33E-08 */
+    public static JSONObject sendQuality(String sn,String ret,String user,String ps){
         try{
             String enconding = "UTF-8";
             InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
@@ -73,6 +78,9 @@ public class DataUtil {
             String lineSn = pro.getProperty("mes.line_sn").trim();
             String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductRecord/pcresult";
             String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&result="+ret+"&ucode="+user;
+            if (ps != null && !ps.isEmpty()) {
+                params += "&ps=" + URLEncoder.encode(ps, enconding);
+            }
             log.info("params="+params);
             String result = doPost(url,params);
             log.info("result="+result);