demand: tms/app运单录入、运单修改、运单批量录入、网点费用申请增加录入企业名称、企业税号的功能 tms/app运单录入、运单修改、运单批量录入、网点费用申请录入企业名称、企业税号后自动同步更新/新增到寄件人信息 tms-客户管理-寄件人地址-增加根据企业名称、企业税号模糊查询的功能,查询返回增加企业名称、企业税号,新增接口增加添加企业名称、企业税号的功能
committer: heyu
This commit is contained in:
parent
749a502276
commit
a6472173b8
@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
|
|
||||||
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
||||||
import com.xdadan.erp.common.core.domain.entity.SysUser;
|
import com.xdadan.erp.common.core.domain.entity.SysUser;
|
||||||
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
@ -60,7 +61,7 @@ public class EmisCustomerAddressController extends EmisBaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
// @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')")
|
// @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')")
|
||||||
@JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","town","townName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
@JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","town","townName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark","enterpriseName","enterpriseTaxId"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||||
@GetMapping("/listSimple")
|
@GetMapping("/listSimple")
|
||||||
public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress)
|
public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress)
|
||||||
{
|
{
|
||||||
@ -75,7 +76,7 @@ public class EmisCustomerAddressController extends EmisBaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@JacksonFilter(include= {"id","name","phone","country","province","city","county","address","postCode","email","company","countryName","provinceName","cityName","countyName","town","townName","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
@JacksonFilter(include= {"id","name","phone","country","province","city","county","address","postCode","email","company","countryName","provinceName","cityName","countyName","town","townName","blDefaultFlag","orderNum","createTime","remark","enterpriseName","enterpriseTaxId"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||||
@RequestMapping("/getAddressById")
|
@RequestMapping("/getAddressById")
|
||||||
public AjaxResult getAddressById(@RequestParam("id") Long id)
|
public AjaxResult getAddressById(@RequestParam("id") Long id)
|
||||||
{
|
{
|
||||||
@ -124,16 +125,14 @@ public class EmisCustomerAddressController extends EmisBaseController
|
|||||||
@PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:add')")
|
@PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:add')")
|
||||||
@Log(title = "客户收寄件地址", businessType = BusinessType.INSERT)
|
@Log(title = "客户收寄件地址", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public AjaxResult add(@RequestBody EmisCustomerAddress emisCustomerAddress)
|
public AjaxResult add(@RequestBody EmisCustomerAddress emisCustomerAddress) throws EmisBizError {
|
||||||
{
|
|
||||||
|
|
||||||
return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress));
|
return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Log(title = "客户收寄件地址", businessType = BusinessType.INSERT)
|
@Log(title = "客户收寄件地址", businessType = BusinessType.INSERT)
|
||||||
@PostMapping("/addAddress")
|
@PostMapping("/addAddress")
|
||||||
public AjaxResult addAddress(@RequestBody EmisCustomerAddress emisCustomerAddress)
|
public AjaxResult addAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) throws EmisBizError {
|
||||||
{
|
|
||||||
String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode();
|
String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode();
|
||||||
emisCustomerAddress.setUseSiteCode(ownerSiteCode);
|
emisCustomerAddress.setUseSiteCode(ownerSiteCode);
|
||||||
emisCustomerAddress.setUseSite(ownerSiteCode);
|
emisCustomerAddress.setUseSite(ownerSiteCode);
|
||||||
|
|||||||
@ -11,6 +11,7 @@ package com.xdadan.erp.emis.service;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import com.xdadan.erp.emis.domain.EmisCustomerAddress;
|
import com.xdadan.erp.emis.domain.EmisCustomerAddress;
|
||||||
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ClassName EmisCustomerAddressService
|
* @ClassName EmisCustomerAddressService
|
||||||
@ -41,7 +42,7 @@ public interface IEmisCustomerAddressService
|
|||||||
* @param emisCustomerAddress 客户收寄件地址
|
* @param emisCustomerAddress 客户收寄件地址
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress);
|
public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改客户收寄件地址
|
* 修改客户收寄件地址
|
||||||
|
|||||||
@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
import com.xdadan.erp.emis.service.EmisBaseService;
|
import com.xdadan.erp.emis.service.EmisBaseService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -62,15 +63,14 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress)
|
public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError {
|
||||||
{
|
|
||||||
// 新增地址
|
// 新增地址
|
||||||
emisCustomerAddress.preInsert();
|
emisCustomerAddress.preInsert();
|
||||||
emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode());
|
emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode());
|
||||||
emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName());
|
emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName());
|
||||||
|
|
||||||
// 创建用户
|
// 创建用户
|
||||||
return emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddress);
|
return createCustomerAddressNew(emisCustomerAddress);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user