From 528019be52e4332161a0c71ec678b413ec9f266e Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Mon, 11 Aug 2025 11:51:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=B5=81=E6=B0=B4=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增库存流水相关实体类、Mapper、Service、Controller- 实现库存流水的增删查改功能 - 添加库存流水的导出功能 - 优化库存流水的查询接口，支持分页和条件筛选 --- .../klp/controller/WmsStockLogController.java | 99 +++++++++++++++ .../main/java/com/klp/domain/WmsStockLog.java | 67 ++++++++++ .../java/com/klp/domain/bo/WmsStockLogBo.java | 69 +++++++++++ .../java/com/klp/domain/vo/WmsStockLogVo.java | 85 +++++++++++++ .../com/klp/mapper/WmsStockLogMapper.java | 15 +++ .../com/klp/service/IWmsStockLogService.java | 49 ++++++++ .../service/impl/WmsStockLogServiceImpl.java | 115 ++++++++++++++++++ .../mapper/klp/WmsStockLogMapper.xml | 25 ++++ 8 files changed, 524 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsStockLogController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsStockLog.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsStockLogService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsStockLogController.java b/klp-wms/src/main/java/com/klp/controller/WmsStockLogController.java new file mode 100644 index 00000000..20aaa836 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsStockLogController.java @@ -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.WmsStockLogVo; +import com.klp.domain.bo.WmsStockLogBo; +import com.klp.service.IWmsStockLogService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 库存流水 + * + * @author JR + * @date 2025-08-11 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/klp/stockLog") +public class WmsStockLogController extends BaseController { + + private final IWmsStockLogService iWmsStockLogService; + + /** + * 查询库存流水列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsStockLogBo bo, PageQuery pageQuery) { + return iWmsStockLogService.queryPageList(bo, pageQuery); + } + + /** + * 导出库存流水列表 + */ + @Log(title = "库存流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsStockLogBo bo, HttpServletResponse response) { + List list = iWmsStockLogService.queryList(bo); + ExcelUtil.exportExcel(list, "库存流水", WmsStockLogVo.class, response); + } + + /** + * 获取库存流水详细信息 + * + * @param id 主键 + */ + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(iWmsStockLogService.queryById(id)); + } + + /** + * 新增库存流水 + */ + @Log(title = "库存流水", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsStockLogBo bo) { + return toAjax(iWmsStockLogService.insertByBo(bo)); + } + + /** + * 修改库存流水 + */ + @Log(title = "库存流水", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsStockLogBo bo) { + return toAjax(iWmsStockLogService.updateByBo(bo)); + } + + /** + * 删除库存流水 + * + * @param ids 主键串 + */ + @Log(title = "库存流水", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iWmsStockLogService.deleteWithValidByIds(Arrays.asList(ids), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsStockLog.java b/klp-wms/src/main/java/com/klp/domain/WmsStockLog.java new file mode 100644 index 00000000..2b0c2316 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsStockLog.java @@ -0,0 +1,67 @@ +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; + +/** + * 库存流水对象 wms_stock_log + * + * @author JR + * @date 2025-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_stock_log") +public class WmsStockLog extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + /** + * 仓库/库区/库位ID + */ + private Long warehouseId; + /** + * 物品ID（指向原材料或产品主键） + */ + private Long itemId; + /** + * 物品类型（raw_material/product） + */ + private String itemType; + /** + * 变动数量（正=入库，负=出库） + */ + private BigDecimal changeQty; + /** + * 变动后的库存数量 + */ + private BigDecimal afterQty; + /** + * 变动类型（入库/出库等） + */ + private String changeType; + /** + * 实际库存变动时间 + */ + private Date changeTime; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常,1=删除） + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java new file mode 100644 index 00000000..19abd587 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java @@ -0,0 +1,69 @@ +package com.klp.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 库存流水业务对象 wms_stock_log + * + * @author JR + * @date 2025-08-11 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsStockLogBo extends BaseEntity { + + /** + * 主键ID + */ + private Long id; + + /** + * 仓库/库区/库位ID + */ + private Long warehouseId; + + /** + * 物品ID（指向原材料或产品主键） + */ + private Long itemId; + + /** + * 物品类型（raw_material/product） + */ + private String itemType; + + /** + * 变动数量（正=入库，负=出库） + */ + private BigDecimal changeQty; + + /** + * 变动后的库存数量 + */ + private BigDecimal afterQty; + + /** + * 变动类型（入库/出库等） + */ + private String changeType; + + /** + * 实际库存变动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date changeTime; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java new file mode 100644 index 00000000..b8fc3df7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java @@ -0,0 +1,85 @@ +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_stock_log + * + * @author JR + * @date 2025-08-11 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsStockLogVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 仓库/库区/库位ID + */ + @ExcelProperty(value = "仓库/库区/库位ID") + private Long warehouseId; + + /** + * 物品ID（指向原材料或产品主键） + */ + @ExcelProperty(value = "物品ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "指=向原材料或产品主键") + private Long itemId; + + /** + * 物品类型（raw_material/product） + */ + @ExcelProperty(value = "物品类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "r=aw_material/product") + private String itemType; + + /** + * 变动数量（正=入库，负=出库） + */ + @ExcelProperty(value = "变动数量", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "正==入库，负=出库") + private BigDecimal changeQty; + + /** + * 变动后的库存数量 + */ + @ExcelProperty(value = "变动后的库存数量") + private BigDecimal afterQty; + + /** + * 变动类型（入库/出库等） + */ + @ExcelProperty(value = "变动类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "入=库/出库等") + private String changeType; + + /** + * 实际库存变动时间 + */ + @ExcelProperty(value = "实际库存变动时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date changeTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java new file mode 100644 index 00000000..1a047ca6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsStockLog; +import com.klp.domain.vo.WmsStockLogVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 库存流水Mapper接口 + * + * @author JR + * @date 2025-08-11 + */ +public interface WmsStockLogMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsStockLogService.java b/klp-wms/src/main/java/com/klp/service/IWmsStockLogService.java new file mode 100644 index 00000000..35bff597 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsStockLogService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsStockLog; +import com.klp.domain.vo.WmsStockLogVo; +import com.klp.domain.bo.WmsStockLogBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 库存流水Service接口 + * + * @author JR + * @date 2025-08-11 + */ +public interface IWmsStockLogService { + + /** + * 查询库存流水 + */ + WmsStockLogVo queryById(Long id); + + /** + * 查询库存流水列表 + */ + TableDataInfo queryPageList(WmsStockLogBo bo, PageQuery pageQuery); + + /** + * 查询库存流水列表 + */ + List queryList(WmsStockLogBo bo); + + /** + * 新增库存流水 + */ + Boolean insertByBo(WmsStockLogBo bo); + + /** + * 修改库存流水 + */ + Boolean updateByBo(WmsStockLogBo bo); + + /** + * 校验并批量删除库存流水信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java new file mode 100644 index 00000000..86dc2d6a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java @@ -0,0 +1,115 @@ +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.WmsStockLogBo; +import com.klp.domain.vo.WmsStockLogVo; +import com.klp.domain.WmsStockLog; +import com.klp.mapper.WmsStockLogMapper; +import com.klp.service.IWmsStockLogService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 库存流水Service业务层处理 + * + * @author JR + * @date 2025-08-11 + */ +@RequiredArgsConstructor +@Service +public class WmsStockLogServiceImpl implements IWmsStockLogService { + + private final WmsStockLogMapper baseMapper; + + /** + * 查询库存流水 + */ + @Override + public WmsStockLogVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询库存流水列表 + */ + @Override + public TableDataInfo queryPageList(WmsStockLogBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询库存流水列表 + */ + @Override + public List queryList(WmsStockLogBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsStockLogBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getWarehouseId() != null, WmsStockLog::getWarehouseId, bo.getWarehouseId()); + lqw.eq(bo.getItemId() != null, WmsStockLog::getItemId, bo.getItemId()); + lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsStockLog::getItemType, bo.getItemType()); + lqw.eq(bo.getChangeQty() != null, WmsStockLog::getChangeQty, bo.getChangeQty()); + lqw.eq(bo.getAfterQty() != null, WmsStockLog::getAfterQty, bo.getAfterQty()); + lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), WmsStockLog::getChangeType, bo.getChangeType()); + lqw.eq(bo.getChangeTime() != null, WmsStockLog::getChangeTime, bo.getChangeTime()); + return lqw; + } + + /** + * 新增库存流水 + */ + @Override + public Boolean insertByBo(WmsStockLogBo bo) { + WmsStockLog add = BeanUtil.toBean(bo, WmsStockLog.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改库存流水 + */ + @Override + public Boolean updateByBo(WmsStockLogBo bo) { + WmsStockLog update = BeanUtil.toBean(bo, WmsStockLog.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsStockLog entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除库存流水 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml new file mode 100644 index 00000000..8b134608 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + +