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

View File

@ -1732,45 +1732,47 @@ 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()); // 通过电话判断客户是否存在
EmisCustomerUser emisCustomerUser=getCustomerUserByPhone(sendPhone); String sendPhone = getCompletePhone(sendAddress.getPhone());
if(emisCustomerUser!=null){ EmisCustomerUser emisCustomerUser = getCustomerUserByPhone(sendPhone);
customerCode=emisCustomerUser.getCustomerCode(); if (emisCustomerUser != null) {
customerName=emisCustomerUser.getCustomerName(); customerCode = emisCustomerUser.getCustomerCode();
}else{ customerName = emisCustomerUser.getCustomerName();
// 先创建客户 } else {
EmisCustomerUser newEmisCustomerUser = new EmisCustomerUser(); // 先创建客户
newEmisCustomerUser.setCustomerName(sendAddress.getName()); EmisCustomerUser newEmisCustomerUser = new EmisCustomerUser();
newEmisCustomerUser.setCountry(sendAddress.getCountry()); newEmisCustomerUser.setCustomerName(sendAddress.getName());
newEmisCustomerUser.setPhone(sendPhone); newEmisCustomerUser.setCountry(sendAddress.getCountry());
newEmisCustomerUser.setProvince(sendAddress.getProvince()); newEmisCustomerUser.setPhone(sendPhone);
newEmisCustomerUser.setCity(sendAddress.getCity()); newEmisCustomerUser.setProvince(sendAddress.getProvince());
newEmisCustomerUser.setCounty(sendAddress.getCounty()); newEmisCustomerUser.setCity(sendAddress.getCity());
newEmisCustomerUser.setTown(sendAddress.getTown()); newEmisCustomerUser.setCounty(sendAddress.getCounty());
newEmisCustomerUser.setEmail(sendAddress.getEmail()); newEmisCustomerUser.setTown(sendAddress.getTown());
newEmisCustomerUser.setAddress(sendAddress.getAddress()); newEmisCustomerUser.setEmail(sendAddress.getEmail());
newEmisCustomerUser.setCompany(sendAddress.getCompany()); newEmisCustomerUser.setAddress(sendAddress.getAddress());
newEmisCustomerUser.setCustomerType("1"); newEmisCustomerUser.setCompany(sendAddress.getCompany());
newEmisCustomerUser.setSettledType("1"); newEmisCustomerUser.setCustomerType("1");
newEmisCustomerUser.setUserType("1"); newEmisCustomerUser.setSettledType("1");
newEmisCustomerUser.setUserType("1");
newEmisCustomerUser.setBlOpenOms("0"); newEmisCustomerUser.setBlOpenOms("0");
newEmisCustomerUser.setRemark("开单自动生成的现金用户"); newEmisCustomerUser.setRemark("开单自动生成的现金用户");
newEmisCustomerUser.setSalesmen(emisWaybillSave.getSalesmen()); newEmisCustomerUser.setSalesmen(emisWaybillSave.getSalesmen());
newEmisCustomerUser.setPayee(emisWaybillSave.getPayee()); newEmisCustomerUser.setPayee(emisWaybillSave.getPayee());
// 预置主归属网点 // 预置主归属网点
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(" ");
} }
} }
/** /**