新增成品仓库页面

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmStoreController.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.dromara.wms.domain.bo.WmsPsmStoreBo;
+import org.dromara.wms.domain.vo.WmsPsmStoreVo;
+import org.dromara.wms.service.IWmsPsmStoreService;
+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.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 成品仓库管理
+ * 前端访问路由地址为:/system/psmStore
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/psmStore")
+public class WmsPsmStoreController extends BaseController {
+
+    private final IWmsPsmStoreService wmsPsmStoreService;
+
+    /**
+     * 查询成品仓库管理列表
+     */
+    @SaCheckPermission("system:psmStore:list")
+    @GetMapping("/list")
+    public TableDataInfo<WmsPsmStoreVo> list(WmsPsmStoreBo bo, PageQuery pageQuery) {
+        return wmsPsmStoreService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出成品仓库管理列表
+     */
+    @SaCheckPermission("system:psmStore:export")
+    @Log(title = "成品仓库管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WmsPsmStoreBo bo, HttpServletResponse response) {
+        List<WmsPsmStoreVo> list = wmsPsmStoreService.queryList(bo);
+        ExcelUtil.exportExcel(list, "成品仓库管理", WmsPsmStoreVo.class, response);
+    }
+
+    /**
+     * 获取成品仓库管理详细信息
+     *
+     * @param storeId 主键
+     */
+    @SaCheckPermission("system:psmStore:query")
+    @GetMapping("/{storeId}")
+    public R<WmsPsmStoreVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long storeId) {
+        return R.ok(wmsPsmStoreService.queryById(storeId));
+    }
+
+    /**
+     * 新增成品仓库管理
+     */
+    @SaCheckPermission("system:psmStore:add")
+    @Log(title = "成品仓库管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@RequestBody WmsPsmStoreBo bo) {
+        return toAjax(wmsPsmStoreService.insertByBo(bo));
+    }
+
+    /**
+     * 修改成品仓库管理
+     */
+    @SaCheckPermission("system:psmStore:edit")
+    @Log(title = "成品仓库管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@RequestBody WmsPsmStoreBo bo) {
+        return toAjax(wmsPsmStoreService.updateByBo(bo));
+    }
+
+    /**
+     * 删除成品仓库管理
+     *
+     * @param storeIds 主键串
+     */
+    @SaCheckPermission("system:psmStore:remove")
+    @Log(title = "成品仓库管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{storeIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] storeIds) {
+        return toAjax(wmsPsmStoreService.deleteWithValidByIds(List.of(storeIds), true));
+    }
+
+
+    /**
+     * 下拉框查询成品仓库管理列表
+     */
+
+    @GetMapping("getWmsPsmStoreList")
+    public R<List<WmsPsmStoreVo>> getWmsPsmStorelist(WmsPsmStoreBo bo) {
+        List<WmsPsmStoreVo> list = wmsPsmStoreService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmStore.java

@@ -0,0 +1,73 @@
+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;
+import java.util.Date;
+
+/**
+ * 成品仓库管理对象 wms_psm_store
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+@Data
+@TableName("wms_psm_store")
+public class WmsPsmStore{
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long storeId;
+
+    /**
+     * 仓库名称
+     */
+    private String storeName;
+
+    /**
+     * 仓库编码
+     */
+    private String storeCode;
+
+    /**
+     * 仓库类型
+     */
+    private Long storeTypeId;
+    /**
+     * 租户id
+     */
+    private String tenantId;
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+    @TableField(exist = false)
+    private String storeTypeCode;
+
+
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStoreBo.java

@@ -0,0 +1,49 @@
+package org.dromara.wms.domain.bo;
+
+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.*;
+import org.dromara.wms.domain.WmsPsmStore;
+
+/**
+ * 成品仓库管理业务对象 wms_psm_store
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WmsPsmStore.class, reverseConvertGenerate = false)
+public class WmsPsmStoreBo extends BaseEntity {
+
+    /**
+     * 表主键
+     */
+    @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long storeId;
+
+    /**
+     * 仓库名称
+     */
+    @NotBlank(message = "仓库名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String storeName;
+
+    /**
+     * 仓库编码
+     */
+    @NotBlank(message = "仓库编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String storeCode;
+
+    /**
+     * 仓库类型
+     */
+    @NotNull(message = "仓库类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long storeTypeId;
+    private String tenantId;
+
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmStoreVo.java

@@ -0,0 +1,84 @@
+package org.dromara.wms.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.wms.domain.WmsPsmStore;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 成品仓库管理视图对象 wms_psm_store
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = WmsPsmStore.class)
+public class WmsPsmStoreVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表主键
+     */
+    @ExcelProperty(value = "表主键")
+    private Long storeId;
+
+    /**
+     * 仓库名称
+     */
+    @ExcelProperty(value = "仓库名称")
+    private String storeName;
+
+    /**
+     * 仓库编码
+     */
+    @ExcelProperty(value = "仓库编码")
+    private String storeCode;
+
+    /**
+     * 仓库类型
+     */
+    @ExcelProperty(value = "仓库类型")
+    private Long storeTypeId;
+    /**
+     * 租户id
+     */
+    private String tenantId;
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+    private String storeTypeCode;
+
+
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStoreMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.wms.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.wms.domain.WmsPsmStore;
+import org.dromara.wms.domain.vo.WmsPsmStoreVo;
+
+/**
+ * 成品仓库管理Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+public interface WmsPsmStoreMapper extends BaseMapperPlus<WmsPsmStore, WmsPsmStoreVo> {
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmStoreService.java

@@ -0,0 +1,68 @@
+package org.dromara.wms.service;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.wms.domain.bo.WmsPsmStoreBo;
+import org.dromara.wms.domain.vo.WmsPsmStoreVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 成品仓库管理Service接口
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+public interface IWmsPsmStoreService {
+
+    /**
+     * 查询成品仓库管理
+     *
+     * @param storeId 主键
+     * @return 成品仓库管理
+     */
+    WmsPsmStoreVo queryById(Long storeId);
+
+    /**
+     * 分页查询成品仓库管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 成品仓库管理分页列表
+     */
+    TableDataInfo<WmsPsmStoreVo> queryPageList(WmsPsmStoreBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的成品仓库管理列表
+     *
+     * @param bo 查询条件
+     * @return 成品仓库管理列表
+     */
+    List<WmsPsmStoreVo> queryList(WmsPsmStoreBo bo);
+
+    /**
+     * 新增成品仓库管理
+     *
+     * @param bo 成品仓库管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(WmsPsmStoreBo bo);
+
+    /**
+     * 修改成品仓库管理
+     *
+     * @param bo 成品仓库管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(WmsPsmStoreBo bo);
+
+    /**
+     * 校验并批量删除成品仓库管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreServiceImpl.java

@@ -0,0 +1,137 @@
+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.dromara.wms.domain.WmsPsmStore;
+import org.dromara.wms.domain.WmsPsmStoreType;
+import org.dromara.wms.domain.bo.WmsPsmStoreBo;
+import org.dromara.wms.domain.vo.WmsPsmStoreVo;
+import org.dromara.wms.mapper.WmsPsmStoreMapper;
+import org.dromara.wms.service.IWmsPsmStoreService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 成品仓库管理Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-01-15
+ */
+@RequiredArgsConstructor
+@Service
+public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService {
+
+    private final WmsPsmStoreMapper baseMapper;
+
+    /**
+     * 查询成品仓库管理
+     *
+     * @param storeId 主键
+     * @return 成品仓库管理
+     */
+    @Override
+    public WmsPsmStoreVo queryById(Long storeId){
+        return baseMapper.selectVoById(storeId);
+    }
+
+    /**
+     * 分页查询成品仓库管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 成品仓库管理分页列表
+     */
+    @Override
+    public TableDataInfo<WmsPsmStoreVo> queryPageList(WmsPsmStoreBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<WmsPsmStore> lqw = buildQueryWrapper(bo);
+        Page<WmsPsmStoreVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的成品仓库管理列表
+     *
+     * @param bo 查询条件
+     * @return 成品仓库管理列表
+     */
+    @Override
+    public List<WmsPsmStoreVo> queryList(WmsPsmStoreBo bo) {
+        MPJLambdaWrapper<WmsPsmStore> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<WmsPsmStore> buildQueryWrapper(WmsPsmStoreBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<WmsPsmStore> lqw = JoinWrappers.lambda(WmsPsmStore.class)
+        .selectAll(WmsPsmStore.class).select(WmsPsmStoreType::getStoreTypeCode)
+            .leftJoin(WmsPsmStoreType.class,WmsPsmStoreType::getStoreTypeId,WmsPsmStore::getStoreTypeId)
+        .eq(bo.getStoreId() != null, WmsPsmStore::getStoreId, bo.getStoreId())
+        .like(StringUtils.isNotBlank(bo.getStoreName()), WmsPsmStore::getStoreName, bo.getStoreName())
+        .eq(StringUtils.isNotBlank(bo.getStoreCode()), WmsPsmStore::getStoreCode, bo.getStoreCode())
+        .eq(bo.getStoreTypeId() != null, WmsPsmStore::getStoreTypeId, bo.getStoreTypeId())
+        .orderByDesc(WmsPsmStore::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增成品仓库管理
+     *
+     * @param bo 成品仓库管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(WmsPsmStoreBo bo) {
+        WmsPsmStore add = MapstructUtils.convert(bo, WmsPsmStore.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setStoreId(add.getStoreId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改成品仓库管理
+     *
+     * @param bo 成品仓库管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(WmsPsmStoreBo bo) {
+        WmsPsmStore update = MapstructUtils.convert(bo, WmsPsmStore.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(WmsPsmStore entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除成品仓库管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmStoreMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.wms.mapper.WmsPsmStoreMapper">
+
+</mapper>