仓库管理模块完成

2024-11-02 17:23:39 +08:00
parent 1c152e2d1a
commit 00e2056fa1
8 changed files with 527 additions and 0 deletions
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
+import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
+import com.ruoyi.oa.service.ISysOaWarehouseService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 仓库管理
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/oaWarehouse")
+public class SysOaWarehouseController extends BaseController {
+
+    private final ISysOaWarehouseService iSysOaWarehouseService;
+
+    /**
+     * 查询仓库管理列表
+     */
+    @SaCheckPermission("oa:oaWarehouse:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOaWarehouseVo> list(SysOaWarehouseBo bo, PageQuery pageQuery) {
+        return iSysOaWarehouseService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出仓库管理列表
+     */
+    @SaCheckPermission("oa:oaWarehouse:export")
+    @Log(title = "仓库管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysOaWarehouseBo bo, HttpServletResponse response) {
+        List<SysOaWarehouseVo> list = iSysOaWarehouseService.queryList(bo);
+        ExcelUtil.exportExcel(list, "仓库管理", SysOaWarehouseVo.class, response);
+    }
+
+    /**
+     * 获取仓库管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("oa:oaWarehouse:query")
+    @GetMapping("/{id}")
+    public R<SysOaWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iSysOaWarehouseService.queryById(id));
+    }
+
+    /**
+     * 新增仓库管理
+     */
+    @SaCheckPermission("oa:oaWarehouse:add")
+    @Log(title = "仓库管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaWarehouseBo bo) {
+        return toAjax(iSysOaWarehouseService.insertByBo(bo));
+    }
+
+    /**
+     * 修改仓库管理
+     */
+    @SaCheckPermission("oa:oaWarehouse:edit")
+    @Log(title = "仓库管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaWarehouseBo bo) {
+        return toAjax(iSysOaWarehouseService.updateByBo(bo));
+    }
+
+    /**
+     * 删除仓库管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("oa:oaWarehouse:remove")
+    @Log(title = "仓库管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iSysOaWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java
@@ -0,0 +1,64 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 仓库管理对象 sys_oa_warehouse
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_warehouse")
+public class SysOaWarehouse extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 库存数量
+     */
+    private Long inventory;
+    /**
+     * 型号
+     */
+    private String model;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 物料名称
+     */
+    private String name;
+    /**
+     * 品牌
+     */
+    private String brand;
+    /**
+     * 规格
+     */
+    private String specifications;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseBo.java
@@ -0,0 +1,67 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 仓库管理业务对象 sys_oa_warehouse
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaWarehouseBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 库存数量
+     */
+    @NotNull(message = "库存数量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long inventory;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 物料名称
+     */
+    @NotBlank(message = "物料名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 规格
+     */
+    private String specifications;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java
@@ -0,0 +1,73 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 仓库管理视图对象 sys_oa_warehouse
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaWarehouseVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 库存数量
+     */
+    @ExcelProperty(value = "库存数量")
+    private Long inventory;
+
+    /**
+     * 型号
+     */
+    @ExcelProperty(value = "型号")
+    private String model;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 物料名称
+     */
+    @ExcelProperty(value = "物料名称")
+    private String name;
+
+    /**
+     * 品牌
+     */
+    @ExcelProperty(value = "品牌")
+    private String brand;
+
+    /**
+     * 规格
+     */
+    @ExcelProperty(value = "规格")
+    private String specifications;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.oa.domain.SysOaWarehouse;
+import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 仓库管理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+public interface SysOaWarehouseMapper extends BaseMapperPlus<SysOaWarehouseMapper, SysOaWarehouse, SysOaWarehouseVo> {
+
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseService.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseService.java
@@ -0,0 +1,49 @@
+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.SysOaWarehouse;
+import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
+import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 仓库管理Service接口
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+public interface ISysOaWarehouseService {
+
+    /**
+     * 查询仓库管理
+     */
+    SysOaWarehouseVo queryById(Long id);
+
+    /**
+     * 查询仓库管理列表
+     */
+    TableDataInfo<SysOaWarehouseVo> queryPageList(SysOaWarehouseBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询仓库管理列表
+     */
+    List<SysOaWarehouseVo> queryList(SysOaWarehouseBo bo);
+
+    /**
+     * 新增仓库管理
+     */
+    Boolean insertByBo(SysOaWarehouseBo bo);
+
+    /**
+     * 修改仓库管理
+     */
+    Boolean updateByBo(SysOaWarehouseBo bo);
+
+    /**
+     * 校验并批量删除仓库管理信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java
@@ -0,0 +1,127 @@
+package com.ruoyi.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
+import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
+import com.ruoyi.oa.domain.SysOaWarehouse;
+import com.ruoyi.oa.mapper.SysOaWarehouseMapper;
+import com.ruoyi.oa.service.ISysOaWarehouseService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 仓库管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-11-02
+ */
+@RequiredArgsConstructor
+@Service
+public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
+
+    private final SysOaWarehouseMapper baseMapper;
+
+    /**
+     * 查询仓库管理
+     */
+    @Override
+    public SysOaWarehouseVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询仓库管理列表
+     */
+    @Override
+    public TableDataInfo<SysOaWarehouseVo> queryPageList(SysOaWarehouseBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOaWarehouse> lqw = buildQueryWrapper(bo);
+        Page<SysOaWarehouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询仓库管理列表
+     */
+    @Override
+    public List<SysOaWarehouseVo> queryList(SysOaWarehouseBo bo) {
+        LambdaQueryWrapper<SysOaWarehouse> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysOaWarehouse> buildQueryWrapper(SysOaWarehouseBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysOaWarehouse> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getInventory() != null, SysOaWarehouse::getInventory, bo.getInventory());
+        lqw.eq(StringUtils.isNotBlank(bo.getModel()), SysOaWarehouse::getModel, bo.getModel());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), SysOaWarehouse::getUnit, bo.getUnit());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SysOaWarehouse::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getBrand()), SysOaWarehouse::getBrand, bo.getBrand());
+        lqw.eq(StringUtils.isNotBlank(bo.getSpecifications()), SysOaWarehouse::getSpecifications, bo.getSpecifications());
+        return lqw;
+    }
+
+    /**
+     * 新增仓库管理
+     */
+    @Override
+    public Boolean insertByBo(SysOaWarehouseBo bo) {
+        SysOaWarehouse add = BeanUtil.toBean(bo, SysOaWarehouse.class);
+        validEntityBeforeSave(add);
+        // 1、查询仓库中是否有已存在项目
+        LambdaQueryWrapper<SysOaWarehouse> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SysOaWarehouse::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getModel()), SysOaWarehouse::getModel, bo.getModel());
+        SysOaWarehouseVo selectVo = baseMapper.selectVoOne(lqw);
+        // 2、 无则直接新增项目 有则直接增加库存数量
+        boolean flag;
+        if(selectVo == null ) {
+            flag = baseMapper.insert(add) > 0;
+
+        }
+
+        else {
+            selectVo.setInventory(selectVo.getInventory() + bo.getInventory());
+            SysOaWarehouse update = BeanUtil.toBean(selectVo, SysOaWarehouse.class);
+            flag = baseMapper.updateById(update) > 0;
+        }
+        return flag;
+    }
+
+    /**
+     * 修改仓库管理
+     */
+    @Override
+    public Boolean updateByBo(SysOaWarehouseBo bo) {
+        SysOaWarehouse update = BeanUtil.toBean(bo, SysOaWarehouse.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysOaWarehouse entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除仓库管理
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMapper.xml
@@ -0,0 +1,24 @@
+<?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="com.ruoyi.oa.mapper.SysOaWarehouseMapper">
+
+    <resultMap type="com.ruoyi.oa.domain.SysOaWarehouse" id="SysOaWarehouseResult">
+        <result property="id" column="id"/>
+        <result property="inventory" column="inventory"/>
+        <result property="model" column="model"/>
+        <result property="unit" column="unit"/>
+        <result property="name" column="name"/>
+        <result property="brand" column="brand"/>
+        <result property="specifications" column="specifications"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>