Jelajahi Sumber

Merge branch 'develop' into develop-green

hu 1 bulan lalu
induk
melakukan
1467bc754f
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      src/custom/utility/ERPDocking.java

+ 2 - 2
src/custom/utility/ERPDocking.java

@@ -264,7 +264,7 @@ public class ERPDocking extends BaseClass {
             objectdetail.put("fagentname", dispatchRow.getString("enterprisename"));
             objectdetail.put("fsonum", dispatchRow.getString("sonum"));
             objectdetail.put("fdate", dispatchRow.getString("billdate"));
-            objectdetail.put("fnotes", dispatchRow.getString("remarks"));
+            objectdetail.put("fnotes", dispatchRow.getString("remarks").replaceAll("%(?![0-9a-fA-F]{2})", "%25").replaceAll("\\+", "%2B"));
             objectdetail.put("fcontact", dispatchRow.getString("name"));
             objectdetail.put("fmobilephone", dispatchRow.getString("phonenumber"));
             objectdetail.put("faddress", dispatchRow.getString("address"));
@@ -279,7 +279,7 @@ public class ERPDocking extends BaseClass {
                     jsonObject.put("frownum", row.getString("rowno"));
                     jsonObject.put("fqty", row.getString("qty"));
                     jsonObject.put("fprice", row.getString("price"));
-                    jsonObject.put("fremarks", row.getString("remarks"));
+                    jsonObject.put("fremarks", row.getString("remarks").replaceAll("%(?![0-9a-fA-F]{2})", "%25").replaceAll("\\+", "%2B"));
                     jsonArray.add(jsonObject);
                 }
             }