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 15:29:04 +08:00
parent 218734592f
commit 08f638b691
6 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
View File

@@ -55,7 +55,10 @@ public class SysOaWarehouseMasterController extends BaseController {
public TableDataInfo<SysOaWarehouseMasterVo> list(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
return iSysOaWarehouseMasterService.queryPageList(bo, pageQuery);
}
@GetMapping("/list/return")
public TableDataInfo<SysOaWarehouseMasterVo> listReturn(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
return iSysOaWarehouseMasterService.queryPageReturnList(bo, pageQuery);
}
/**
* 导出出库单管理列表
*/

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
View File

@@ -82,4 +82,9 @@ public class SysOaWarehouseMasterVo {
private Date nearestEndTime;
private Integer returnType;
/**
* 日志操作次数
*/
private Integer logCount;
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMasterMapper.java
View File

@@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
public interface SysOaWarehouseMasterMapper extends BaseMapperPlus<SysOaWarehouseMasterMapper, SysOaWarehouseMaster, SysOaWarehouseMasterVo> {
Page<SysOaWarehouseMasterVo> selectVoPagePlus(@Param("page") Page<SysOaWarehouseMasterVo> build, @Param(Constants.WRAPPER) QueryWrapper<SysOaWarehouseMaster> lqw);
Page<SysOaWarehouseMasterVo> selectVoPagePlusWithLogCount(@Param("page") Page<SysOaWarehouseMasterVo> build, @Param(Constants.WRAPPER) QueryWrapper<SysOaWarehouseMaster> lqw);
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
View File

@@ -27,6 +27,7 @@ public interface ISysOaWarehouseMasterService {
* 查询出库单管理列表
*/
TableDataInfo<SysOaWarehouseMasterVo> queryPageList(SysOaWarehouseMasterBo bo, PageQuery pageQuery);
TableDataInfo<SysOaWarehouseMasterVo> queryPageReturnList(SysOaWarehouseMasterBo bo, PageQuery pageQuery);
/**
* 查询出库单管理列表

9
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
View File

@@ -76,6 +76,13 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<SysOaWarehouseMasterVo> queryPageReturnList(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
QueryWrapper<SysOaWarehouseMaster> lqw = buildQueryWrapper(bo);
Page<SysOaWarehouseMasterVo> result = baseMapper.selectVoPagePlusWithLogCount(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询出库单管理列表
*/
@@ -191,6 +198,8 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
}
return true;
}
/**
* 保存前的数据校验
*/

32
ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
View File

@@ -21,6 +21,7 @@
<result property="projectName" column="project_name"/>
<result property="status" column="status"/>
<result property="nearestEndTime" column="nearest_end_time"/>
<result property="logCount" column="logCount"/>
<collection property="warehouseList"
column="master_id"
@@ -57,6 +58,37 @@
${ew.getCustomSqlSegment}
</select>
<!-- ===================================================== -->
<!-- 分页查询（包含日志操作次数） -->
<!-- ===================================================== -->
<select id="selectVoPagePlusWithLogCount"
resultMap="SysOaWarehouseMasterResult">
SELECT
sowm.master_id,
sowm.master_num,
sowm.type,
sowm.project_id,
sowm.sign_time,
sowm.sign_user,
sowm.remark,
sowm.status,
${ew.sqlSelect},
sop.project_name,
IFNULL(log_count.log_count, 0) AS logCount
FROM sys_oa_warehouse_master sowm
LEFT JOIN sys_oa_project sop
ON sop.project_id = sowm.project_id
LEFT JOIN (
SELECT
master_id,
COUNT(1) AS log_count
FROM sys_oa_warehouse_log
WHERE del_flag = 0
GROUP BY master_id
) log_count ON log_count.master_id = sowm.master_id
${ew.getCustomSqlSegment}
</select>
<select id="selectDetailByMasterId"
parameterType="long"
resultType="com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo">