DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

退库管理

Browse Source
This commit is contained in:
Joshi
2025-06-28 14:19:32 +08:00
parent 01b17c4a01
commit 218734592f
5 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseLogServiceImpl.java
View File

@@ -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<SysOaWarehouseLogVo> queryPageList(SysOaWarehouseLogBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOaWarehouseLog> lqw = buildQueryWrapper(bo);
Page<SysOaWarehouseLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
QueryWrapper<SysOaWarehouseLog> lqw = buildQueryWrapper(bo);
Page<SysOaWarehouseLogVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -54,17 +55,19 @@ public class SysOaWarehouseLogServiceImpl implements ISysOaWarehouseLogService {
*/
@Override
public List<SysOaWarehouseLogVo> queryList(SysOaWarehouseLogBo bo) {
LambdaQueryWrapper<SysOaWarehouseLog> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
QueryWrapper<SysOaWarehouseLog> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoListPlus(lqw);
}
private LambdaQueryWrapper<SysOaWarehouseLog> buildQueryWrapper(SysOaWarehouseLogBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaWarehouseLog> 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<SysOaWarehouseLog> buildQueryWrapper(SysOaWarehouseLogBo bo) {
QueryWrapper<SysOaWarehouseLog> 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;
}
/**