From cc9af40ceab8371069676643809b7b2d9cabbd6d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 4 Aug 2024 17:16:38 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/utils/WaybillHelper.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index 1c8ff2829..d8b438116 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -14,7 +14,9 @@ import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.net.URLDecoder;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -264,6 +266,11 @@ public class WaybillHelper {
      */
     public static String formatQueryValue(String str) {
         if(!StringUtils.isEmpty(str)){
+            try {
+                str= URLDecoder.decode(str,"UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
             str=str.replaceAll("\\n", ",");
             str=str.replaceAll("\\r", ",");
             str=str.replaceAll("\\t", ",");
@@ -346,8 +353,8 @@ public class WaybillHelper {
 //            System.out.print(mainBillCode);
 
 
-            String m1="T70803000087660003\n" +
-                    "T70803000087660004";
+            String m1="T7080300117632\n" +
+                    "T7080300001794";
             System.out.println(m1);
             String m2 = WaybillHelper.formatQueryValue(m1);
             System.out.println(m2);