feat(wms): 添加库存台账功能

- 新增库存台账相关的 BO 和 VO 类
- 在 InventoryService 中添加查询库存台账的方法
- 在 InventoryController 中添加库存台账的 API 接口
- 在 InventoryMapper 中添加查询各类库存变动记录的方法
- 在 XML 文件中添加对应的 SQL 查询语句

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

@@ -17,7 +17,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.wms.domain.WmsInventory;
 import org.dromara.wms.domain.bo.WmsInventoryBo;
+import org.dromara.wms.domain.bo.WmsInventoryLedgerBo;
 import org.dromara.wms.domain.vo.WmsInventoryVo;
+import org.dromara.wms.domain.vo.WmsInventoryLedgerVo;
 import org.dromara.wms.service.IWmsInventoryService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -136,4 +138,24 @@ public class WmsInventoryController extends BaseController {
     public R<List<WmsInventoryVo>> getMaterialInfoList(WmsInventoryBo bo) {
         return R.ok(wmsInventoryService.getMaterialInfoList(bo));
     }
+
+    /**
+     * 查询库存台账列表
+     */
+    @SaCheckPermission("system:inventory:list")
+    @GetMapping("/ledger/list")
+    public TableDataInfo<WmsInventoryLedgerVo> ledgerList(WmsInventoryLedgerBo bo, PageQuery pageQuery) {
+        return wmsInventoryService.queryInventoryLedgerPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出库存台账列表
+     */
+    @SaCheckPermission("system:inventory:export")
+    @Log(title = "库存台账", businessType = BusinessType.EXPORT)
+    @PostMapping("/ledger/export")
+    public void exportLedger(WmsInventoryLedgerBo bo, HttpServletResponse response) {
+        List<WmsInventoryLedgerVo> list = wmsInventoryService.queryInventoryLedgerList(bo);
+        ExcelUtil.exportExcel(list, "库存台账", WmsInventoryLedgerVo.class, response);
+    }
 }

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

@@ -0,0 +1,86 @@
+package org.dromara.wms.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 库存台账业务对象 wms_inventory_ledger
+ *
+ * @author LionLi
+ * @date 2025-01-07
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class WmsInventoryLedgerBo extends BaseEntity {
+
+    /**
+     * 物料ID
+     */
+    private Long materialId;
+
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    private String materialName;
+
+    /**
+     * 批次码
+     */
+    private String batchCode;
+
+    /**
+     * 仓库ID
+     */
+    private Long warehouseId;
+
+    /**
+     * 仓库编码
+     */
+    private String warehouseCode;
+
+    /**
+     * 库位编码
+     */
+    private String locationCode;
+
+    /**
+     * 变动类型（1入库，2出库，3调拨，4退库，5盘点调账）
+     */
+    private String changeType;
+
+    /**
+     * 关联单号
+     */
+    private String relatedCode;
+
+    /**
+     * 开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 物料大类ID
+     */
+    private Long materialCategoryId;
+
+    /**
+     * 记账周期类型（1按日，2按月）
+     */
+    private String periodType;
+}

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

@@ -0,0 +1,147 @@
+package org.dromara.wms.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 库存台账视图对象 wms_inventory_ledger
+ *
+ * @author LionLi
+ * @date 2025-01-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class WmsInventoryLedgerVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料ID
+     */
+    private Long materialId;
+
+    /**
+     * 物料编码
+     */
+    @ExcelProperty(value = "物料编码")
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    @ExcelProperty(value = "物料名称")
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    @ExcelProperty(value = "物料规格")
+    private String materialSpec;
+
+    /**
+     * 物料单位
+     */
+    @ExcelProperty(value = "物料单位")
+    private String materialUnit;
+
+    /**
+     * 批次码
+     */
+    @ExcelProperty(value = "批次码")
+    private String batchCode;
+
+    /**
+     * 仓库ID
+     */
+    @ExcelProperty(value = "仓库ID")
+    private Long warehouseId;
+
+    /**
+     * 仓库编码
+     */
+    @ExcelProperty(value = "仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 仓库名称
+     */
+    @ExcelProperty(value = "仓库名称")
+    private String warehouseName;
+
+    /**
+     * 库位编码
+     */
+    @ExcelProperty(value = "库位编码")
+    private String locationCode;
+
+    /**
+     * 变动日期
+     */
+    @ExcelProperty(value = "变动日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date changeDate;
+
+    /**
+     * 变动类型（1入库，2出库，3调拨，4退库，5盘点调账）
+     */
+    @ExcelProperty(value = "变动类型")
+    private String changeType;
+
+    /**
+     * 变动类型名称
+     */
+    @ExcelProperty(value = "变动类型名称")
+    private String changeTypeName;
+
+    /**
+     * 关联单号
+     */
+    @ExcelProperty(value = "关联单号")
+    private String relatedCode;
+
+    /**
+     * 变动数量（正数为入库，负数为出库）
+     */
+    @ExcelProperty(value = "变动数量")
+    private BigDecimal changeQty;
+
+    /**
+     * 结存数量
+     */
+    @ExcelProperty(value = "结存数量")
+    private BigDecimal balanceQty;
+
+    /**
+     * 物料大类ID
+     */
+    private Long materialCategoryId;
+
+    /**
+     * 物料大类名称
+     */
+    private String materialCategoryName;
+
+    /**
+     * 操作人
+     */
+    private String operatorName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+}

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

@@ -4,7 +4,9 @@ import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.wms.domain.WmsInventory;
 import org.dromara.wms.domain.bo.WmsInventoryBo;
+import org.dromara.wms.domain.bo.WmsInventoryLedgerBo;
 import org.dromara.wms.domain.vo.WmsInventoryVo;
+import org.dromara.wms.domain.vo.WmsInventoryLedgerVo;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
@@ -28,4 +30,29 @@ public interface WmsInventoryMapper extends BaseMapperPlus<WmsInventory, WmsInve
     List<WmsInventoryVo> selectSemiInventoryListByLocation(@Param("locationCode") String locationCode);
 
     // WmsInventoryVo outSelectInVentoryByBatch(WmsOutstockRecord outstockRecord);
+
+    /**
+     * 查询入库台账记录
+     */
+    List<WmsInventoryLedgerVo> selectInstockLedgerRecords(@Param("bo") WmsInventoryLedgerBo bo);
+
+    /**
+     * 查询出库台账记录
+     */
+    List<WmsInventoryLedgerVo> selectOutstockLedgerRecords(@Param("bo") WmsInventoryLedgerBo bo);
+
+    /**
+     * 查询盘点调账台账记录
+     */
+    List<WmsInventoryLedgerVo> selectInventoryCheckLedgerRecords(@Param("bo") WmsInventoryLedgerBo bo);
+
+    /**
+     * 查询退库台账记录
+     */
+    List<WmsInventoryLedgerVo> selectReturnOrderLedgerRecords(@Param("bo") WmsInventoryLedgerBo bo);
+
+    /**
+     * 查询调拨台账记录
+     */
+    List<WmsInventoryLedgerVo> selectTransferLedgerRecords(@Param("bo") WmsInventoryLedgerBo bo);
 }

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

@@ -4,8 +4,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.wms.domain.WmsInventory;
 import org.dromara.wms.domain.bo.WmsInventoryBo;
+import org.dromara.wms.domain.bo.WmsInventoryLedgerBo;
 import org.dromara.wms.domain.bo.WmsMoveOrderBo;
 import org.dromara.wms.domain.vo.WmsInventoryVo;
+import org.dromara.wms.domain.vo.WmsInventoryLedgerVo;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -99,4 +101,21 @@ public interface IWmsInventoryService {
      * @return 库存VO
      */
     WmsInventoryVo queryByBatchAndLocation(String batchCode);
+
+    /**
+     * 分页查询库存台账列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 库存台账分页列表
+     */
+    TableDataInfo<WmsInventoryLedgerVo> queryInventoryLedgerPageList(WmsInventoryLedgerBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询库存台账列表
+     *
+     * @param bo 查询条件
+     * @return 库存台账列表
+     */
+    List<WmsInventoryLedgerVo> queryInventoryLedgerList(WmsInventoryLedgerBo bo);
 }

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

@@ -16,8 +16,10 @@ import org.dromara.wms.domain.BaseMaterialInfo;
 import org.dromara.wms.domain.WmsBaseWarehouse;
 import org.dromara.wms.domain.WmsInventory;
 import org.dromara.wms.domain.bo.WmsInventoryBo;
+import org.dromara.wms.domain.bo.WmsInventoryLedgerBo;
 import org.dromara.wms.domain.bo.WmsMoveOrderBo;
 import org.dromara.wms.domain.vo.WmsInventoryVo;
+import org.dromara.wms.domain.vo.WmsInventoryLedgerVo;
 import org.dromara.wms.mapper.WmsInventoryMapper;
 import org.dromara.wms.service.IWmsInventoryService;
 import org.springframework.stereotype.Service;
@@ -280,5 +282,114 @@ public class WmsInventoryServiceImpl implements IWmsInventoryService {
         return baseMapper.selectVoOne(lqw);
     }
 
+    /**
+     * 分页查询库存台账列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 库存台账分页列表
+     */
+    @Override
+    public TableDataInfo<WmsInventoryLedgerVo> queryInventoryLedgerPageList(WmsInventoryLedgerBo bo, PageQuery pageQuery) {
+        List<WmsInventoryLedgerVo> ledgerList = queryInventoryLedgerList(bo);
+        
+        // 手动分页处理
+        int total = ledgerList.size();
+        int pageNum = pageQuery.getPageNum();
+        int pageSize = pageQuery.getPageSize();
+        int fromIndex = (pageNum - 1) * pageSize;
+        int toIndex = Math.min(fromIndex + pageSize, total);
+        
+        List<WmsInventoryLedgerVo> pageList = fromIndex < total ? ledgerList.subList(fromIndex, toIndex) : new ArrayList<>();
+        
+        TableDataInfo<WmsInventoryLedgerVo> dataInfo = TableDataInfo.build(pageList);
+        dataInfo.setTotal(total);
+        return dataInfo;
+    }
+
+    /**
+     * 查询库存台账列表
+     *
+     * @param bo 查询条件
+     * @return 库存台账列表
+     */
+    @Override
+    public List<WmsInventoryLedgerVo> queryInventoryLedgerList(WmsInventoryLedgerBo bo) {
+        List<WmsInventoryLedgerVo> ledgerList = new ArrayList<>();
+        
+        // 1. 查询入库记录
+        ledgerList.addAll(getInstockRecords(bo));
+        
+        // 2. 查询出库记录
+        ledgerList.addAll(getOutstockRecords(bo));
+        
+        // 3. 查询盘点调账记录
+        ledgerList.addAll(getInventoryCheckRecords(bo));
+        
+        // 4. 查询退库记录
+        ledgerList.addAll(getReturnOrderRecords(bo));
+        
+        // 5. 查询调拨记录
+        ledgerList.addAll(getTransferRecords(bo));
+        
+        // 按时间排序
+        ledgerList.sort(Comparator.comparing(WmsInventoryLedgerVo::getChangeDate));
+        
+        // 计算结存数量
+        calculateBalanceQty(ledgerList);
+        
+        return ledgerList;
+    }
+
+    /**
+     * 获取入库记录
+     */
+    private List<WmsInventoryLedgerVo> getInstockRecords(WmsInventoryLedgerBo bo) {
+        return baseMapper.selectInstockLedgerRecords(bo);
+    }
+
+    /**
+     * 获取出库记录
+     */
+    private List<WmsInventoryLedgerVo> getOutstockRecords(WmsInventoryLedgerBo bo) {
+        return baseMapper.selectOutstockLedgerRecords(bo);
+    }
+
+    /**
+     * 获取盘点调账记录
+     */
+    private List<WmsInventoryLedgerVo> getInventoryCheckRecords(WmsInventoryLedgerBo bo) {
+        return baseMapper.selectInventoryCheckLedgerRecords(bo);
+    }
+
+    /**
+     * 获取退库记录
+     */
+    private List<WmsInventoryLedgerVo> getReturnOrderRecords(WmsInventoryLedgerBo bo) {
+        return baseMapper.selectReturnOrderLedgerRecords(bo);
+    }
+
+    /**
+     * 获取调拨记录
+     */
+    private List<WmsInventoryLedgerVo> getTransferRecords(WmsInventoryLedgerBo bo) {
+        return baseMapper.selectTransferLedgerRecords(bo);
+    }
+
+    /**
+     * 计算结存数量
+     */
+    private void calculateBalanceQty(List<WmsInventoryLedgerVo> ledgerList) {
+        Map<String, BigDecimal> balanceMap = new HashMap<>();
+        
+        for (WmsInventoryLedgerVo record : ledgerList) {
+            String key = record.getMaterialId() + "_" + record.getBatchCode() + "_" + record.getLocationCode();
+            BigDecimal currentBalance = balanceMap.getOrDefault(key, BigDecimal.ZERO);
+            BigDecimal newBalance = currentBalance.add(record.getChangeQty());
+            balanceMap.put(key, newBalance);
+            record.setBalanceQty(newBalance);
+        }
+    }
+
 
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         MAX(b.min_stock_amount) min_stock_amount,
         MAX(b.max_stock_amount) max_stock_amount,
         MAX(c.warehouse_code) warehouse_code,
+        MAX(c.warehouse_name) warehouse_name,
         MAX(b.material_code) material_code,
         MAX(b.material_name) material_name,
         MAX(x.lock_state) lock_state,
@@ -103,4 +104,275 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where store_place_code= #{locationCode}
     </select>
 
+    <!-- 库存台账查询 - 入库记录 -->
+    <select id="selectInstockLedgerRecords" resultType="org.dromara.wms.domain.vo.WmsInventoryLedgerVo">
+        SELECT
+            ir.material_id,
+            ir.batch_code,
+            ir.location_code,
+            ir.instock_qty as changeQty,
+            ir.instock_code as relatedCode,
+            ir.create_time as changeDate,
+            ir.create_by as operatorName,
+            '1' as changeType,
+            '入库' as changeTypeName,
+            bmi.material_code,
+            bmi.material_name,
+            bmi.material_spec,
+            bmi.material_unit,
+            wbw.warehouse_code,
+            wbw.warehouse_name,
+            wbw.warehouse_id,
+            bmc.material_category_name,
+            bmi.material_category_id
+        FROM wms_instock_record ir
+        LEFT JOIN base_material_info_copy1 bmi ON ir.material_id = bmi.material_id
+        LEFT JOIN wms_base_warehouse wbw ON ir.warehouse_id = wbw.warehouse_id
+        LEFT JOIN base_material_category bmc ON bmi.material_category_id = bmc.material_category_id
+        <where>
+            <if test="bo.materialCode != null and bo.materialCode != ''">
+                AND bmi.material_code LIKE CONCAT('%', #{bo.materialCode}, '%')
+            </if>
+            <if test="bo.materialName != null and bo.materialName != ''">
+                AND bmi.material_name LIKE CONCAT('%', #{bo.materialName}, '%')
+            </if>
+            <if test="bo.batchCode != null and bo.batchCode != ''">
+                AND ir.batch_code LIKE CONCAT('%', #{bo.batchCode}, '%')
+            </if>
+            <if test="bo.warehouseId != null">
+                AND ir.warehouse_id = #{bo.warehouseId}
+            </if>
+            <if test="bo.locationCode != null and bo.locationCode != ''">
+                AND ir.location_code LIKE CONCAT('%', #{bo.locationCode}, '%')
+            </if>
+            <if test="bo.materialCategoryId != null">
+                AND bmi.material_category_id = #{bo.materialCategoryId}
+            </if>
+            <if test="bo.startDate != null">
+                AND ir.create_time >= #{bo.startDate}
+            </if>
+            <if test="bo.endDate != null">
+                AND ir.create_time &lt;= #{bo.endDate}
+            </if>
+            <if test="bo.changeType != null and bo.changeType != ''">
+                AND '1' = #{bo.changeType}
+            </if>
+        </where>
+        ORDER BY ir.create_time ASC
+    </select>
+
+    <!-- 库存台账查询 - 出库记录 -->
+    <select id="selectOutstockLedgerRecords" resultType="org.dromara.wms.domain.vo.WmsInventoryLedgerVo">
+        SELECT
+            ors.material_id,
+            ors.batch_code,
+            ors.location_code,
+            -ors.outstock_qty as changeQty,
+            ors.outstock_code as relatedCode,
+            ors.create_time as changeDate,
+            ors.create_by as operatorName,
+            '2' as changeType,
+            '出库' as changeTypeName,
+            bmi.material_code,
+            bmi.material_name,
+            bmi.material_spec,
+            bmi.material_unit,
+            wbw.warehouse_code,
+            wbw.warehouse_name,
+            woo.warehouse_id,
+            bmc.material_category_name,
+            bmi.material_category_id
+        FROM wms_outstock_record ors
+        LEFT JOIN wms_outstock_order woo ON ors.outstock_id = woo.outstock_id
+        LEFT JOIN base_material_info_copy1 bmi ON ors.material_id = bmi.material_id
+        LEFT JOIN wms_base_warehouse wbw ON woo.warehouse_id = wbw.warehouse_id
+        LEFT JOIN base_material_category bmc ON bmi.material_category_id = bmc.material_category_id
+        <where>
+            <if test="bo.materialCode != null and bo.materialCode != ''">
+                AND bmi.material_code LIKE CONCAT('%', #{bo.materialCode}, '%')
+            </if>
+            <if test="bo.materialName != null and bo.materialName != ''">
+                AND bmi.material_name LIKE CONCAT('%', #{bo.materialName}, '%')
+            </if>
+            <if test="bo.batchCode != null and bo.batchCode != ''">
+                AND ors.batch_code LIKE CONCAT('%', #{bo.batchCode}, '%')
+            </if>
+            <if test="bo.warehouseId != null">
+                AND woo.warehouse_id = #{bo.warehouseId}
+            </if>
+            <if test="bo.locationCode != null and bo.locationCode != ''">
+                AND ors.location_code LIKE CONCAT('%', #{bo.locationCode}, '%')
+            </if>
+            <if test="bo.materialCategoryId != null">
+                AND bmi.material_category_id = #{bo.materialCategoryId}
+            </if>
+            <if test="bo.startDate != null">
+                AND ors.create_time >= #{bo.startDate}
+            </if>
+            <if test="bo.endDate != null">
+                AND ors.create_time &lt;= #{bo.endDate}
+            </if>
+            <if test="bo.changeType != null and bo.changeType != ''">
+                AND '2' = #{bo.changeType}
+            </if>
+        </where>
+        ORDER BY ors.create_time ASC
+    </select>
+
+    <!-- 库存台账查询 - 盘点调账记录 -->
+    <select id="selectInventoryCheckLedgerRecords" resultType="org.dromara.wms.domain.vo.WmsInventoryLedgerVo">
+        SELECT
+            icr.material_id,
+            icr.batch_code,
+            icr.location_code,
+            (icr.check_qty - icr.inventory_qty) as changeQty,
+            icr.check_code as relatedCode,
+            icr.create_time as changeDate,
+            icr.create_by as operatorName,
+            '5' as changeType,
+            '盘点调账' as changeTypeName,
+            icr.material_code,
+            icr.material_name,
+            bmi.material_spec,
+            bmi.material_unit,
+            '' as warehouse_code,
+            '' as warehouse_name,
+            NULL as warehouse_id
+        FROM wms_inventory_check_record icr
+        LEFT JOIN base_material_info_copy1 bmi ON icr.material_id = bmi.material_id
+        <where>
+            AND icr.is_adjust = '1'
+            <if test="bo.materialCode != null and bo.materialCode != ''">
+                AND icr.material_code LIKE CONCAT('%', #{bo.materialCode}, '%')
+            </if>
+            <if test="bo.materialName != null and bo.materialName != ''">
+                AND icr.material_name LIKE CONCAT('%', #{bo.materialName}, '%')
+            </if>
+            <if test="bo.batchCode != null and bo.batchCode != ''">
+                AND icr.batch_code LIKE CONCAT('%', #{bo.batchCode}, '%')
+            </if>
+            <if test="bo.locationCode != null and bo.locationCode != ''">
+                AND icr.location_code LIKE CONCAT('%', #{bo.locationCode}, '%')
+            </if>
+            <if test="bo.materialCategoryId != null">
+                AND icr.material_category_id = #{bo.materialCategoryId}
+            </if>
+            <if test="bo.startDate != null">
+                AND icr.create_time >= #{bo.startDate}
+            </if>
+            <if test="bo.endDate != null">
+                AND icr.create_time &lt;= #{bo.endDate}
+            </if>
+            <if test="bo.changeType != null and bo.changeType != ''">
+                AND '5' = #{bo.changeType}
+            </if>
+        </where>
+        ORDER BY icr.create_time ASC
+    </select>
+
+    <!-- 库存台账查询 - 退库记录 -->
+    <select id="selectReturnOrderLedgerRecords" resultType="org.dromara.wms.domain.vo.WmsInventoryLedgerVo">
+        SELECT
+            ro.material_id,
+            ro.batch_code,
+            ro.return_location_code as location_code,
+            -ro.return_amount as changeQty,
+            CONCAT('RO', ro.ro_id) as relatedCode,
+            ro.create_time as changeDate,
+            ro.create_by as operatorName,
+            '4' as changeType,
+            '退库' as changeTypeName,
+            bmi.material_code,
+            bmi.material_name,
+            bmi.material_spec,
+            bmi.material_unit,
+            wbw.warehouse_code,
+            wbw.warehouse_name,
+            ro.warehouse_id,
+            bmc.material_category_name,
+            bmi.material_category_id
+        FROM wms_return_order ro
+        LEFT JOIN base_material_info_copy1 bmi ON ro.material_id = bmi.material_id
+        LEFT JOIN wms_base_warehouse wbw ON ro.warehouse_id = wbw.warehouse_id
+        LEFT JOIN base_material_category bmc ON bmi.material_category_id = bmc.material_category_id
+        <where>
+            AND ro.order_status = '2'
+            <if test="bo.materialCode != null and bo.materialCode != ''">
+                AND bmi.material_code LIKE CONCAT('%', #{bo.materialCode}, '%')
+            </if>
+            <if test="bo.materialName != null and bo.materialName != ''">
+                AND bmi.material_name LIKE CONCAT('%', #{bo.materialName}, '%')
+            </if>
+            <if test="bo.batchCode != null and bo.batchCode != ''">
+                AND ro.batch_code LIKE CONCAT('%', #{bo.batchCode}, '%')
+            </if>
+            <if test="bo.warehouseId != null">
+                AND ro.warehouse_id = #{bo.warehouseId}
+            </if>
+            <if test="bo.materialCategoryId != null">
+                AND bmi.material_category_id = #{bo.materialCategoryId}
+            </if>
+            <if test="bo.startDate != null">
+                AND ro.create_time >= #{bo.startDate}
+            </if>
+            <if test="bo.endDate != null">
+                AND ro.create_time &lt;= #{bo.endDate}
+            </if>
+            <if test="bo.changeType != null and bo.changeType != ''">
+                AND '4' = #{bo.changeType}
+            </if>
+        </where>
+        ORDER BY ro.create_time ASC
+    </select>
+
+    <!-- 库存台账查询 - 调拨记录 -->
+    <select id="selectTransferLedgerRecords" resultType="org.dromara.wms.domain.vo.WmsInventoryLedgerVo">
+        SELECT
+            ht.material_id,
+            ht.card_no as batch_code,
+            ht.store_place_code as location_code,
+            0 as changeQty,
+            CONCAT('TF', ht.transfer_id) as relatedCode,
+            ht.create_time as changeDate,
+            ht.create_by as operatorName,
+            '3' as changeType,
+            '调拨' as changeTypeName,
+            bmi.material_code,
+            bmi.material_name,
+            bmi.material_spec,
+            bmi.material_unit,
+            '' as warehouse_code,
+            '' as warehouse_name,
+            NULL as warehouse_id
+        FROM wms_hpp_transfer ht
+        LEFT JOIN base_material_info_copy1 bmi ON ht.material_id = bmi.material_id
+        <where>
+            <if test="bo.materialCode != null and bo.materialCode != ''">
+                AND bmi.material_code LIKE CONCAT('%', #{bo.materialCode}, '%')
+            </if>
+            <if test="bo.materialName != null and bo.materialName != ''">
+                AND bmi.material_name LIKE CONCAT('%', #{bo.materialName}, '%')
+            </if>
+            <if test="bo.batchCode != null and bo.batchCode != ''">
+                AND ht.card_no LIKE CONCAT('%', #{bo.batchCode}, '%')
+            </if>
+            <if test="bo.locationCode != null and bo.locationCode != ''">
+                AND ht.store_place_code LIKE CONCAT('%', #{bo.locationCode}, '%')
+            </if>
+            <if test="bo.materialCategoryId != null">
+                AND bmi.material_category_id = #{bo.materialCategoryId}
+            </if>
+            <if test="bo.startDate != null">
+                AND ht.create_time >= #{bo.startDate}
+            </if>
+            <if test="bo.endDate != null">
+                AND ht.create_time &lt;= #{bo.endDate}
+            </if>
+            <if test="bo.changeType != null and bo.changeType != ''">
+                AND '3' = #{bo.changeType}
+            </if>
+        </where>
+        ORDER BY ht.create_time ASC
+    </select>
+
 </mapper>