diff --git a/src/main/resources/mapper/pms/ResourceSpareMapper.xml b/src/main/resources/mapper/pms/ResourceSpareMapper.xml index cfc0f62d..c61c0d39 100644 --- a/src/main/resources/mapper/pms/ResourceSpareMapper.xml +++ b/src/main/resources/mapper/pms/ResourceSpareMapper.xml @@ -20,10 +20,10 @@ , A.part_no , A.qty_usable , A.id - , B.resource_desc + , B.ObjectDesc resource_desc , C.part_description from resource_spare A - left join resource B on A.site = B.site and A.resource_id = B.resource_id + left join eam_object B on A.site = B.site and A.resource_id = B.ObjectID left join part_spare C on A.site = C.site and A.part_no = C.part_no A.site = #{query.site} @@ -37,11 +37,11 @@ and A.resource_id like '%' + #{query.resourceId} +'%' - and B.resource_desc = '%' + #{query.resourceDesc}+'%' + and B.ObjectDesc = '%' + #{query.resourceDesc}+'%' - GROUP BY A.site, A.resource_id, B.resource_desc, A.part_no, A.qty_usable, A.id + GROUP BY A.site, A.resource_id, B.ObjectDesc , A.part_no, A.qty_usable, A.id , C.part_description