diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 30c2c261..c2add95c 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -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_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' - where 1=1 and me.default_flag=1 + where 1=1 and me.default_flag=1 and m.enabled=1 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_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' - where 1=1 and me.default_flag=1 + where 1=1 and me.default_flag=1 and m.enabled=1 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' where 1=1 and me.default_flag=1 + and m.enabled=1 and ifnull(m.delete_flag,'0') !='1' and mis.depot_id=mcs.depot_id and ((ifnull(mis.low_safe_stock,0)!=0 and mcs.current_number < 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' where 1=1 and me.default_flag=1 + and m.enabled=1 and ifnull(m.delete_flag,'0') !='1' and mis.depot_id=mcs.depot_id and ((ifnull(mis.low_safe_stock,0)!=0 and mcs.current_number < ifnull(mis.low_safe_stock,0)) diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml index bd0ebf2e..839607f4 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -671,6 +671,7 @@ left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' where 1=1 and me.default_flag=1 + and m.enabled=1 and m.category_id in @@ -719,6 +720,7 @@ left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' where 1=1 and me.default_flag=1 + and m.enabled=1 and m.category_id in @@ -756,6 +758,7 @@ left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' where 1=1 and me.default_flag=1 + and m.enabled=1 and mcs.depot_id in @@ -845,4 +848,4 @@ - \ No newline at end of file +