feat（wms）：完善往来企业

YunaiV
1 parent 338d8345
Showing 10 changed files with 576 additions and 2 deletions
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/WmsMerchantController.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantRespVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantSaveReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/merchant/WmsMerchantDO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/md/WmsMerchantTypeEnum.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java
+package cn.iocoder.yudao.module.wms.controller.admin.md.merchant;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantRespVO;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO;
+import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
+import cn.iocoder.yudao.module.wms.service.md.merchant.WmsMerchantService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - WMS 往来企业")
+@RestController
+@RequestMapping("/wms/merchant")
+@Validated
+public class WmsMerchantController {
+
+    @Resource
+    private WmsMerchantService merchantService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建往来企业")
+    @PreAuthorize("@ss.hasPermission('wms:merchant:create')")
+    public CommonResult<Long> createMerchant(@Valid @RequestBody WmsMerchantSaveReqVO createReqVO) {
+        return success(merchantService.createMerchant(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新往来企业")
+    @PreAuthorize("@ss.hasPermission('wms:merchant:update')")
+    public CommonResult<Boolean> updateMerchant(@Valid @RequestBody WmsMerchantSaveReqVO updateReqVO) {
+        merchantService.updateMerchant(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除往来企业")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:merchant:delete')")
+    public CommonResult<Boolean> deleteMerchant(@RequestParam("id") Long id) {
+        merchantService.deleteMerchant(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得往来企业")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:merchant:query')")
+    public CommonResult<WmsMerchantRespVO> getMerchant(@RequestParam("id") Long id) {
+        WmsMerchantDO merchant = merchantService.getMerchant(id);
+        return success(BeanUtils.toBean(merchant, WmsMerchantRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得往来企业分页")
+    @PreAuthorize("@ss.hasPermission('wms:merchant:query')")
+    public CommonResult<PageResult<WmsMerchantRespVO>> getMerchantPage(@Valid WmsMerchantPageReqVO pageReqVO) {
+        PageResult<WmsMerchantDO> pageResult = merchantService.getMerchantPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, WmsMerchantRespVO.class));
+    }
+
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得往来企业精简列表", description = "主要用于前端下拉")
+    @PreAuthorize("@ss.hasPermission('wms:merchant:query')")
+    public CommonResult<List<WmsMerchantRespVO>> getMerchantSimpleList(@Valid WmsMerchantPageReqVO pageReqVO) {
+        List<WmsMerchantDO> list = merchantService.getMerchantList(pageReqVO);
+        return success(BeanUtils.toBean(list, WmsMerchantRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出往来企业 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:merchant:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportMerchantExcel(@Valid WmsMerchantPageReqVO pageReqVO,
+                                    HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<WmsMerchantDO> list = merchantService.getMerchantPage(pageReqVO).getList();
+        ExcelUtils.write(response, "往来企业.xls", "数据", WmsMerchantRespVO.class,
+                BeanUtils.toBean(list, WmsMerchantRespVO.class));
+    }
+
+}
+package cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - WMS 往来企业分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class WmsMerchantPageReqVO extends PageParam {
+
+    @Schema(description = "往来企业编号", example = "MER001")
+    private String code;
+
+    @Schema(description = "往来企业名称", example = "华为")
+    private String name;
+
+    @Schema(description = "往来企业类型", example = "2")
+    @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}")
+    private Integer type;
+
+}
+package cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.wms.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - WMS 往来企业 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class WmsMerchantRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "往来企业编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "MER001")
+    @ExcelProperty("往来企业编号")
+    private String code;
+
+    @Schema(description = "往来企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "华为")
+    @ExcelProperty("往来企业名称")
+    private String name;
+
+    @Schema(description = "往来企业类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "往来企业类型", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.MERCHANT_TYPE)
+    private Integer type;
+
+    @Schema(description = "级别", example = "A")
+    @ExcelProperty("级别")
+    private String level;
+
+    @Schema(description = "开户行", example = "招商银行")
+    private String bankName;
+
+    @Schema(description = "银行账户", example = "6225888888888888")
+    private String bankAccount;
+
+    @Schema(description = "地址", example = "深圳市南山区")
+    private String address;
+
+    @Schema(description = "手机号", example = "15601691300")
+    private String mobile;
+
+    @Schema(description = "座机号", example = "0755-88888888")
+    private String telephone;
+
+    @Schema(description = "联系人", example = "王五")
+    @ExcelProperty("联系人")
+    private String contact;
+
+    @Schema(description = "Email", example = "wms@example.com")
+    private String email;
+
+    @Schema(description = "备注", example = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}
+package cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Schema(description = "管理后台 - WMS 往来企业创建/更新 Request VO")
+@Data
+public class WmsMerchantSaveReqVO {
+
+    @Schema(description = "编号", example = "1024")
+    private Long id;
+
+    @Schema(description = "往来企业编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "MER001")
+    @NotBlank(message = "往来企业编号不能为空")
+    @Size(max = 20, message = "往来企业编号长度不能超过 20 个字符")
+    private String code;
+
+    @Schema(description = "往来企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "华为")
+    @NotBlank(message = "往来企业名称不能为空")
+    @Size(max = 60, message = "往来企业名称长度不能超过 60 个字符")
+    private String name;
+
+    @Schema(description = "往来企业类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "往来企业类型不能为空")
+    @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}")
+    private Integer type;
+
+    @Schema(description = "级别", example = "A")
+    @Size(max = 10, message = "级别长度不能超过 10 个字符")
+    private String level;
+
+    @Schema(description = "开户行", example = "招商银行")
+    @Size(max = 255, message = "开户行长度不能超过 255 个字符")
+    private String bankName;
+
+    @Schema(description = "银行账户", example = "6225888888888888")
+    @Size(max = 40, message = "银行账户长度不能超过 40 个字符")
+    private String bankAccount;
+
+    @Schema(description = "地址", example = "深圳市南山区")
+    @Size(max = 200, message = "地址长度不能超过 200 个字符")
+    private String address;
+
+    @Schema(description = "手机号", example = "15601691300")
+    @Size(max = 13, message = "手机号长度不能超过 13 个字符")
+    private String mobile;
+
+    @Schema(description = "座机号", example = "0755-88888888")
+    @Size(max = 13, message = "座机号长度不能超过 13 个字符")
+    private String telephone;
+
+    @Schema(description = "联系人", example = "王五")
+    @Size(max = 30, message = "联系人长度不能超过 30 个字符")
+    private String contact;
+
+    @Schema(description = "Email", example = "wms@example.com")
+    @Size(max = 50, message = "Email 长度不能超过 50 个字符")
+    private String email;
+
+    @Schema(description = "备注", example = "备注")
+    @Size(max = 255, message = "备注长度不能超过 255 个字符")
+    private String remark;
+
+}
+package cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * WMS 往来企业 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("wms_merchant")
+@KeySequence("wms_merchant_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WmsMerchantDO extends BaseDO {
+
+    /**
+     * 主键编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 往来企业编号
+     */
+    private String code;
+    /**
+     * 往来企业名称
+     */
+    private String name;
+    /**
+     * 往来企业类型
+     *
+     * DONE @AI：枚举类
+     *
+     * 枚举 {@link WmsMerchantTypeEnum}
+     */
+    private Integer type;
+    /**
+     * 级别
+     */
+    private String level;
+    /**
+     * 开户行
+     */
+    private String bankName;
+    /**
+     * 银行账户
+     */
+    private String bankAccount;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 座机号
+     */
+    private String telephone;
+    /**
+     * 联系人
+     */
+    private String contact;
+    /**
+     * Email
+     */
+    private String email;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
+package cn.iocoder.yudao.module.wms.dal.mysql.md.merchant;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
+import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * WMS 往来企业 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface WmsMerchantMapper extends BaseMapperX<WmsMerchantDO> {
+
+    default PageResult<WmsMerchantDO> selectPage(WmsMerchantPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<WmsMerchantDO>()
+                .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode())
+                .likeIfPresent(WmsMerchantDO::getName, reqVO.getName())
+                .eqIfPresent(WmsMerchantDO::getType, reqVO.getType())
+                .orderByDesc(WmsMerchantDO::getId));
+    }
+
+    default List<WmsMerchantDO> selectList(WmsMerchantPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<WmsMerchantDO>()
+                .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode())
+                .likeIfPresent(WmsMerchantDO::getName, reqVO.getName())
+                .eqIfPresent(WmsMerchantDO::getType, reqVO.getType())
+                .orderByDesc(WmsMerchantDO::getId));
+    }
+
+}
@@ -43,7 +43,7 @@ public interface ErrorCodeConstants {
     ErrorCode ITEM_SKU_NAME_DUPLICATE = new ErrorCode(1_060_104_003, "商品规格名称【{}】重复");
     ErrorCode ITEM_SKU_NOT_EXISTS = new ErrorCode(1_060_104_004, "商品规格不存在");
  
-    // ========== WMS 基础数据-供应商 1-060-105-000 ==========
-    ErrorCode MERCHANT_NOT_EXISTS = new ErrorCode(1_060_105_000, "供应商不存在");
+    // ========== WMS 基础数据-往来企业 1-060-105-000 ==========
+    ErrorCode MERCHANT_NOT_EXISTS = new ErrorCode(1_060_105_000, "往来企业不存在");
  
 }
+package cn.iocoder.yudao.module.wms.enums.md;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * WMS 往来企业类型枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum WmsMerchantTypeEnum implements ArrayValuable<Integer> {
+
+    CUSTOMER(1, "客户"),
+    SUPPLIER(2, "供应商"),
+    CUSTOMER_SUPPLIER(3, "客户/供应商");
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(WmsMerchantTypeEnum::getType).toArray(Integer[]::new);
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+    /**
+     * 名称
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}
+package cn.iocoder.yudao.module.wms.service.md.merchant;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO;
+import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * WMS 往来企业 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface WmsMerchantService {
+
+    /**
+     * 创建往来企业
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createMerchant(@Valid WmsMerchantSaveReqVO createReqVO);
+
+    /**
+     * 更新往来企业
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateMerchant(@Valid WmsMerchantSaveReqVO updateReqVO);
+
+    /**
+     * 删除往来企业
+     *
+     * @param id 编号
+     */
+    void deleteMerchant(Long id);
+
+    /**
+     * 校验往来企业存在
+     *
+     * @param id 编号
+     * @return 往来企业
+     */
+    WmsMerchantDO validateMerchantExists(Long id);
+
+    /**
+     * 获得往来企业
+     *
+     * @param id 编号
+     * @return 往来企业
+     */
+    WmsMerchantDO getMerchant(Long id);
+
+    /**
+     * 获得往来企业分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 往来企业分页
+     */
+    PageResult<WmsMerchantDO> getMerchantPage(WmsMerchantPageReqVO pageReqVO);
+
+    /**
+     * 获得往来企业列表
+     *
+     * @param pageReqVO 查询条件
+     * @return 往来企业列表
+     */
+    List<WmsMerchantDO> getMerchantList(WmsMerchantPageReqVO pageReqVO);
+
+}
+package cn.iocoder.yudao.module.wms.service.md.merchant;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO;
+import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
+import cn.iocoder.yudao.module.wms.dal.mysql.md.merchant.WmsMerchantMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MERCHANT_NOT_EXISTS;
+
+/**
+ * WMS 往来企业 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class WmsMerchantServiceImpl implements WmsMerchantService {
+
+    @Resource
+    private WmsMerchantMapper merchantMapper;
+
+    @Override
+    public Long createMerchant(WmsMerchantSaveReqVO createReqVO) {
+        WmsMerchantDO merchant = BeanUtils.toBean(createReqVO, WmsMerchantDO.class);
+        merchantMapper.insert(merchant);
+        return merchant.getId();
+    }
+
+    @Override
+    public void updateMerchant(WmsMerchantSaveReqVO updateReqVO) {
+        // 校验存在
+        validateMerchantExists(updateReqVO.getId());
+
+        // 更新
+        WmsMerchantDO updateObj = BeanUtils.toBean(updateReqVO, WmsMerchantDO.class);
+        merchantMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteMerchant(Long id) {
+        // 校验存在
+        validateMerchantExists(id);
+        // TODO 入库/出库单实现后，校验往来企业不存在业务关联后再删除
+
+        // 删除
+        merchantMapper.deleteById(id);
+    }
+
+    @Override
+    public WmsMerchantDO validateMerchantExists(Long id) {
+        WmsMerchantDO merchant = merchantMapper.selectById(id);
+        if (merchant == null) {
+            throw exception(MERCHANT_NOT_EXISTS);
+        }
+        return merchant;
+    }
+
+    @Override
+    public WmsMerchantDO getMerchant(Long id) {
+        return merchantMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<WmsMerchantDO> getMerchantPage(WmsMerchantPageReqVO pageReqVO) {
+        return merchantMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<WmsMerchantDO> getMerchantList(WmsMerchantPageReqVO pageReqVO) {
+        return merchantMapper.selectList(pageReqVO);
+    }
+
+}