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

解决商品禁用之后，商品库存和商品库存预警相关报表查询的bug

Browse Source
This commit is contained in:
jishenghua
2025-12-19 11:00:59 +08:00
parent dcad796f3d
commit 1d5f0aefa8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,7 +359,7 @@
left join jsh_depot_item di on di.material_id=m.id and ifnull(di.delete_Flag,'0') !='1' left join jsh_depot_item di on di.material_id=m.id and ifnull(di.delete_Flag,'0') !='1'
left join jsh_depot_head dh on di.header_id=dh.id and ifnull(dh.delete_flag,'0') !='1' left join jsh_depot_head dh on di.header_id=dh.id and ifnull(dh.delete_flag,'0') !='1'
left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1' left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1'
where 1=1 and me.default_flag=1 where 1=1 and me.default_flag=1 and m.enabled=1
<if test="materialParam != null and materialParam !=''"> <if test="materialParam != null and materialParam !=''">
<bind name="bindKey" value="'%'+materialParam+'%'"/> <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}
@@ -391,7 +391,7 @@
left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_depot_item di on di.material_id=m.id and ifnull(di.delete_Flag,'0') !='1' left join jsh_depot_item di on di.material_id=m.id and ifnull(di.delete_Flag,'0') !='1'
left join jsh_depot_head dh on di.header_id=dh.id and ifnull(dh.delete_flag,'0') !='1' left join jsh_depot_head dh on di.header_id=dh.id and ifnull(dh.delete_flag,'0') !='1'
where 1=1 and me.default_flag=1 where 1=1 and me.default_flag=1 and m.enabled=1
<if test="materialParam != null and materialParam !=''"> <if test="materialParam != null and materialParam !=''">
<bind name="bindKey" value="'%'+materialParam+'%'"/> <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}
@@ -900,6 +900,7 @@
left join jsh_depot d on d.id=mis.depot_id and ifnull(u.delete_flag,'0') !='1' left join jsh_depot d on d.id=mis.depot_id and ifnull(u.delete_flag,'0') !='1'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
and m.enabled=1
and ifnull(m.delete_flag,'0') !='1' and ifnull(m.delete_flag,'0') !='1'
and mis.depot_id=mcs.depot_id and mis.depot_id=mcs.depot_id
and ((ifnull(mis.low_safe_stock,0)!=0 and mcs.current_number &lt; ifnull(mis.low_safe_stock,0)) and ((ifnull(mis.low_safe_stock,0)!=0 and mcs.current_number &lt; ifnull(mis.low_safe_stock,0))
@@ -939,6 +940,7 @@
left join jsh_depot d on d.id=mis.depot_id and ifnull(u.delete_flag,'0') !='1' left join jsh_depot d on d.id=mis.depot_id and ifnull(u.delete_flag,'0') !='1'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
and m.enabled=1
and ifnull(m.delete_flag,'0') !='1' and ifnull(m.delete_flag,'0') !='1'
and mis.depot_id=mcs.depot_id and mis.depot_id=mcs.depot_id
and ((ifnull(mis.low_safe_stock,0)!=0 and mcs.current_number &lt; ifnull(mis.low_safe_stock,0)) and ((ifnull(mis.low_safe_stock,0)!=0 and mcs.current_number &lt; ifnull(mis.low_safe_stock,0))

5
jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -671,6 +671,7 @@
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
and m.enabled=1
<if test="idList.size()>0"> <if test="idList.size()>0">
and m.category_id in and m.category_id in
<foreach collection="idList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="idList" item="item" index="index" separator="," open="(" close=")">
@@ -719,6 +720,7 @@
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
and m.enabled=1
<if test="idList.size()>0"> <if test="idList.size()>0">
and m.category_id in and m.category_id in
<foreach collection="idList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="idList" item="item" index="index" separator="," open="(" close=")">
@@ -756,6 +758,7 @@
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
and m.enabled=1
<if test="depotList.size()>0"> <if test="depotList.size()>0">
and mcs.depot_id in and mcs.depot_id in
<foreach collection="depotList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="depotList" item="item" index="index" separator="," open="(" close=")">
@@ -845,4 +848,4 @@
</if> </if>
</select> </select>
</mapper> </mapper>