This commit is contained in:
linfso 2024-08-01 01:25:12 +08:00
parent e147e59f7e
commit 7b281cabb8

View File

@ -1732,17 +1732,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
recieveAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode()); recieveAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
recieveAddress.setAddressType("2"); recieveAddress.setAddressType("2");
// 计算单据归属 // 计算订单归属
String customerCode=null; String customerCode=emisWaybillSave.getCustomerCode();
String customerName=null; String customerName=emisWaybillSave.getCustomerName();
if(StringUtils.isEmpty(customerCode)) {
// 通过电话判断客户是否存在 // 通过电话判断客户是否存在
String sendPhone=getCompletePhone(sendAddress.getPhone()); String sendPhone = getCompletePhone(sendAddress.getPhone());
EmisCustomerUser emisCustomerUser=getCustomerUserByPhone(sendPhone); EmisCustomerUser emisCustomerUser = getCustomerUserByPhone(sendPhone);
if(emisCustomerUser!=null){ if (emisCustomerUser != null) {
customerCode=emisCustomerUser.getCustomerCode(); customerCode = emisCustomerUser.getCustomerCode();
customerName=emisCustomerUser.getCustomerName(); customerName = emisCustomerUser.getCustomerName();
}else{ } else {
// 先创建客户 // 先创建客户
EmisCustomerUser newEmisCustomerUser = new EmisCustomerUser(); EmisCustomerUser newEmisCustomerUser = new EmisCustomerUser();
newEmisCustomerUser.setCustomerName(sendAddress.getName()); newEmisCustomerUser.setCustomerName(sendAddress.getName());
@ -1767,11 +1768,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 预置主归属网点 // 预置主归属网点
newEmisCustomerUser.setOwnerSite(emisWaybillSave.getSendSiteCode()); newEmisCustomerUser.setOwnerSite(emisWaybillSave.getSendSiteCode());
EmisCustomerUser newUser=createCustomerUser(newEmisCustomerUser); EmisCustomerUser newUser = createCustomerUser(newEmisCustomerUser);
customerCode = newUser.getCustomerCode(); customerCode = newUser.getCustomerCode();
customerName = newUser.getCustomerName(); customerName = newUser.getCustomerName();
} }
}
@ -1889,9 +1891,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setSendCounty(" "); emisWaybillSave.setSendCounty(" ");
} }
} }
/** /**