diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 8d900c096..08f78b71b 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -482,7 +482,8 @@ and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货') and ifnull(dh.delete_flag,'0') !='1' - group by di.material_id + group by di.material_id, me.bar_code, m.name,m.model,m.standard,m.color,m.brand,m.mfrs, + mc.name, m.unit, u.basic_unit order by materialId desc diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index e9fc5504d..19bfab726 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -376,7 +376,9 @@ and dh.oper_time <= #{endTime} and ifnull(m.delete_flag,'0') !='1' - group by m.id + group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard, m.brand, + m.other_field1,m.other_field2,m.other_field3,m.unit, u.basic_unit, m.color, m.unit_id, u.name, + me.purchase_decimal, mcs.current_unit_price order by m.id desc limit #{offset},#{rows} @@ -473,7 +475,8 @@ and (dh.status = '1' or dh.status = '2' or dh.status = '3') and ifnull(m.delete_flag,'0') !='1' - group by m.id + group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard, + m.other_field1,m.other_field2,m.other_field3, m.unit, u.basic_unit, m.color, m.brand, u.name order by m.id desc limit #{offset},#{rows}