This commit is contained in:
linfso 2024-06-01 11:39:19 +08:00
parent d4cfe1b7be
commit 988f82fa8d

View File

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