From 00e2056fa11fdf4e8301e9fa6dd3efaf7e31e40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=AE=97=E5=9D=A4?= Date: Sat, 2 Nov 2024 17:23:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysOaWarehouseController.java | 108 +++++++++++++++ .../com/ruoyi/oa/domain/SysOaWarehouse.java | 64 +++++++++ .../ruoyi/oa/domain/bo/SysOaWarehouseBo.java | 67 +++++++++ .../ruoyi/oa/domain/vo/SysOaWarehouseVo.java | 73 ++++++++++ .../ruoyi/oa/mapper/SysOaWarehouseMapper.java | 15 +++ .../oa/service/ISysOaWarehouseService.java | 49 +++++++ .../impl/SysOaWarehouseServiceImpl.java | 127 ++++++++++++++++++ .../mapper/oa/SysOaWarehouseMapper.xml | 24 ++++ 8 files changed, 527 insertions(+) create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseBo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseService.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java create mode 100644 ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMapper.xml diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java new file mode 100644 index 0000000..fb5d335 --- /dev/null +++ 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 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 list = iSysOaWarehouseService.queryList(bo); + ExcelUtil.exportExcel(list, "仓库管理", SysOaWarehouseVo.class, response); + } + + /** + * 获取仓库管理详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("oa:oaWarehouse:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iSysOaWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java new file mode 100644 index 0000000..50e4cdb --- /dev/null +++ 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; + +} diff --git 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 new file mode 100644 index 0000000..1c0b81d --- /dev/null +++ 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; + + +} diff --git 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 new file mode 100644 index 0000000..b23e5bf --- /dev/null +++ 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; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java new file mode 100644 index 0000000..e2a6382 --- /dev/null +++ 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 { + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseService.java new file mode 100644 index 0000000..fdb17ec --- /dev/null +++ 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 queryPageList(SysOaWarehouseBo bo, PageQuery pageQuery); + + /** + * 查询仓库管理列表 + */ + List queryList(SysOaWarehouseBo bo); + + /** + * 新增仓库管理 + */ + Boolean insertByBo(SysOaWarehouseBo bo); + + /** + * 修改仓库管理 + */ + Boolean updateByBo(SysOaWarehouseBo bo); + + /** + * 校验并批量删除仓库管理信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git 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 new file mode 100644 index 0000000..23c2c9a --- /dev/null +++ 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 queryPageList(SysOaWarehouseBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询仓库管理列表 + */ + @Override + public List queryList(SysOaWarehouseBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysOaWarehouseBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMapper.xml new file mode 100644 index 0000000..de6fb4f --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + +