From d497f61c48ecf72fab238634c36268e39680e878 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 21 Aug 2025 17:30:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增客户基础信息相关的实体类、BO、VO、Mapper、Service、Controller等 - 实现客户基础信息的增删查改功能 - 添加分页查询、导出Excel等功能 --- .../controller/WmsBaseCustomerController.java | 117 +++++++++++++++ .../dromara/wms/domain/WmsBaseCustomer.java | 76 ++++++++++ .../wms/domain/bo/WmsBaseCustomerBo.java | 77 ++++++++++ .../wms/domain/vo/WmsBaseCustomerVo.java | 93 ++++++++++++ .../wms/mapper/WmsBaseCustomerMapper.java | 15 ++ .../wms/service/IWmsBaseCustomerService.java | 69 +++++++++ .../impl/WmsBaseCustomerServiceImpl.java | 140 ++++++++++++++++++ .../mapper/wms/WmsBaseCustomerMapper.xml | 7 + 8 files changed, 594 insertions(+) create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsBaseCustomerController.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseCustomer.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseCustomerBo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseCustomerVo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsBaseCustomerMapper.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsBaseCustomerService.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseCustomerServiceImpl.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsBaseCustomerMapper.xml diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsBaseCustomerController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsBaseCustomerController.java new file mode 100644 index 0000000..724aead --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsBaseCustomerController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.wms.domain.vo.WmsBaseCustomerVo; +import org.dromara.wms.domain.bo.WmsBaseCustomerBo; +import org.dromara.wms.service.IWmsBaseCustomerService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 客户基础信息 + * 前端访问路由地址为:/wms/wmsBaseCustomer + * + * @author zch + * @date 2025-08-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wmsBaseCustomer") +public class WmsBaseCustomerController extends BaseController { + + private final IWmsBaseCustomerService wmsBaseCustomerService; + + /** + * 查询客户基础信息列表 + */ + @SaCheckPermission("wms:wmsBaseCustomer:list") + @GetMapping("/list") + public TableDataInfo list(WmsBaseCustomerBo bo, PageQuery pageQuery) { + return wmsBaseCustomerService.queryPageList(bo, pageQuery); + } + + /** + * 导出客户基础信息列表 + */ + @SaCheckPermission("wms:wmsBaseCustomer:export") + @Log(title = "客户基础信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsBaseCustomerBo bo, HttpServletResponse response) { + List list = wmsBaseCustomerService.queryList(bo); + ExcelUtil.exportExcel(list, "客户基础信息", WmsBaseCustomerVo.class, response); + } + + /** + * 获取客户基础信息详细信息 + * + * @param customerId 主键 + */ + @SaCheckPermission("wms:wmsBaseCustomer:query") + @GetMapping("/{customerId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long customerId) { + return R.ok(wmsBaseCustomerService.queryById(customerId)); + } + + /** + * 新增客户基础信息 + */ + @SaCheckPermission("wms:wmsBaseCustomer:add") + @Log(title = "客户基础信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsBaseCustomerBo bo) { + return toAjax(wmsBaseCustomerService.insertByBo(bo)); + } + + /** + * 修改客户基础信息 + */ + @SaCheckPermission("wms:wmsBaseCustomer:edit") + @Log(title = "客户基础信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsBaseCustomerBo bo) { + return toAjax(wmsBaseCustomerService.updateByBo(bo)); + } + + /** + * 删除客户基础信息 + * + * @param customerIds 主键串 + */ + @SaCheckPermission("wms:wmsBaseCustomer:remove") + @Log(title = "客户基础信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{customerIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] customerIds) { + return toAjax(wmsBaseCustomerService.deleteWithValidByIds(List.of(customerIds), true)); + } + + + /** + * 下拉框查询客户基础信息列表 + */ + + @GetMapping("/getWmsBaseCustomerList") + public R> getWmsBaseCustomerList(WmsBaseCustomerBo bo) { + List list = wmsBaseCustomerService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseCustomer.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseCustomer.java new file mode 100644 index 0000000..d7cbc83 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseCustomer.java @@ -0,0 +1,76 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 客户基础信息对象 wms_base_customer + * + * @author zch + * @date 2025-08-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_base_customer") +public class WmsBaseCustomer extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + @TableId(value = "customer_id", type = IdType.AUTO) + private Long customerId; + + /** + * 客户编码 + */ + private String customerCode; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 联系人 + */ + private String contactPerson; + + /** + * 联系电话 + */ + private String contactPhone; + + /** + * 地址 + */ + private String address; + + /** + * 传真 + */ + private String fax; + + /** + * 邮箱 + */ + private String email; + + /** + * 状态（0启用 1停用） + */ + private String status; + + /** + * 备注信息 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseCustomerBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseCustomerBo.java new file mode 100644 index 0000000..f6eaf20 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseCustomerBo.java @@ -0,0 +1,77 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.wms.domain.WmsBaseCustomer; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 客户基础信息业务对象 wms_base_customer + * + * @author zch + * @date 2025-08-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsBaseCustomer.class, reverseConvertGenerate = false) +public class WmsBaseCustomerBo extends BaseEntity { + + /** + * 客户ID + */ + private Long customerId; + + /** + * 客户编码 + */ + @NotBlank(message = "客户编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String customerCode; + + /** + * 客户名称 + */ + @NotBlank(message = "客户名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String customerName; + + /** + * 联系人 + */ + private String contactPerson; + + /** + * 联系电话 + */ + private String contactPhone; + + /** + * 地址 + */ + private String address; + + /** + * 传真 + */ + private String fax; + + /** + * 邮箱 + */ + private String email; + + /** + * 状态（0启用 1停用） + */ + @NotBlank(message = "状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 备注信息 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseCustomerVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseCustomerVo.java new file mode 100644 index 0000000..cc68dc9 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseCustomerVo.java @@ -0,0 +1,93 @@ +package org.dromara.wms.domain.vo; + +import org.dromara.wms.domain.WmsBaseCustomer; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 客户基础信息视图对象 wms_base_customer + * + * @author zch + * @date 2025-08-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsBaseCustomer.class) +public class WmsBaseCustomerVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + @ExcelProperty(value = "客户ID") + private Long customerId; + + /** + * 客户编码 + */ + @ExcelProperty(value = "客户编码") + private String customerCode; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称") + private String customerName; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String contactPerson; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String contactPhone; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String address; + + /** + * 传真 + */ + @ExcelProperty(value = "传真") + private String fax; + + /** + * 邮箱 + */ + @ExcelProperty(value = "邮箱") + private String email; + + /** + * 状态（0启用 1停用） + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String status; + + /** + * 备注信息 + */ + @ExcelProperty(value = "备注信息") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsBaseCustomerMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsBaseCustomerMapper.java new file mode 100644 index 0000000..2dbd50c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsBaseCustomerMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.wms.domain.WmsBaseCustomer; +import org.dromara.wms.domain.vo.WmsBaseCustomerVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 客户基础信息Mapper接口 + * + * @author zch + * @date 2025-08-21 + */ +public interface WmsBaseCustomerMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsBaseCustomerService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsBaseCustomerService.java new file mode 100644 index 0000000..654571d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsBaseCustomerService.java @@ -0,0 +1,69 @@ +package org.dromara.wms.service; + +import org.dromara.wms.domain.WmsBaseCustomer; +import org.dromara.wms.domain.vo.WmsBaseCustomerVo; +import org.dromara.wms.domain.bo.WmsBaseCustomerBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 客户基础信息Service接口 + * + * @author zch + * @date 2025-08-21 + */ +public interface IWmsBaseCustomerService { + + /** + * 查询客户基础信息 + * + * @param customerId 主键 + * @return 客户基础信息 + */ + WmsBaseCustomerVo queryById(Long customerId); + + /** + * 分页查询客户基础信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户基础信息分页列表 + */ + TableDataInfo queryPageList(WmsBaseCustomerBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的客户基础信息列表 + * + * @param bo 查询条件 + * @return 客户基础信息列表 + */ + List queryList(WmsBaseCustomerBo bo); + + /** + * 新增客户基础信息 + * + * @param bo 客户基础信息 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsBaseCustomerBo bo); + + /** + * 修改客户基础信息 + * + * @param bo 客户基础信息 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsBaseCustomerBo bo); + + /** + * 校验并批量删除客户基础信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseCustomerServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseCustomerServiceImpl.java new file mode 100644 index 0000000..c7289ec --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseCustomerServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.wms.domain.bo.WmsBaseCustomerBo; +import org.dromara.wms.domain.vo.WmsBaseCustomerVo; +import org.dromara.wms.domain.WmsBaseCustomer; +import org.dromara.wms.mapper.WmsBaseCustomerMapper; +import org.dromara.wms.service.IWmsBaseCustomerService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 客户基础信息Service业务层处理 + * + * @author zch + * @date 2025-08-21 + */ +@RequiredArgsConstructor +@Service +public class WmsBaseCustomerServiceImpl implements IWmsBaseCustomerService { + + private final WmsBaseCustomerMapper baseMapper; + + /** + * 查询客户基础信息 + * + * @param customerId 主键 + * @return 客户基础信息 + */ + @Override + public WmsBaseCustomerVo queryById(Long customerId){ + return baseMapper.selectVoById(customerId); + } + + /** + * 分页查询客户基础信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户基础信息分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsBaseCustomerBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的客户基础信息列表 + * + * @param bo 查询条件 + * @return 客户基础信息列表 + */ + @Override + public List queryList(WmsBaseCustomerBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsBaseCustomerBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsBaseCustomer.class) + .selectAll(WmsBaseCustomer.class) + .eq(bo.getCustomerId() != null, WmsBaseCustomer::getCustomerId, bo.getCustomerId()) + .eq(StringUtils.isNotBlank(bo.getCustomerCode()), WmsBaseCustomer::getCustomerCode, bo.getCustomerCode()) + .like(StringUtils.isNotBlank(bo.getCustomerName()), WmsBaseCustomer::getCustomerName, bo.getCustomerName()) + .eq(StringUtils.isNotBlank(bo.getContactPerson()), WmsBaseCustomer::getContactPerson, bo.getContactPerson()) + .eq(StringUtils.isNotBlank(bo.getContactPhone()), WmsBaseCustomer::getContactPhone, bo.getContactPhone()) + .eq(StringUtils.isNotBlank(bo.getAddress()), WmsBaseCustomer::getAddress, bo.getAddress()) + .eq(StringUtils.isNotBlank(bo.getFax()), WmsBaseCustomer::getFax, bo.getFax()) + .eq(StringUtils.isNotBlank(bo.getEmail()), WmsBaseCustomer::getEmail, bo.getEmail()) + .eq(StringUtils.isNotBlank(bo.getStatus()), WmsBaseCustomer::getStatus, bo.getStatus()) + .orderByDesc(WmsBaseCustomer::getCreateTime); + return lqw; + } + + /** + * 新增客户基础信息 + * + * @param bo 客户基础信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsBaseCustomerBo bo) { + WmsBaseCustomer add = MapstructUtils.convert(bo, WmsBaseCustomer.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCustomerId(add.getCustomerId()); + } + return flag; + } + + /** + * 修改客户基础信息 + * + * @param bo 客户基础信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsBaseCustomerBo bo) { + WmsBaseCustomer update = MapstructUtils.convert(bo, WmsBaseCustomer.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsBaseCustomer entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除客户基础信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsBaseCustomerMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsBaseCustomerMapper.xml new file mode 100644 index 0000000..e99737a --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsBaseCustomerMapper.xml @@ -0,0 +1,7 @@ + + + + +