DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

柜体(仓库)出入库开发完成

Browse Source
This commit is contained in:
刘宗坤
2024-11-02 22:34:37 +08:00
parent 4b150a9747
commit bbd40afd52
9 changed files with 502 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaOutWarehouseController.java Normal file
View File

@@ -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.SysOaOutWarehouseVo;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo;
import com.ruoyi.oa.service.ISysOaOutWarehouseService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 仓库出库
*
* @author liuzongkun999
* @date 2024-11-02
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/oaOutWarehouse")
public class SysOaOutWarehouseController extends BaseController {
private final ISysOaOutWarehouseService iSysOaOutWarehouseService;
/**
* 查询仓库出库列表
*/
@SaCheckPermission("oa:oaOutWarehouse:list")
@GetMapping("/list")
public TableDataInfo<SysOaOutWarehouseVo> list(SysOaOutWarehouseBo bo, PageQuery pageQuery) {
return iSysOaOutWarehouseService.queryPageList(bo, pageQuery);
}
/**
* 导出仓库出库列表
*/
@SaCheckPermission("oa:oaOutWarehouse:export")
@Log(title = "仓库出库", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaOutWarehouseBo bo, HttpServletResponse response) {
List<SysOaOutWarehouseVo> list = iSysOaOutWarehouseService.queryList(bo);
ExcelUtil.exportExcel(list, "仓库出库", SysOaOutWarehouseVo.class, response);
}
/**
* 获取仓库出库详细信息
*
* @param id 主键
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/{id}")
public R<SysOaOutWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iSysOaOutWarehouseService.queryById(id));
}
/**
* 新增仓库出库
*/
@SaCheckPermission("oa:oaOutWarehouse:add")
@Log(title = "仓库出库", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaOutWarehouseBo bo) {
return toAjax(iSysOaOutWarehouseService.insertByBo(bo));
}
/**
* 修改仓库出库
*/
@SaCheckPermission("oa:oaOutWarehouse:edit")
@Log(title = "仓库出库", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaOutWarehouseBo bo) {
return toAjax(iSysOaOutWarehouseService.updateByBo(bo));
}
/**
* 删除仓库出库
*
* @param ids 主键串
*/
@SaCheckPermission("oa:oaOutWarehouse:remove")
@Log(title = "仓库出库", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iSysOaOutWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

52
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaOutWarehouse.java Normal file
View File

@@ -0,0 +1,52 @@
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_out_warehouse
*
* @author liuzongkun999
* @date 2024-11-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_out_warehouse")
public class SysOaOutWarehouse extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 出库后对应的项目id
*/
private Long projectId;
/**
* 出库数量
*/
private Long amount;
/**
* 出库备注
*/
private String remark;
/**
* 出库对象id
*/
private Long warehouseId;
/**
* 删除标志
*/
@TableLogic
private Integer delFlag;
}

53
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java Normal file
View File

@@ -0,0 +1,53 @@
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_out_warehouse
*
* @author liuzongkun999
* @date 2024-11-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaOutWarehouseBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 出库后对应的项目id
*/
private Long projectId;
/**
* 出库数量
*/
@NotNull(message = "出库数量不能为空", groups = { AddGroup.class, EditGroup.class })
private Long amount;
/**
* 出库备注
*/
private String remark;
/**
* 出库对象id
*/
@NotNull(message = "出库对象id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long warehouseId;
}

55
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java Normal file
View File

@@ -0,0 +1,55 @@
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_out_warehouse
*
* @author liuzongkun999
* @date 2024-11-02
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaOutWarehouseVo {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 出库后对应的项目id
*/
@ExcelProperty(value = "出库后对应的项目id")
private Long projectId;
/**
* 出库数量
*/
@ExcelProperty(value = "出库数量")
private Long amount;
/**
* 出库备注
*/
@ExcelProperty(value = "出库备注")
private String remark;
/**
* 出库对象id
*/
@ExcelProperty(value = "出库对象id")
private Long warehouseId;
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.SysOaOutWarehouse;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 仓库出库Mapper接口
*
* @author liuzongkun999
* @date 2024-11-02
*/
public interface SysOaOutWarehouseMapper extends BaseMapperPlus<SysOaOutWarehouseMapper, SysOaOutWarehouse, SysOaOutWarehouseVo> {
}

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaOutWarehouseService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.SysOaOutWarehouse;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 仓库出库Service接口
*
* @author liuzongkun999
* @date 2024-11-02
*/
public interface ISysOaOutWarehouseService {
/**
* 查询仓库出库
*/
SysOaOutWarehouseVo queryById(Long id);
/**
* 查询仓库出库列表
*/
TableDataInfo<SysOaOutWarehouseVo> queryPageList(SysOaOutWarehouseBo bo, PageQuery pageQuery);
/**
* 查询仓库出库列表
*/
List<SysOaOutWarehouseVo> queryList(SysOaOutWarehouseBo bo);
/**
* 新增仓库出库
*/
Boolean insertByBo(SysOaOutWarehouseBo bo);
/**
* 修改仓库出库
*/
Boolean updateByBo(SysOaOutWarehouseBo bo);
/**
* 校验并批量删除仓库出库信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

142
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java Normal file
View File

@@ -0,0 +1,142 @@
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 com.ruoyi.oa.domain.SysOaWarehouse;
import com.ruoyi.oa.mapper.SysOaWarehouseMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo;
import com.ruoyi.oa.domain.SysOaOutWarehouse;
import com.ruoyi.oa.mapper.SysOaOutWarehouseMapper;
import com.ruoyi.oa.service.ISysOaOutWarehouseService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 仓库出库Service业务层处理
*
* @author liuzongkun999
* @date 2024-11-02
*/
@RequiredArgsConstructor
@Service
public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
private final SysOaOutWarehouseMapper baseMapper;
private final SysOaWarehouseMapper baseMapper2;
/**
* 查询仓库出库
*/
@Override
public SysOaOutWarehouseVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 查询仓库出库列表
*/
@Override
public TableDataInfo<SysOaOutWarehouseVo> queryPageList(SysOaOutWarehouseBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOaOutWarehouse> lqw = buildQueryWrapper(bo);
Page<SysOaOutWarehouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询仓库出库列表
*/
@Override
public List<SysOaOutWarehouseVo> queryList(SysOaOutWarehouseBo bo) {
LambdaQueryWrapper<SysOaOutWarehouse> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysOaOutWarehouse> buildQueryWrapper(SysOaOutWarehouseBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaOutWarehouse> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getProjectId() != null, SysOaOutWarehouse::getProjectId, bo.getProjectId());
lqw.eq(bo.getAmount() != null, SysOaOutWarehouse::getAmount, bo.getAmount());
lqw.eq(bo.getWarehouseId() != null, SysOaOutWarehouse::getWarehouseId, bo.getWarehouseId());
return lqw;
}
/**
* 新增仓库出库
*/
@Override
public Boolean insertByBo(SysOaOutWarehouseBo bo) {
SysOaOutWarehouse add = BeanUtil.toBean(bo, SysOaOutWarehouse.class);
validEntityBeforeSave(add);
// 1、查询出库表中是否已存在该项目的出库记录
LambdaQueryWrapper<SysOaOutWarehouse> lqw = buildQueryWrapper(bo);
lqw.eq( SysOaOutWarehouse::getWarehouseId, add.getWarehouseId());
SysOaOutWarehouse sysOaOutWarehouse = baseMapper.selectOne(lqw);
// 2、查询结果为空不为空 则 增加该条的出库数量，或者查询结果为空 则 添加一条
// 3、删除仓库表中对应项目 ，如果对应仓库表项目数量-出库数量<0，出库失败, 反之,成功，则进行项目数量减少的更新
SysOaWarehouse warehouse = baseMapper2.selectById(add.getWarehouseId());
boolean flag;
if(sysOaOutWarehouse != null){
sysOaOutWarehouse.setAmount(sysOaOutWarehouse.getAmount()+add.getAmount());
if(warehouse.getInventory() - sysOaOutWarehouse.getAmount() < 0) {
throw new Error("剩余数量不足,出库失败");
}
else {
warehouse.setInventory(warehouse.getInventory() - sysOaOutWarehouse.getAmount());
baseMapper2.updateById(warehouse);
}
flag = baseMapper.updateById(sysOaOutWarehouse) > 0;
}
else {
if(warehouse.getInventory() - add.getAmount() < 0) {
throw new Error("剩余数量不足,出库失败");
}
else {
warehouse.setInventory(warehouse.getInventory() - add.getAmount());
baseMapper2.updateById(warehouse);
}
flag = baseMapper.insert(add) > 0;
}
// if (flag) {
// bo.setId(add.getId());
// }
return flag;
}
/**
* 修改仓库出库
*/
@Override
public Boolean updateByBo(SysOaOutWarehouseBo bo) {
SysOaOutWarehouse update = BeanUtil.toBean(bo, SysOaOutWarehouse.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysOaOutWarehouse entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除仓库出库
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

14
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java
View File

@@ -81,18 +81,18 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
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);
SysOaWarehouse select = baseMapper.selectOne(lqw);
// 2、 无则直接新增项目 有则直接增加库存数量
boolean flag;
if(selectVo == null ) {
if(select == 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;
select.setInventory(select.getInventory() + bo.getInventory());
flag = baseMapper.updateById(select) > 0;
}
if (flag) {
bo.setId(add.getId());
}
return flag;
}

21
ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?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.SysOaOutWarehouseMapper">
<resultMap type="com.ruoyi.oa.domain.SysOaOutWarehouse" id="SysOaOutWarehouseResult">
<result property="id" column="id"/>
<result property="projectId" column="project_id"/>
<result property="amount" column="amount"/>
<result property="remark" column="remark"/>
<result property="warehouseId" column="warehouse_id"/>
<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>