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

修改库存显示

Browse Source
This commit is contained in:
qiankunpingtai
2019-07-29 11:51:19 +08:00
parent 44f3ccbd74
commit 07d4055bb6
4 changed files with 20 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -149,7 +149,7 @@
and ifnull(delete_Flag,'0') !='1'
</select>
<select id="findByTypeAndMaterialIdIn" resultType="java.lang.Integer">
<select id="findByTypeAndMaterialIdIn" resultType="java.lang.Long">
select ifnull(sum(BasicNumber),0) as BasicNumber from jsh_depothead dh
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
where dh.type='入库'
@@ -157,7 +157,7 @@
and ifnull(dh.delete_Flag,'0') !='1'
</select>
<select id="findByTypeAndMaterialIdOut" resultType="java.lang.Integer">
<select id="findByTypeAndMaterialIdOut" resultType="java.lang.Long">
select ifnull(sum(BasicNumber),0) as BasicNumber from jsh_depothead dh
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
where dh.type='出库'

21
src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -24,8 +24,11 @@
<bind name="model" value="'%' + _parameter.model + '%'"/>
and m.model like #{model}
</if>
<if test="categoryId != 1">
and m.CategoryId in (#{categoryIds})
<if test="categoryIds != null and categoryIds != ''">
and m.CategoryId in
<foreach item="did" index="index" collection="categoryIds.split(',')" open="(" separator="," close=")">
#{did}
</foreach>
</if>
and ifnull(m.delete_Flag,'0') !='1'
order by m.id asc
@@ -49,8 +52,11 @@
<bind name="model" value="'%' + _parameter.model + '%'"/>
and m.model like #{model}
</if>
<if test="categoryId != 1">
and m.CategoryId in (#{categoryIds})
<if test="categoryIds != null and categoryIds != ''">
and m.CategoryId in
<foreach item="did" index="index" collection="categoryIds.split(',')" open="(" separator="," close=")">
#{did}
</foreach>
</if>
and ifnull(m.delete_Flag,'0') !='1'
</select>
@@ -108,8 +114,11 @@
<bind name="model" value="'%' + _parameter.model + '%'"/>
and m.model like #{model}
</if>
<if test="categoryId != 1">
and m.CategoryId in (#{categoryIds})
<if test="categoryIds != null and categoryIds != ''">
and m.CategoryId in
<foreach item="did" index="index" collection="categoryIds.split(',')" open="(" separator="," close=")">
#{did}
</foreach>
</if>
and ifnull(m.delete_Flag,'0') !='1'
order by m.id asc