purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给采购销售统计和出入库汇总接口增加数据角色类型参数

Browse Source
This commit is contained in:
季圣华
2022-08-08 23:55:56 +08:00
parent 9a496ffa87
commit f89a9c006a
8 changed files with 97 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -331,6 +331,13 @@
<if test="oId != null">
and dh.organ_id = #{oId}
</if>
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
#{creator}
</foreach>
)
</if>
<if test="depotList.size()>0">
<if test="type == '入库'">
and ((
@@ -374,6 +381,13 @@
<if test="oId != null">
and dh.organ_id = #{oId}
</if>
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
#{creator}
</foreach>
)
</if>
<if test="depotList.size()>0">
<if test="type == '入库'">
and ((

28
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -315,6 +315,13 @@
<if test="endTime != null">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
#{creator}
</foreach>
)
</if>
and ifnull(m.delete_flag,'0') !='1'
group by m.id
order by m.id desc
@@ -346,6 +353,13 @@
<if test="endTime != null">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
#{creator}
</foreach>
)
</if>
and ifnull(di.delete_flag,'0') !='1'
group by m.id) cc
</select>
@@ -357,6 +371,13 @@
and di.material_id =#{MId}
and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime}
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
#{creator}
</foreach>
)
</if>
and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1'
</select>
@@ -368,6 +389,13 @@
and di.material_id =#{MId}
and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime}
<if test="creatorArray != null">
and dh.creator in (
<foreach collection="creatorArray" item="creator" separator=",">
#{creator}
</foreach>
)
</if>
and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1'
</select>