DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 新增其他收支管理功能

Browse Source 
- 新增其他收支实体类WmsOtherIncome及其相关VO、BO类
- 实现其他收支的增删改查接口IWmsOtherIncomeService
- 添加其他收支控制器WmsOtherIncomeController支持RESTful请求
- 配置MyBatis映射文件及Mapper接口支持数据库操作
- 在应付和应收业务中增加时间范围筛选字段和逻辑
This commit is contained in:
Joshi
2025-09-26 14:21:14 +08:00
parent 0c01d4af8a
commit ffd8eebe60
12 changed files with 506 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
klp-wms/src/main/java/com/klp/controller/WmsOtherIncomeController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsOtherIncomeVo;
import com.klp.domain.bo.WmsOtherIncomeBo;
import com.klp.service.IWmsOtherIncomeService;
import com.klp.common.core.page.TableDataInfo;
/**
* 其他收支
*
* @author Joshi
* @date 2025-09-26
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/klp/otherIncome")
public class WmsOtherIncomeController extends BaseController {
private final IWmsOtherIncomeService iWmsOtherIncomeService;
/**
* 查询其他收支列表
*/
@GetMapping("/list")
public TableDataInfo<WmsOtherIncomeVo> list(WmsOtherIncomeBo bo, PageQuery pageQuery) {
return iWmsOtherIncomeService.queryPageList(bo, pageQuery);
}
/**
* 导出其他收支列表
*/
@Log(title = "其他收支", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsOtherIncomeBo bo, HttpServletResponse response) {
List<WmsOtherIncomeVo> list = iWmsOtherIncomeService.queryList(bo);
ExcelUtil.exportExcel(list, "其他收支", WmsOtherIncomeVo.class, response);
}
/**
* 获取其他收支详细信息
*
* @param otherIncomeId 主键
*/
@GetMapping("/{otherIncomeId}")
public R<WmsOtherIncomeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long otherIncomeId) {
return R.ok(iWmsOtherIncomeService.queryById(otherIncomeId));
}
/**
* 新增其他收支
*/
@Log(title = "其他收支", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsOtherIncomeBo bo) {
return toAjax(iWmsOtherIncomeService.insertByBo(bo));
}
/**
* 修改其他收支
*/
@Log(title = "其他收支", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsOtherIncomeBo bo) {
return toAjax(iWmsOtherIncomeService.updateByBo(bo));
}
/**
* 删除其他收支
*
* @param otherIncomeIds 主键串
*/
@Log(title = "其他收支", businessType = BusinessType.DELETE)
@DeleteMapping("/{otherIncomeIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] otherIncomeIds) {
return toAjax(iWmsOtherIncomeService.deleteWithValidByIds(Arrays.asList(otherIncomeIds), true));
}
}

60
klp-wms/src/main/java/com/klp/domain/WmsOtherIncome.java Normal file
View File

@@ -0,0 +1,60 @@
package com.klp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 其他收支对象 wms_other_income
*
* @author Joshi
* @date 2025-09-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_other_income")
public class WmsOtherIncome extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 其他收入ID（主键）
*/
@TableId(value = "other_income_id")
private Long otherIncomeId;
/**
* 日期
*/
private Date incomeDate;
/**
* 类型
*/
private String incomeType;
/**
* 金额
*/
private BigDecimal amount;
/**
* 来源
*/
private String source;
/**
* 收支类型(0=收入,1=值出)
*/
private Long type;
/**
* 备注
*/
private String remark;
/**
* 删除标志（0=正常，1=已删除）
*/
@TableLogic
private Integer delFlag;
}

59
klp-wms/src/main/java/com/klp/domain/bo/WmsOtherIncomeBo.java Normal file
View File

@@ -0,0 +1,59 @@
package com.klp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 其他收支业务对象 wms_other_income
*
* @author Joshi
* @date 2025-09-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsOtherIncomeBo extends BaseEntity {
/**
* 其他收入ID（主键）
*/
private Long otherIncomeId;
/**
* 日期
*/
private Date incomeDate;
/**
* 类型
*/
private String incomeType;
/**
* 金额
*/
private BigDecimal amount;
/**
* 来源
*/
private String source;
/**
* 收支类型(0=收入,1=值出)
*/
private Long type;
/**
* 备注
*/
private String remark;
}

5
klp-wms/src/main/java/com/klp/domain/bo/WmsPayableBo.java
View File

@@ -67,5 +67,10 @@ public class WmsPayableBo extends BaseEntity {
*/
private String remark;
//时间范围筛选
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}

6
klp-wms/src/main/java/com/klp/domain/bo/WmsReceivableBo.java
View File

@@ -67,5 +67,11 @@ public class WmsReceivableBo extends BaseEntity {
*/
private String remark;
//时间范围筛选
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}

69
klp-wms/src/main/java/com/klp/domain/vo/WmsOtherIncomeVo.java Normal file
View File

@@ -0,0 +1,69 @@
package com.klp.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 其他收支视图对象 wms_other_income
*
* @author Joshi
* @date 2025-09-26
*/
@Data
@ExcelIgnoreUnannotated
public class WmsOtherIncomeVo {
private static final long serialVersionUID = 1L;
/**
* 其他收入ID（主键）
*/
@ExcelProperty(value = "其他收入ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "主=键")
private Long otherIncomeId;
/**
* 日期
*/
@ExcelProperty(value = "日期")
private Date incomeDate;
/**
* 类型
*/
@ExcelProperty(value = "类型")
private String incomeType;
/**
* 金额
*/
@ExcelProperty(value = "金额")
private BigDecimal amount;
/**
* 来源
*/
@ExcelProperty(value = "来源")
private String source;
/**
* 收支类型(0=收入,1=值出)
*/
@ExcelProperty(value = "收支类型(0=收入,1=值出)")
private Long type;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
klp-wms/src/main/java/com/klp/mapper/WmsOtherIncomeMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.mapper;
import com.klp.domain.WmsOtherIncome;
import com.klp.domain.vo.WmsOtherIncomeVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 其他收支Mapper接口
*
* @author Joshi
* @date 2025-09-26
*/
public interface WmsOtherIncomeMapper extends BaseMapperPlus<WmsOtherIncomeMapper, WmsOtherIncome, WmsOtherIncomeVo> {
}

49
klp-wms/src/main/java/com/klp/service/IWmsOtherIncomeService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.service;
import com.klp.domain.WmsOtherIncome;
import com.klp.domain.vo.WmsOtherIncomeVo;
import com.klp.domain.bo.WmsOtherIncomeBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 其他收支Service接口
*
* @author Joshi
* @date 2025-09-26
*/
public interface IWmsOtherIncomeService {
/**
* 查询其他收支
*/
WmsOtherIncomeVo queryById(Long otherIncomeId);
/**
* 查询其他收支列表
*/
TableDataInfo<WmsOtherIncomeVo> queryPageList(WmsOtherIncomeBo bo, PageQuery pageQuery);
/**
* 查询其他收支列表
*/
List<WmsOtherIncomeVo> queryList(WmsOtherIncomeBo bo);
/**
* 新增其他收支
*/
Boolean insertByBo(WmsOtherIncomeBo bo);
/**
* 修改其他收支
*/
Boolean updateByBo(WmsOtherIncomeBo bo);
/**
* 校验并批量删除其他收支信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

113
klp-wms/src/main/java/com/klp/service/impl/WmsOtherIncomeServiceImpl.java Normal file
View File

@@ -0,0 +1,113 @@
package com.klp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.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.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.domain.bo.WmsOtherIncomeBo;
import com.klp.domain.vo.WmsOtherIncomeVo;
import com.klp.domain.WmsOtherIncome;
import com.klp.mapper.WmsOtherIncomeMapper;
import com.klp.service.IWmsOtherIncomeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 其他收支Service业务层处理
*
* @author Joshi
* @date 2025-09-26
*/
@RequiredArgsConstructor
@Service
public class WmsOtherIncomeServiceImpl implements IWmsOtherIncomeService {
private final WmsOtherIncomeMapper baseMapper;
/**
* 查询其他收支
*/
@Override
public WmsOtherIncomeVo queryById(Long otherIncomeId){
return baseMapper.selectVoById(otherIncomeId);
}
/**
* 查询其他收支列表
*/
@Override
public TableDataInfo<WmsOtherIncomeVo> queryPageList(WmsOtherIncomeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsOtherIncome> lqw = buildQueryWrapper(bo);
Page<WmsOtherIncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询其他收支列表
*/
@Override
public List<WmsOtherIncomeVo> queryList(WmsOtherIncomeBo bo) {
LambdaQueryWrapper<WmsOtherIncome> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsOtherIncome> buildQueryWrapper(WmsOtherIncomeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsOtherIncome> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getIncomeDate() != null, WmsOtherIncome::getIncomeDate, bo.getIncomeDate());
lqw.eq(StringUtils.isNotBlank(bo.getIncomeType()), WmsOtherIncome::getIncomeType, bo.getIncomeType());
lqw.eq(bo.getAmount() != null, WmsOtherIncome::getAmount, bo.getAmount());
lqw.eq(StringUtils.isNotBlank(bo.getSource()), WmsOtherIncome::getSource, bo.getSource());
lqw.eq(bo.getType() != null, WmsOtherIncome::getType, bo.getType());
return lqw;
}
/**
* 新增其他收支
*/
@Override
public Boolean insertByBo(WmsOtherIncomeBo bo) {
WmsOtherIncome add = BeanUtil.toBean(bo, WmsOtherIncome.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setOtherIncomeId(add.getOtherIncomeId());
}
return flag;
}
/**
* 修改其他收支
*/
@Override
public Boolean updateByBo(WmsOtherIncomeBo bo) {
WmsOtherIncome update = BeanUtil.toBean(bo, WmsOtherIncome.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsOtherIncome entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除其他收支
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

4
klp-wms/src/main/java/com/klp/service/impl/WmsPayableServiceImpl.java
View File

@@ -73,6 +73,10 @@ public class WmsPayableServiceImpl implements IWmsPayableService {
lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount());
lqw.eq(bo.getBalanceAmount() != null, "p.balance_amount", bo.getBalanceAmount());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), "p.status", bo.getStatus());
//按照创建时间筛选
if (bo.getStartTime() != null && bo.getEndTime() != null){
lqw.between("p.create_time", bo.getStartTime(), bo.getEndTime());
}
return lqw;
}

4
klp-wms/src/main/java/com/klp/service/impl/WmsReceivableServiceImpl.java
View File

@@ -75,6 +75,10 @@ public class WmsReceivableServiceImpl implements IWmsReceivableService {
lqw.eq(bo.getPaidAmount() != null, "r.paid_amount", bo.getPaidAmount());
lqw.eq(bo.getBalanceAmount() != null, "r.balance_amount", bo.getBalanceAmount());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), "r.status", bo.getStatus());
//根据创建时间查询范围Date startTime Date endTime
if (bo.getStartTime() != null && bo.getEndTime() != null) {
lqw.between("r.create_time", bo.getStartTime(), bo.getEndTime());
}
return lqw;
}

23
klp-wms/src/main/resources/mapper/klp/WmsOtherIncomeMapper.xml Normal file
View File

@@ -0,0 +1,23 @@
<?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.klp.mapper.WmsOtherIncomeMapper">
<resultMap type="com.klp.domain.WmsOtherIncome" id="WmsOtherIncomeResult">
<result property="otherIncomeId" column="other_income_id"/>
<result property="incomeDate" column="income_date"/>
<result property="incomeType" column="income_type"/>
<result property="amount" column="amount"/>
<result property="source" column="source"/>
<result property="type" column="type"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>