From a6472173b8b411a19edbcaae5013c3b033650f86 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 25 Aug 2025 16:04:54 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20tms/app=E8=BF=90=E5=8D=95=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BD=95=E5=85=A5=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=20tms/app=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81=E7=BD=91?= =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E5=90=8E=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0/=E6=96=B0=E5=A2=9E=E5=88=B0=E5=AF=84?= =?UTF-8?q?=E4=BB=B6=E4=BA=BA=E4=BF=A1=E6=81=AF=20=20=20tms-=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86-=E5=AF=84=E4=BB=B6=E4=BA=BA?= =?UTF-8?q?=E5=9C=B0=E5=9D=80-=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B7=BB=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../emis/EmisCustomerAddressController.java | 17 +++++++------ .../service/IEmisCustomerAddressService.java | 21 ++++++++-------- .../impl/EmisCustomerAddressServiceImpl.java | 24 +++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java index a17a78170..2185207cd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisCustomerAddressController.java * @author linfso * @date 2024-03-01 04:47:51 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

客户收寄件地址 控制器

*/ @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -33,7 +34,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerAddressService; /** * 客户收寄件地址Controller - * + * * @author linfso * @date 2024-03-01 04:47:51 */ @@ -60,7 +61,7 @@ public class EmisCustomerAddressController extends EmisBaseController } // @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") 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") public AjaxResult getAddressById(@RequestParam("id") Long id) { @@ -124,16 +125,14 @@ public class EmisCustomerAddressController extends EmisBaseController @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:add')") @Log(title = "客户收寄件地址", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody EmisCustomerAddress emisCustomerAddress) - { + public AjaxResult add(@RequestBody EmisCustomerAddress emisCustomerAddress) throws EmisBizError { return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); } @Log(title = "客户收寄件地址", businessType = BusinessType.INSERT) @PostMapping("/addAddress") - public AjaxResult addAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) - { + public AjaxResult addAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) throws EmisBizError { String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode(); emisCustomerAddress.setUseSiteCode(ownerSiteCode); emisCustomerAddress.setUseSite(ownerSiteCode); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java index 036576cc0..98de963d6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java @@ -1,16 +1,17 @@ - /** + /** * @Project: emis * @Title: EmisCustomerAddressService.java * @author linfso * @date 2024-03-01 04:47:51 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

客户收寄件地址 服务类接口

*/ package com.xdadan.erp.emis.service; import java.util.List; import com.xdadan.erp.emis.domain.EmisCustomerAddress; +import com.xdadan.erp.emis.domain.exception.EmisBizError; /** * @ClassName EmisCustomerAddressService @@ -18,18 +19,18 @@ import com.xdadan.erp.emis.domain.EmisCustomerAddress; * @author linfso * @date 2024-03-01 04:47:51 */ -public interface IEmisCustomerAddressService +public interface IEmisCustomerAddressService { /** * 主键查询 * @param id - * @return + * @return */ public EmisCustomerAddress selectEmisCustomerAddressById(Long id); /** * 查询客户收寄件地址列表 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 客户收寄件地址集合 */ @@ -37,15 +38,15 @@ public interface IEmisCustomerAddressService /** * 新增客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ - public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress); + public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError; /** * 修改客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ @@ -53,7 +54,7 @@ public interface IEmisCustomerAddressService /** * 批量删除客户收寄件地址 - * + * * @param ids 需要删除的客户收寄件地址主键集合 * @return 结果 */ @@ -61,7 +62,7 @@ public interface IEmisCustomerAddressService /** * 删除客户收寄件地址信息 - * + * * @param id 客户收寄件地址主键 * @return 结果 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java index dde2a0e4c..97fe2cb69 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisCustomerAddressServiceImpl.java * @author linfso * @date 2024-03-01 04:47:51 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

客户收寄件地址 实体类

*/ @@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; +import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,7 +22,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerAddressService; /** * 客户收寄件地址Service业务层处理 - * + * * @author linfso * @date 2024-03-01 04:47:51 */ @@ -33,7 +34,7 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I /** * 查询客户收寄件地址 - * + * * @param id 客户收寄件地址主键 * @return 客户收寄件地址 */ @@ -45,7 +46,7 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I /** * 查询客户收寄件地址列表 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 客户收寄件地址 */ @@ -57,25 +58,24 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I /** * 新增客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ @Override - public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) - { + public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError { // 新增地址 emisCustomerAddress.preInsert(); emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); // 创建用户 - return emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddress); + return createCustomerAddressNew(emisCustomerAddress); } /** * 修改客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ @@ -91,7 +91,7 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I /** * 批量删除客户收寄件地址 - * + * * @param ids 需要删除的客户收寄件地址主键 * @return 结果 */ @@ -103,7 +103,7 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I /** * 删除客户收寄件地址信息 - * + * * @param id 客户收寄件地址主键 * @return 结果 */