ERP_override.git

			@@ -64,6 +64,7 @@
			<result column="glass_child" property="glassChild"/>
			<result column="process_id" property="processId"/>
			<result column="code" property="code"/>
			<result column="responsible_personnel" property="responsiblePersonnel"/>
			</resultMap>


			@@ -261,6 +262,7 @@
			dd.responsible_team,
			dd.breakage_type,
			dd.breakage_reason,
			dd.responsible_personnel,
			ROUND((dd.breakage_quantity)) as breakage_quantity,
			round(ogd.child_width * ogd.child_height * (dd.breakage_quantity) / 1000000, 2) as area,
			rw.this_process,
			@@ -310,6 +312,9 @@
			<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
			and o.order_id regexp #{crossProcessBreakingDTO.orderId}
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
			</if>
			GROUP BY dd.id
			order by dd.id desc
			limit #{offset},#{pageSize}
			@@ -358,6 +363,9 @@
			</if>
			<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
			and o.order_id regexp #{crossProcessBreakingDTO.orderId}
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
			</if>
			order by dd.id desc
			</select>
			@@ -1420,6 +1428,7 @@
			rw.this_process,
			rw.teams_groups_name,
			o.project,
			o.order_id,
			rw.process_id,
			fc.order_number,
			MAX(ogd.child_width) AS width,