aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-01 01:25:12 +08:00
parent e147e59f7e
commit 7b281cabb8
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

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