From a3dd1311b1af848fc108795fef4c664467015703 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 1 Jun 2024 14:42:24 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 23 ++++++++++---------
 .../xdadan/erp/emis/utils/WaybillHelper.java  | 10 ++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 4cfff9811..78af3b0b2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -13,6 +13,7 @@ package com.xdadan.erp.emis.service;
  import cn.hutool.core.collection.CollectionUtil;
  import cn.hutool.core.lang.Snowflake;
  import cn.hutool.core.util.IdUtil;
+ import cn.hutool.db.DbUtil;
  import com.alibaba.fastjson.JSON;
  import com.alibaba.fastjson.JSONObject;
  import com.alibaba.fastjson.serializer.PropertyFilter;
@@ -550,10 +551,10 @@ public class EmisBaseService {
          order.put("package3dm", package3dm);
 
          // 如果是子单收件人信息需要加密
-         String address=waybill.getReceiveAddress();
-         String company=waybill.getReceiveCompany();
-         String mobile=waybill.getReceiveMobile();
-         String consignee=waybill.getReceiveName();
+         String address= WaybillHelper.removeUnSeeChar(waybill.getReceiveAddress());
+         String company=WaybillHelper.removeUnSeeChar(waybill.getReceiveCompany());
+         String mobile=WaybillHelper.removeUnSeeChar(waybill.getReceiveMobile());
+         String consignee=WaybillHelper.removeUnSeeChar(waybill.getReceiveName());
 
          if(isSubBill){
              address=Convert.chineseNameFirst(address);
@@ -574,12 +575,12 @@ public class EmisBaseService {
                  custName= custUser.getCustName();
              }
          }
-         order.put("custName", custName);
+         order.put("custName", WaybillHelper.removeUnSeeChar(custName));
 
-         order.put("sendAddress", waybill.getSendAddress());
-         order.put("sendCompany", waybill.getSendCompany());
-         order.put("sendMobile", waybill.getSendMobile());
-         order.put("sendPerson", waybill.getSendName());
+         order.put("sendAddress", WaybillHelper.removeUnSeeChar(waybill.getSendAddress()));
+         order.put("sendCompany", WaybillHelper.removeUnSeeChar(waybill.getSendCompany()));
+         order.put("sendMobile", WaybillHelper.removeUnSeeChar(waybill.getSendMobile()));
+         order.put("sendPerson", WaybillHelper.removeUnSeeChar(waybill.getSendName()));
          order.put("sendDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate()));
 
          // k1 - 收件国(中文)
@@ -609,8 +610,8 @@ public class EmisBaseService {
 
          order.put("extData",extData.toJSONString());
          order.put("qrCodeText",extData.toJSONString());
-         order.put("goodsInfo", waybill.getGoodsInfo());
-         order.put("remark", waybill.getRemark());
+         order.put("goodsInfo", WaybillHelper.removeUnSeeChar(waybill.getGoodsInfo()));
+         order.put("remark", WaybillHelper.removeUnSeeChar(waybill.getRemark()));
 
          String billWeight="0.0";
          String totalVolume="0.0";
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 261622b01..0b37e4fd1 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
@@ -232,4 +232,14 @@ public class WaybillHelper {
             return value;
         }, SerializerFeature.WriteMapNullValue);
     }
+
+
+    public static String removeUnSeeChar(String str) {
+       if(!StringUtils.isEmpty(str)){
+           return str.replaceAll("\\p{C}", "");
+       }
+
+       return str;
+    }
+
 }