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

库存欠缺入库测试

Browse Source
This commit is contained in:
86156
2024-11-06 14:50:00 +08:00
parent 57a88d5959
commit 660b2ca640
14 changed files with 278 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml
View File

@@ -19,21 +19,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 仓库出库筛选(联查) -->
<select id="defineselectList" resultType="com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo">
<select id="defineSelectList" resultType="com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo">
select
ware.id as id,
ware.project_id as projectId,
ware.amount as amount,
ware.remark as remark,
ware.warehouse_id as warehouseId,
project.project_name as projectName
project.project_name as projectName,
warehouse.name as warehouseName
from
sys_oa_out_warehouse ware
join
sys_oa_project project on ware.project_id = project.project_id
<if test="bo.warehouseName != null and bo.warehouseName != ''">
join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id
</if>
join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id
<where>
<if test="bo.projectName != null and bo.projectName != ''">
and project.project_name like concat('%', #{bo.projectName}, '%')

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

@@ -34,4 +34,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<resultMap type="com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo" id="SysOaOutWarehouseListVoResult">
<result property="projectId" column="project_id"/>
<result property="projectName" column="project_name"/>
<result property="projectName" column="create_time"/>
<association property="outWarehouseVoList" javaType="java.util.List" resultMap="outWarehouseResult"/>
</resultMap>
<resultMap type="com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo" id="outWarehouseResult">
<result property="id" column="soow_id"/>
<result property="amount" column="amount"/>
<result property="warehouseId" column="warehouse_id"/>
<result property="warehouseName" column="name"/>
<result property="createTime" column="out_create_time"/>
</resultMap>
<select id="selectPageOutList" resultMap="SysOaOutWarehouseListVoResult">
select sop.project_id, project_name,soow.warehouse_id,soow.id as soow_id,soow.amount,soow.create_time as out_create_time,sow.name
from sys_oa_project sop
left join sys_oa_out_warehouse soow on soow.project_id = sop.project_id
left join sys_oa_warehouse sow on sow.id = soow.warehouse_id
${ew.getCustomSqlSegment}
</select>
</mapper>