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

4
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseLogBo.java
View File

@@ -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; // 新增：物料名称
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseLogVo.java
View File

@@ -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;//物料规格
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseLogMapper.java
View File

@@ -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<SysOaWarehouseLogMapper, SysOaWarehouseLog, SysOaWarehouseLogVo> {
Page<SysOaWarehouseLogVo> selectVoPagePlus(Page<?> page, @Param("ew") Object lqw);
List<SysOaWarehouseLogVo> selectVoListPlus(@Param("ew") Object lqw);
}

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;
}
/**

26
ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseLogMapper.xml
View File

@@ -16,6 +16,32 @@
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="selectVoPagePlus" resultType="com.ruoyi.oa.domain.vo.SysOaWarehouseLogVo">
SELECT
log.*,
master.master_num AS master_num,
ware.name AS warehouse_name,
ware.brand AS warehouse_brand,
ware.model AS warehouse_model,
ware.specifications AS warehouse_spspecifications
FROM sys_oa_warehouse_log log
LEFT JOIN sys_oa_warehouse_master master ON log.master_id = master.master_id
LEFT JOIN sys_oa_warehouse ware ON log.warehouse_id = ware.id
${ew.customSqlSegment}
</select>
<select id="selectVoListPlus" resultType="com.ruoyi.oa.domain.vo.SysOaWarehouseLogVo">
SELECT
log.*,
master.master_num AS master_num,
ware.name AS warehouse_name,
ware.brand AS warehouse_brand,
ware.model AS warehouse_model,
ware.specifications AS warehouse_spspecifications
FROM sys_oa_warehouse_log log
LEFT JOIN sys_oa_warehouse_master master ON log.master_id = master.master_id
LEFT JOIN sys_oa_warehouse ware ON log.warehouse_id = ware.id
${ew.customSqlSegment}
</select>
</mapper>