feat(wms): 出库单子表和出库单号生成

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsOutStockDetailsController.java

@@ -0,0 +1,116 @@
+package org.dromara.wms.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.wms.domain.vo.WmsOutStockDetailsVo;
+import org.dromara.wms.domain.bo.WmsOutStockDetailsBo;
+import org.dromara.wms.service.IWmsOutStockDetailsService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 出库单明细
+ * 前端访问路由地址为:/wms/outStockDetails
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/outStockDetails")
+public class WmsOutStockDetailsController extends BaseController {
+
+    private final IWmsOutStockDetailsService wmsOutStockDetailsService;
+
+    /**
+     * 查询出库单明细列表
+     */
+    @SaCheckPermission("wms:outStockDetails:list")
+    @GetMapping("/list")
+    public TableDataInfo<WmsOutStockDetailsVo> list(WmsOutStockDetailsBo bo, PageQuery pageQuery) {
+        return wmsOutStockDetailsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出出库单明细列表
+     */
+    @SaCheckPermission("wms:outStockDetails:export")
+    @Log(title = "出库单明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WmsOutStockDetailsBo bo, HttpServletResponse response) {
+        List<WmsOutStockDetailsVo> list = wmsOutStockDetailsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "出库单明细", WmsOutStockDetailsVo.class, response);
+    }
+
+    /**
+     * 获取出库单明细详细信息
+     *
+     * @param outStockDetailsId 主键
+     */
+    @SaCheckPermission("wms:outStockDetails:query")
+    @GetMapping("/{outStockDetailsId}")
+    public R<WmsOutStockDetailsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("outStockDetailsId") Long outStockDetailsId) {
+        return R.ok(wmsOutStockDetailsService.queryById(outStockDetailsId));
+    }
+
+    /**
+     * 新增出库单明细
+     */
+    @SaCheckPermission("wms:outStockDetails:add")
+    @Log(title = "出库单明细", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsOutStockDetailsBo bo) {
+        return toAjax(wmsOutStockDetailsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改出库单明细
+     */
+    @SaCheckPermission("wms:outStockDetails:edit")
+    @Log(title = "出库单明细", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsOutStockDetailsBo bo) {
+        return toAjax(wmsOutStockDetailsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除出库单明细
+     *
+     * @param outStockDetailsIds 主键串
+     */
+    @SaCheckPermission("wms:outStockDetails:remove")
+    @Log(title = "出库单明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{outStockDetailsIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("outStockDetailsIds") Long[] outStockDetailsIds) {
+        return toAjax(wmsOutStockDetailsService.deleteWithValidByIds(List.of(outStockDetailsIds), true));
+    }
+
+    /**
+     * 下拉框查询出库单明细列表
+     */
+    @GetMapping("/getWmsOutStockDetailsList")
+    public R<List<WmsOutStockDetailsVo>> getWmsOutStockDetailsList(WmsOutStockDetailsBo bo) {
+        List<WmsOutStockDetailsVo> list = wmsOutStockDetailsService.queryList(bo);
+        return R.ok(list);
+    }
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsOutStockDetails.java

@@ -0,0 +1,92 @@
+package org.dromara.wms.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 出库单明细对象 wms_out_stock_details
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("wms_out_stock_details")
+public class WmsOutStockDetails extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 出库单明细ID
+     */
+    @TableId(value = "out_stock_details_id", type = IdType.AUTO)
+    private Long outStockDetailsId;
+
+    /**
+     * 仓库ID
+     */
+    private Long warehouseId;
+
+    /**
+     * 物料ID
+     */
+    private Long materielId;
+
+    /**
+     * 批次号
+     */
+    private String batchNumber;
+
+    /**
+     * 单价
+     */
+    private Double unitPrice;
+
+    /**
+     * 出库数量
+     */
+    private Double outStockAmount;
+
+    /**
+     * 单位
+     */
+    private String unitName;
+
+    /**
+     * 总价
+     */
+    private Double totalPrice;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 原项目ID
+     */
+    private Long inProjectId;
+
+    /**
+     * 新项目ID
+     */
+    private Long outProjectId;
+
+    /**
+     * 出库单ID
+     */
+    private Long outStockBillId;
+
+    /**
+     * 库存ID
+     */
+    private Long inventoryDetailsId;
+
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutStockDetailsBo.java

@@ -0,0 +1,86 @@
+package org.dromara.wms.domain.bo;
+
+import org.dromara.wms.domain.WmsOutStockDetails;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 出库单明细业务对象 wms_out_stock_details
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WmsOutStockDetails.class, reverseConvertGenerate = false)
+public class WmsOutStockDetailsBo extends BaseEntity {
+
+    /**
+     * 出库单明细ID
+     */
+    @NotNull(message = "出库单明细ID不能为空", groups = { EditGroup.class })
+    private Long outStockDetailsId;
+
+    /**
+     * 仓库ID
+     */
+    private Long warehouseId;
+
+    /**
+     * 物料ID
+     */
+    private Long materielId;
+
+    /**
+     * 批次号
+     */
+    private String batchNumber;
+
+    /**
+     * 单价
+     */
+    private Double unitPrice;
+
+    /**
+     * 出库数量
+     */
+    private Double outStockAmount;
+
+    /**
+     * 单位
+     */
+    private String unitName;
+
+    /**
+     * 总价
+     */
+    private Double totalPrice;
+
+    /**
+     * 原项目ID
+     */
+    private Long inProjectId;
+
+    /**
+     * 新项目ID
+     */
+    private Long outProjectId;
+
+    /**
+     * 出库单ID
+     */
+    @NotNull(message = "出库单ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long outStockBillId;
+
+    /**
+     * 库存ID
+     */
+    private Long inventoryDetailsId;
+
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutStockDetailsVo.java

@@ -0,0 +1,147 @@
+package org.dromara.wms.domain.vo;
+
+import org.dromara.wms.domain.WmsOutStockDetails;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 出库单明细视图对象 wms_out_stock_details
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = WmsOutStockDetails.class)
+public class WmsOutStockDetailsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 出库单明细ID
+     */
+    @ExcelProperty(value = "出库单明细ID")
+    private Long outStockDetailsId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 仓库ID
+     */
+    @ExcelProperty(value = "仓库ID")
+    private Long warehouseId;
+
+    /**
+     * 物料ID
+     */
+    @ExcelProperty(value = "物料ID")
+    private Long materielId;
+
+    /**
+     * 批次号
+     */
+    @ExcelProperty(value = "批次号")
+    private String batchNumber;
+
+    /**
+     * 单价
+     */
+    @ExcelProperty(value = "单价")
+    private Double unitPrice;
+
+    /**
+     * 出库数量
+     */
+    @ExcelProperty(value = "出库数量")
+    private Double outStockAmount;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unitName;
+
+    /**
+     * 总价
+     */
+    @ExcelProperty(value = "总价")
+    private Double totalPrice;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除")
+    private String delFlag;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 原项目ID
+     */
+    @ExcelProperty(value = "原项目ID")
+    private Long inProjectId;
+
+    /**
+     * 新项目ID
+     */
+    @ExcelProperty(value = "新项目ID")
+    private Long outProjectId;
+
+    /**
+     * 出库单ID
+     */
+    @ExcelProperty(value = "出库单ID")
+    private Long outStockBillId;
+
+    /**
+     * 库存ID
+     */
+    @ExcelProperty(value = "库存ID")
+    private Long inventoryDetailsId;
+
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsOutStockDetailsMapper.java

@@ -0,0 +1,37 @@
+package org.dromara.wms.mapper;
+
+import java.util.List;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.wms.domain.WmsOutStockDetails;
+import org.dromara.wms.domain.vo.WmsOutStockDetailsVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 出库单明细Mapper接口
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+public interface WmsOutStockDetailsMapper extends BaseMapperPlus<WmsOutStockDetails, WmsOutStockDetailsVo> {
+
+    /**
+     * 查询出库单明细列表
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 出库单明细集合
+     */
+    public Page<WmsOutStockDetailsVo> selectCustomWmsOutStockDetailsVoList(@Param("page") Page<WmsOutStockDetailsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsOutStockDetails> queryWrapper);
+
+    /**
+     * 查询出库单明细列表
+     *
+     * @param queryWrapper 条件
+     * @return 出库单明细集合
+     */
+    public List<WmsOutStockDetailsVo> selectCustomWmsOutStockDetailsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsOutStockDetails> queryWrapper);
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsOutStockDetailsService.java

@@ -0,0 +1,69 @@
+package org.dromara.wms.service;
+
+import org.dromara.wms.domain.WmsOutStockDetails;
+import org.dromara.wms.domain.vo.WmsOutStockDetailsVo;
+import org.dromara.wms.domain.bo.WmsOutStockDetailsBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 出库单明细Service接口
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+public interface IWmsOutStockDetailsService {
+
+    /**
+     * 查询出库单明细
+     *
+     * @param outStockDetailsId 主键
+     * @return 出库单明细
+     */
+    WmsOutStockDetailsVo queryById(Long outStockDetailsId);
+
+    /**
+     * 分页查询出库单明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 出库单明细分页列表
+     */
+    TableDataInfo<WmsOutStockDetailsVo> queryPageList(WmsOutStockDetailsBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的出库单明细列表
+     *
+     * @param bo 查询条件
+     * @return 出库单明细列表
+     */
+    List<WmsOutStockDetailsVo> queryList(WmsOutStockDetailsBo bo);
+
+    /**
+     * 新增出库单明细
+     *
+     * @param bo 出库单明细
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(WmsOutStockDetailsBo bo);
+
+    /**
+     * 修改出库单明细
+     *
+     * @param bo 出库单明细
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(WmsOutStockDetailsBo bo);
+
+    /**
+     * 校验并批量删除出库单明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockDetailsServiceImpl.java

@@ -0,0 +1,138 @@
+package org.dromara.wms.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+    import org.dromara.common.mybatis.core.page.TableDataInfo;
+    import org.dromara.common.mybatis.core.page.PageQuery;
+    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.wms.domain.bo.WmsOutStockDetailsBo;
+import org.dromara.wms.domain.vo.WmsOutStockDetailsVo;
+import org.dromara.wms.domain.WmsOutStockDetails;
+import org.dromara.wms.mapper.WmsOutStockDetailsMapper;
+import org.dromara.wms.service.IWmsOutStockDetailsService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 出库单明细Service业务层处理
+ *
+ * @author Yinq
+ * @date 2025-11-12
+ */
+@RequiredArgsConstructor
+@Service
+public class WmsOutStockDetailsServiceImpl implements IWmsOutStockDetailsService {
+
+    private final WmsOutStockDetailsMapper baseMapper;
+
+    /**
+     * 查询出库单明细
+     *
+     * @param outStockDetailsId 主键
+     * @return 出库单明细
+     */
+    @Override
+    public WmsOutStockDetailsVo queryById(Long outStockDetailsId){
+        return baseMapper.selectVoById(outStockDetailsId);
+    }
+
+        /**
+         * 分页查询出库单明细列表
+         *
+         * @param bo        查询条件
+         * @param pageQuery 分页参数
+         * @return 出库单明细分页列表
+         */
+        @Override
+        public TableDataInfo<WmsOutStockDetailsVo> queryPageList(WmsOutStockDetailsBo bo, PageQuery pageQuery) {
+            MPJLambdaWrapper<WmsOutStockDetails> lqw = buildQueryWrapper(bo);
+            Page<WmsOutStockDetailsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            return TableDataInfo.build(result);
+        }
+
+    /**
+     * 查询符合条件的出库单明细列表
+     *
+     * @param bo 查询条件
+     * @return 出库单明细列表
+     */
+    @Override
+    public List<WmsOutStockDetailsVo> queryList(WmsOutStockDetailsBo bo) {
+        MPJLambdaWrapper<WmsOutStockDetails> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<WmsOutStockDetails> buildQueryWrapper(WmsOutStockDetailsBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<WmsOutStockDetails> lqw = JoinWrappers.lambda(WmsOutStockDetails.class)
+        .selectAll(WmsOutStockDetails.class)
+        .eq(WmsOutStockDetails::getDelFlag, "0")
+                    .eq(bo.getWarehouseId() != null, WmsOutStockDetails::getWarehouseId, bo.getWarehouseId())
+                    .eq(bo.getMaterielId() != null, WmsOutStockDetails::getMaterielId, bo.getMaterielId())
+                    .eq(StringUtils.isNotBlank(bo.getBatchNumber()), WmsOutStockDetails::getBatchNumber, bo.getBatchNumber())
+                    .between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+                    WmsOutStockDetails::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"))
+                    .eq(bo.getOutStockBillId() != null, WmsOutStockDetails::getOutStockBillId, bo.getOutStockBillId())
+;
+        return lqw;
+    }
+
+    /**
+     * 新增出库单明细
+     *
+     * @param bo 出库单明细
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(WmsOutStockDetailsBo bo) {
+        WmsOutStockDetails add = MapstructUtils.convert(bo, WmsOutStockDetails.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setOutStockDetailsId(add.getOutStockDetailsId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改出库单明细
+     *
+     * @param bo 出库单明细
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(WmsOutStockDetailsBo bo) {
+        WmsOutStockDetails update = MapstructUtils.convert(bo, WmsOutStockDetails.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(WmsOutStockDetails entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除出库单明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsOutStockDetailsMapper.xml

@@ -0,0 +1,14 @@
+<?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="org.dromara.wms.mapper.WmsOutStockDetailsMapper">
+    <resultMap type="org.dromara.wms.domain.vo.WmsOutStockDetailsVo" id="WmsOutStockDetailsResult">
+    </resultMap>
+
+    <select id="selectCustomWmsOutStockDetailsVoList" resultMap="WmsOutStockDetailsResult">
+        select out_stock_details_id, tenant_id, warehouse_id, materiel_id, batch_number, unit_price, out_stock_amount, unit_name, total_price, del_flag, create_dept, create_by, create_time, update_by, update_time, in_project_id, out_project_id, out_stock_bill_id, inventory_details_id from wms_out_stock_details t
+            ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>