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 3e08422e7..61f13b563 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 @@ -550,7 +550,7 @@ public class EmisBaseService { String consignee=waybill.getReceiveName(); if(isSubBill){ - address=Convert.address(address); + address=Convert.chineseNameFirst(address); mobile=Convert.mobile(mobile); consignee=Convert.chineseNameFirst(consignee); company=Convert.chineseNameFirst(company); @@ -561,7 +561,7 @@ public class EmisBaseService { order.put("mobile", mobile); order.put("consignee", consignee); - String custName=waybill.getReceiveCompany(); + String custName=""; if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) || "5".equals(waybill.getPaymentType()) ) { EmisCustomerUser custUser=getCustomerUserByMonthlyPayCode(waybill.getCustNo()); if(custUser!=null){