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 2e73d6b8c..0db6f4236 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 @@ -2564,34 +2564,6 @@ public class EmisBaseService { return emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddressNew); }else{ - // 重复则只修改,不增加 -// EmisCustomerAddress queryObj=new EmisCustomerAddress(); -// queryObj.setCounty(emisCustomerAddressNew.getCounty()); -// queryObj.setName(emisCustomerAddressNew.getName()); -// queryObj.setPhone(emisCustomerAddressNew.getPhone()); -// queryObj.setProvince(emisCustomerAddressNew.getProvince()); -// queryObj.setCity(emisCustomerAddressNew.getCity()); -// queryObj.setCounty(emisCustomerAddressNew.getCounty()); -// queryObj.setAddressType(emisCustomerAddressNew.getAddressType()); -// queryObj.setAddress(emisCustomerAddressNew.getAddress()); -// queryObj.setCompany(emisCustomerAddressNew.getCompany()); -// -// List existList=emisCustomerAddressMapper.selectExistAddressList(queryObj); -// // 重复数据需要修正地址的客户归属 -// if(existList!=null){ -// for (EmisCustomerAddress cusddress:existList) { -// if(StringUtils.isEmpty(cusddress.getCustomerCode())){ -// // 增加使用站点 -// String useSiteCode = emisCustomerAddressNew.getUseSiteCode(); -// if(useSiteCode.indexOf(emisCustomerAddressNew.getUseSiteCode())==-1){ -// cusddress.setUseSiteCode(useSiteCode+","+emisCustomerAddressNew.getUseSiteCode()); -// } -// cusddress.setCustomerCode(emisCustomerAddressNew.getCustomerCode()); -// emisCustomerAddressMapper.updateAddessCustomerCodeAndUseSite(cusddress); -// } -// } -// } - } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 027ab99d0..1c298f21f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1495,8 +1495,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 保存客户收件、寄件地址 - sendAddress.setCustomerCode(customerCode); - recieveAddress.setCustomerCode(customerCode); createCustomerAddress(sendAddress); createCustomerAddress(recieveAddress); @@ -1888,8 +1886,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 保存客户收件、寄件地址,开单不要关联客户地址数据 - sendAddress.setCustomerCode(customerCode); - recieveAddress.setCustomerCode(customerCode); createCustomerAddress(sendAddress); createCustomerAddress(recieveAddress); @@ -2271,8 +2267,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 保存客户收件、寄件地址,开单不要关联客户地址数据 - sendAddress.setCustomerCode(customerCode); - recieveAddress.setCustomerCode(customerCode); createCustomerAddress(sendAddress); createCustomerAddress(recieveAddress);