Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

2025-08-11 11:55:11 +08:00
parent ba14fd26a7 528019be52
commit 3c2cc85e27
8 changed files with 524 additions and 0 deletions
--- a/klp-wms/src/main/java/com/klp/controller/WmsStockLogController.java
+++ 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<WmsStockLogVo> 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<WmsStockLogVo> list = iWmsStockLogService.queryList(bo);
+        ExcelUtil.exportExcel(list, "库存流水", WmsStockLogVo.class, response);
+    }
+
+    /**
+     * 获取库存流水详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<WmsStockLogVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iWmsStockLogService.queryById(id));
+    }
+
+    /**
+     * 新增库存流水
+     */
+    @Log(title = "库存流水", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsStockLogBo bo) {
+        return toAjax(iWmsStockLogService.insertByBo(bo));
+    }
+
+    /**
+     * 修改库存流水
+     */
+    @Log(title = "库存流水", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsStockLogBo bo) {
+        return toAjax(iWmsStockLogService.updateByBo(bo));
+    }
+
+    /**
+     * 删除库存流水
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "库存流水", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iWmsStockLogService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
--- a/klp-wms/src/main/java/com/klp/domain/WmsStockLog.java
+++ 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;
+
+}
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockLogBo.java
+++ 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;
+
+
+}
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java
+++ 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;
+
+
+}
--- a/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java
+++ 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<WmsStockLogMapper, WmsStockLog, WmsStockLogVo> {
+
+}
--- a/klp-wms/src/main/java/com/klp/service/IWmsStockLogService.java
+++ 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<WmsStockLogVo> queryPageList(WmsStockLogBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询库存流水列表
+     */
+    List<WmsStockLogVo> queryList(WmsStockLogBo bo);
+
+    /**
+     * 新增库存流水
+     */
+    Boolean insertByBo(WmsStockLogBo bo);
+
+    /**
+     * 修改库存流水
+     */
+    Boolean updateByBo(WmsStockLogBo bo);
+
+    /**
+     * 校验并批量删除库存流水信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java
+++ 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<WmsStockLogVo> queryPageList(WmsStockLogBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WmsStockLog> lqw = buildQueryWrapper(bo);
+        Page<WmsStockLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询库存流水列表
+     */
+    @Override
+    public List<WmsStockLogVo> queryList(WmsStockLogBo bo) {
+        LambdaQueryWrapper<WmsStockLog> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<WmsStockLog> buildQueryWrapper(WmsStockLogBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<WmsStockLog> 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<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}
--- a/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml
@@ -0,0 +1,25 @@
+<?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.WmsStockLogMapper">
+
+    <resultMap type="com.klp.domain.WmsStockLog" id="WmsStockLogResult">
+        <result property="id" column="id"/>
+        <result property="warehouseId" column="warehouse_id"/>
+        <result property="itemId" column="item_id"/>
+        <result property="itemType" column="item_type"/>
+        <result property="changeQty" column="change_qty"/>
+        <result property="afterQty" column="after_qty"/>
+        <result property="changeType" column="change_type"/>
+        <result property="changeTime" column="change_time"/>
+        <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>