From 218734592f027bf6b79e05c518fadb384889e3d4 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 28 Jun 2025 14:19:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=BA=93=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/domain/bo/SysOaWarehouseLogBo.java | 4 +++ .../oa/domain/vo/SysOaWarehouseLogVo.java | 7 +++++ .../oa/mapper/SysOaWarehouseLogMapper.java | 7 ++++- .../impl/SysOaWarehouseLogServiceImpl.java | 25 ++++++++++-------- .../mapper/oa/SysOaWarehouseLogMapper.xml | 26 +++++++++++++++++++ 5 files changed, 57 insertions(+), 12 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseLogBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseLogBo.java index 182d6fa..f826118 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseLogBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseLogBo.java @@ -1,5 +1,6 @@ package com.ruoyi.oa.domain.bo; +import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import lombok.Data; @@ -46,5 +47,8 @@ public class SysOaWarehouseLogBo extends BaseEntity { */ private String remark; + private String masterNum;// 新增：出库单号 + private String warehouseName; // 新增：物料名称 + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseLogVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseLogVo.java index 85445a2..9893a72 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseLogVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseLogVo.java @@ -50,6 +50,13 @@ public class SysOaWarehouseLogVo { */ @ExcelProperty(value = "备注") private String remark; + @ExcelProperty(value = "出库单号") + private String masterNum;// 新增：出库单号 + @ExcelProperty(value = "备注") + private String warehouseName; // 新增：物料名称 + private String warehouseBrand; // 新增：物料品牌 + private String warehouseModel; // 新增：物料型号 + private String warehouseSpspecifications;//物料规格 } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseLogMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseLogMapper.java index 9eb4a4a..3a3c82c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseLogMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseLogMapper.java @@ -1,8 +1,12 @@ package com.ruoyi.oa.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.oa.domain.SysOaWarehouseLog; import com.ruoyi.oa.domain.vo.SysOaWarehouseLogVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 日志Mapper接口 @@ -11,5 +15,6 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; * @date 2025-06-28 */ public interface SysOaWarehouseLogMapper extends BaseMapperPlus { - + Page selectVoPagePlus(Page page, @Param("ew") Object lqw); + List selectVoListPlus(@Param("ew") Object lqw); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseLogServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseLogServiceImpl.java index 7e92dbc..958cf15 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseLogServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseLogServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.oa.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; @@ -44,8 +45,8 @@ public class SysOaWarehouseLogServiceImpl implements ISysOaWarehouseLogService { */ @Override public TableDataInfo queryPageList(SysOaWarehouseLogBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -54,17 +55,19 @@ public class SysOaWarehouseLogServiceImpl implements ISysOaWarehouseLogService { */ @Override public List queryList(SysOaWarehouseLogBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + QueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoListPlus(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysOaWarehouseLogBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getMasterId() != null, SysOaWarehouseLog::getMasterId, bo.getMasterId()); - lqw.eq(bo.getWarehouseId() != null, SysOaWarehouseLog::getWarehouseId, bo.getWarehouseId()); - lqw.eq(bo.getNum() != null, SysOaWarehouseLog::getNum, bo.getNum()); - return lqw; + private QueryWrapper buildQueryWrapper(SysOaWarehouseLogBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq(bo.getMasterId() != null, "log.master_id", bo.getMasterId()); + qw.eq(bo.getWarehouseId() != null, "log.warehouse_id", bo.getWarehouseId()); + qw.eq(bo.getNum() != null, "log.num", bo.getNum()); + // 新增模糊查询 + qw.like(org.apache.commons.lang3.StringUtils.isNotBlank(bo.getMasterNum()), "master.master_num", bo.getMasterNum()); + qw.like(org.apache.commons.lang3.StringUtils.isNotBlank(bo.getWarehouseName()), "ware.name", bo.getWarehouseName()); + return qw; } /** diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseLogMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseLogMapper.xml index a614d35..a6e810d 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseLogMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseLogMapper.xml @@ -16,6 +16,32 @@ + +