From e1db17435f1ece4a55773a0238935eec4d4d3f99 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Mon, 11 Aug 2025 15:34:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=8A=A0=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=B5=81=E6=B0=B4=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsStockLogMapper 中添加 selectVoPagePlus 方法，支持自定义查询条件
- 在 WmsStockLogServiceImpl 中实现自定义查询方法，使用 QueryWrapper 替代 LambdaQueryWrapper
- 在 WmsStockLogVo 中添加 warehouseName 字段，用于显示仓库/库区名称
- 更新 mapper XML 文件，添加自定义查询 SQL 语句
---
 .../java/com/klp/domain/vo/WmsStockLogVo.java |  6 +++++-
 .../com/klp/mapper/WmsStockLogMapper.java     |  6 ++++++
 .../service/impl/WmsStockLogServiceImpl.java  | 20 +++++++++++++++++--
 .../mapper/klp/WmsStockLogMapper.xml          |  7 +++++++
 4 files changed, 36 insertions(+), 3 deletions(-)

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
index b8fc3df7..16703ed8 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockLogVo.java
@@ -81,5 +81,9 @@ public class WmsStockLogVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    /**
+     * 仓库/库区名称
+     */
+    @ExcelProperty(value = "仓库/库区名称")
+    private String warehouseName;
 }
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java
index 1a047ca6..bf987bff 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsStockLogMapper.java
@@ -1,8 +1,13 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.klp.domain.WmsStock;
 import com.klp.domain.WmsStockLog;
 import com.klp.domain.vo.WmsStockLogVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 库存流水Mapper接口
@@ -12,4 +17,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsStockLogMapper extends BaseMapperPlus<WmsStockLogMapper, WmsStockLog, WmsStockLogVo> {
 
+    Page<WmsStockLogVo> selectVoPagePlus(Page<?> page, @Param("ew") Wrapper<WmsStockLog> wrapper);
 }
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
index d05a0baa..09b255dc 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.klp.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,8 +45,8 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService {
      */
     @Override
     public TableDataInfo<WmsStockLogVo> queryPageList(WmsStockLogBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsStockLog> lqw = buildQueryWrapper(bo);
-        Page<WmsStockLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<WmsStockLog> lqw = buildQueryWrapperPlus(bo);
+        Page<WmsStockLogVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -58,6 +59,21 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService {
         return baseMapper.selectVoList(lqw);
     }
 
+    private QueryWrapper<WmsStockLog> buildQueryWrapperPlus(WmsStockLogBo bo) {
+        QueryWrapper<WmsStockLog> lqw = Wrappers.query();
+        lqw.eq("sl.del_flag", 0);
+        lqw.eq(bo.getWarehouseId() != null, "sl.warehouse_id", bo.getWarehouseId());
+        lqw.eq(bo.getItemId() != null, "sl.item_id", bo.getItemId());
+        lqw.eq(StringUtils.isNotBlank(bo.getItemType()), "sl.item_type", bo.getItemType());
+        lqw.eq(bo.getChangeQty() != null, "sl.change_qty", bo.getChangeQty());
+        lqw.eq(bo.getAfterQty() != null, "sl.after_qty", bo.getAfterQty());
+        lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), "sl.change_type", bo.getChangeType());
+        // 根据时间区间查询
+        lqw.ge(bo.getStartTime() != null, "sl.change_time", bo.getStartTime());
+        lqw.le(bo.getEndTime() != null, "sl.change_time", bo.getEndTime());
+        return lqw;
+    }
+
     private LambdaQueryWrapper<WmsStockLog> buildQueryWrapper(WmsStockLogBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WmsStockLog> lqw = Wrappers.lambdaQuery();
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml
index 8b134608..bbc40cc1 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsStockLogMapper.xml
@@ -21,5 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsStockLogVo">
+        select sl.*, w.warehouse_name
+        from wms_stock_log sl
+        left join wms_warehouse w on sl.warehouse_id = w.warehouse_id
+        ${ew.customSqlSegment}
+    </select>
+
 
 </mapper>