ERP_override.git

			@@ -612,6 +612,9 @@
			<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
			and ogd.glass_child regexp #{damageReportDTO.glassChild}
			</if>
			<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
			</if>
			GROUP BY
			dd.id
			limit #{offset},#{pageSize};