ERP_override.git

			@@ -132,6 +132,8 @@
			<result column="workProcessName" property="workProcessName"/>
			<result column="device_name" property="deviceName"/>
			<result column="order_type" property="orderType"/>
			<result column="thicknessSum" property="thicknessSum"/>
			<result column="thicknessArea" property="thicknessArea"/>
			</resultMap>

			<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
			@@ -203,7 +205,8 @@


			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
			b.`group`
			b.`group`,
			c.termination_status

			from pp.flow_card as c
			left join
			@@ -250,7 +253,7 @@
			on e.process_id = c.process_id
			and e.technology_number = c.technology_number
			and e.order_number = c.order_number
			where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
			where a.order_id = #{orderId} and d.create_order>0
			group by c.order_number,
			c.technology_number,
			c.process_id
			@@ -274,52 +277,161 @@
			rw.this_process,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
			rw.creator
			rw.creator,
			rw.reporting_work_id,
			ogd.child_width,
			ogd.child_height,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
			from
			sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
			left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
			left join pp.reporting_work as rw on rw.order_id=o.order_id
			left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
			and dd.technology_number=ogd.technology_number
			where date(rw.reporting_work_time) >= #{startDate}
			and date(rw.reporting_work_time) <= #{endDate}
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			where (rw.reporting_work_time) >= #{startDate}
			and (rw.reporting_work_time) <= #{endDate}
			and rw.this_worn_quantity > 0
			and dd.available = 0
			and reviewed_state != 2
			and reviewed_state >-1
			and rw.this_process != dd.responsible_process
			and o.create_order>0
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
			and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
			and rw.process_id regexp #{crossProcessBreakingDTO.processId}
			and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
			and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
			and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
			and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
			and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
			</if>
			<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
			and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
			and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
			</if>
			<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
			and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
			and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
			</if>
			<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
			and o.project regexp #{crossProcessBreakingDTO.project}
			and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
			</if>
			<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
			and o.order_id regexp #{crossProcessBreakingDTO.orderId}
			and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
			and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
			</if>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator regexp #{crossProcessBreakingDTO.creator}
			and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
			</if>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
			</if>
			GROUP BY dd.id
			order by dd.id desc
			limit #{offset},#{pageSize}
			</select>

			<select id="getNotProcessBreaking" resultMap="damageDetailsTableMap">
			select rw.reporting_work_id,
			rw.reporting_work_time,
			dd.responsible_process,
			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,
			o.project,
			o.order_id,
			ogd.glass_child,
			rw.this_process,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
			rw.creator,
			rw.reporting_work_id,
			ogd.child_width,
			ogd.child_height,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
			from
			sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
			left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
			left join pp.reporting_work as rw on rw.order_id=o.order_id
			left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
			and dd.technology_number=ogd.technology_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			where (rw.reporting_work_time) >= #{startDate}
			and (rw.reporting_work_time) <= #{endDate}
			and rw.this_worn_quantity > 0
			and dd.available = 0
			and reviewed_state >-1
			and rw.this_process = dd.responsible_process
			and o.create_order>0
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
			and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
			and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
			and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
			and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
			</if>
			<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
			and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
			</if>
			<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
			and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
			</if>
			<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
			and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
			</if>
			<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
			and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
			</if>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
			</if>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
			</if>
			GROUP BY dd.id
			order by dd.id desc
			@@ -337,41 +449,129 @@
			left join sd.order_glass_detail as ogd
			on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
			and ogd.technology_number and dd.technology_number
			where date(rw.reporting_work_time) >= #{startDate}
			and date(rw.reporting_work_time) <= #{endDate}
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			where (rw.reporting_work_time) >= #{startDate}
			and (rw.reporting_work_time) <= #{endDate}
			and rw.this_worn_quantity > 0
			and dd.available = 0
			and reviewed_state != 2
			and rw.reviewed_state>=0
			and rw.this_process != dd.responsible_process
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
			and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
			and rw.process_id regexp #{crossProcessBreakingDTO.processId}
			and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
			and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
			and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
			and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
			and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
			</if>
			<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
			and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
			and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
			</if>
			<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
			and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
			and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
			</if>
			<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
			and o.project regexp #{crossProcessBreakingDTO.project}
			and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
			</if>
			<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
			and o.order_id regexp #{crossProcessBreakingDTO.orderId}
			and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
			and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
			</if>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
			</if>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
			</if>
			order by dd.id desc
			</select>

			<select id="getNotProcessBreakingTotal">
			select CEILING(count(dd.id) / #{pageSize}) as 'pageTotal',
			count(distinct dd.id) as 'total'
			from pp.damage_details as dd
			left join pp.reporting_work as rw
			on rw.reporting_work_id = dd.reporting_work_id
			left join sd.order as o
			on rw.order_id = o.order_id
			left join sd.order_glass_detail as ogd
			on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
			and ogd.technology_number and dd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			where (rw.reporting_work_time) >= #{startDate}
			and (rw.reporting_work_time) <= #{endDate}
			and rw.this_worn_quantity > 0
			and dd.available = 0
			and reviewed_state != 2
			and rw.this_process = dd.responsible_process
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
			and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
			and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
			and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
			and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
			</if>
			<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
			and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
			</if>
			<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
			and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
			</if>
			<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
			and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
			</if>
			<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
			and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
			</if>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
			</if>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
			</if>
			<if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
			</if>
			<if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
			</if>
			order by dd.id desc
			</select>
			@@ -576,7 +776,8 @@
			fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0) as incompleteNum,
			ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
			2) as incompleteArea,
			od.product_name
			od.product_name,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness

			from sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			@@ -594,6 +795,7 @@
			and odpd.process_id = fc.process_id
			left join sd.`order` as o
			on o.order_id = od.order_id
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			where o.create_order>0
			and odpd.process = #{selectProcesses}
			and o.create_time >= #{selectTime1}
			@@ -629,7 +831,9 @@
			ogd.child_height,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
			rw.this_process,
			rw.creator
			rw.creator,
			rw.reporting_work_id,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
			FROM
			sd.ORDER AS o
			LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
			@@ -638,52 +842,65 @@
			AND dd.order_number = ogd.order_number
			AND dd.technology_number = ogd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			WHERE
			rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND rw.reporting_work_time <= #{selectTime2}

			AND dd.available = 0 and rw.reviewed_state>=0
			<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
			and o.order_id regexp #{damageReportDTO.orderId}
			and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
			</if>
			<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
			and o.project regexp #{damageReportDTO.project}
			and o.project like concat('%', #{damageReportDTO.project}, '%')
			</if>
			<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
			and rw.process_id regexp #{damageReportDTO.processId}
			and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
			</if>
			<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
			and dd.order_number regexp #{damageReportDTO.orderNumber}
			and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
			</if>
			<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
			and dd.technology_number regexp #{damageReportDTO.technologyNumber}
			and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
			</if>
			<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
			and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
			</if>
			<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
			and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
			</if>
			<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
			and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
			and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
			</if>
			<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
			and dd.breakage_type regexp #{damageReportDTO.breakageType}
			and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
			</if>
			<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
			and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
			and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
			</if>
			<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
			and ogd.glass_child regexp #{damageReportDTO.glassChild}
			and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
			</if>
			<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
			</if>
			<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
			and rw.this_process regexp #{damageReportDTO.thisProcess}
			and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
			</if>
			<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
			and rw.creator regexp #{damageReportDTO.creator}
			and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
			</if>
			<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
			</if>
			<if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
			</if>
			<if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
			</if>
			<if test="damageReportDTO.thickness != null and damageReportDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{damageReportDTO.thickness}, '%')
			</if>
			GROUP BY
			dd.id
			@@ -701,42 +918,65 @@
			LEFT JOIN pp.damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
			AND dd.order_number = ogd.order_number
			AND dd.technology_number = ogd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			WHERE
			rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND dd.available = 0
			AND rw.reporting_work_time <= #{selectTime2}
			AND dd.available = 0 and rw.reviewed_state>=0
			<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
			and o.order_id regexp #{damageReportDTO.orderId}
			and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
			</if>
			<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
			and o.project regexp #{damageReportDTO.project}
			and o.project like concat('%', #{damageReportDTO.project}, '%')
			</if>
			<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
			and rw.process_id regexp #{damageReportDTO.processId}
			and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
			</if>
			<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
			and dd.order_number regexp #{damageReportDTO.orderNumber}
			and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
			</if>
			<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
			and dd.technology_number regexp #{damageReportDTO.technologyNumber}
			and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
			</if>
			<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
			and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
			</if>
			<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
			and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
			</if>
			<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
			and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
			and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
			</if>
			<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
			and dd.breakage_type regexp #{damageReportDTO.breakageType}
			and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
			</if>
			<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
			and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
			and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
			</if>
			<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
			and ogd.glass_child regexp #{damageReportDTO.glassChild}
			and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
			</if>
			<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
			</if>
			<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
			and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
			</if>
			<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
			and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
			</if>
			<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
			</if>
			<if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
			</if>
			<if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
			</if>
			<if test="damageReportDTO.thickness != null and damageReportDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{damageReportDTO.thickness}, '%')
			</if>
			limit #{offset},#{pageSize};
			</select>
			@@ -821,7 +1061,7 @@
			SUM(t.breakageQuantity) as breakageQuantity,
			SUM(t.breakageArea) as breakageArea,
			t.responsibleTeam,
			CONCAT(ROUND(ROUND(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished,
			CONCAT(ROUND(TRUNCATE(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished,
			t.product_name
			FROM
			(
			@@ -884,23 +1124,44 @@
			</select>

			<select id="productionScheduleMp">
			select a.order_number,
			if(a.shape='' \|\| ISNULL(a.shape),'普形',if(a.shape = 1, '普形', if(a.shape = 2, '异形', ''))) as shape,
			a.product_name,
			select a.product_name,
			b.glass_child,
			d.order_type,
			concat(c.process_id, '/', c.technology_number) as process_id,
			c.process_id as 'processId',
			c.order_id,
			c.order_number,
			c.technology_number,
			b.child_width,
			b.child_height,
			c.quantity - ifnull(c.termination_quantity,0) as quantity,
			c.technology_number,
			b.glass_child,
			ifnull(e.reportWorkQuantity, 0) as reportWorkQuantity,
			ifnull(e.reportWorkQuantityCount, 0) as reportWorkQuantityCount,
			ifnull(f.inventory, 0) as inventoryNum,
			round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
			ifnull(dd.quantity, 0) as shippedQuantity,
			ifnull(dd.area, 0) as area,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
			c.quantity,

			from flow_card as c
			c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/用于判断是否改变颜色/
			e.reportWorkQuantity,
			e.reportWorkQuantityShow,
			e.reportWorkQuantityCount,
			e.reportWorkTime,
			e.broken_num,
			c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,

			c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
			round( (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2) as grossAreaShow,
			ifnull(c.received_quantity, 0) as inventoryNum,
			ifnull(dd.quantity, 0) as shippedQuantityShow, -- 发货数量
			round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedAreaShow, -- 发货面积
			round((ifnull(c.received_quantity, 0))*a.compute_area,2) as inventoryArea,-- 入库面积

			round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2)as grossArea,
			ifnull(c.received_quantity, 0) as Storage,
			ifnull(dd.quantity, 0) as shippedQuantity,
			round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedArea,
			round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageArea,


			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
			b.`group`

			from pp.flow_card as c
			left join
			sd.order_detail as a
			on c.order_id = a.order_id
			@@ -911,30 +1172,45 @@
			and c.technology_number = b.technology_number
			left join sd.`order` as d
			on c.order_id = d.order_id
			left join mm.finished_goods_inventory as f
			on c.order_id = f.order_id and f.order_number = c.order_number
			left join (SELECT process_id,
			order_number,
			technology_number,
			sum(a.broken_num) as broken_num,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
			'}'
			) as reportWorkQuantity,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
			'}'
			) as reportWorkQuantityCount
			FROM sd.order_process_detail as a
			where a.order_id = #{orderId}
			GROUP BY process_id, a.order_number,a.technology_number) as e
			on e.process_id = c.process_id
			and e.order_number=c.order_number
			and e.technology_number = c.technology_number
			left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
			where a.order_id = #{orderId} and d.create_order>0 and c.quantity - ifnull(c.termination_quantity,0)>0
			group by c.order_number,c.technology_number
			ORDER BY a.order_number
			# left join mm.finished_goods_inventory as f
			# on c.order_id = f.order_id and f.order_number = c.order_number
			left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
			left join (SELECT process_id,
			order_number,
			technology_number,
			sum(a.broken_num) as broken_num,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' \|\| bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
			'}'
			) as reportWorkQuantity,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
			'}'
			) as reportWorkQuantityShow,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
			'}'
			) as reportWorkQuantityCount,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
			'}'
			) as reportWorkTime
			FROM sd.order_process_detail as a
			left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
			on a.process = bd.basic_name
			where a.order_id =#{orderId}
			GROUP BY process_id, a.order_number, a.technology_number


			) as e
			on e.process_id = c.process_id
			and e.technology_number = c.technology_number
			and e.order_number = c.order_number
			where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
			group by c.order_number,
			c.technology_number,
			c.process_id
			order by c.process_id, c.order_number, c.technology_number
			</select>

			<select id="taskCompletionStatusMp">
			@@ -1074,7 +1350,15 @@
			rw.this_process,
			o.project,
			o.order_id,
			ogd.glass_child
			ogd.glass_child,
			rw.this_process,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
			rw.creator,
			rw.reporting_work_id,
			ogd.child_width,
			ogd.child_height,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
			from damage_details as dd
			left join reporting_work as rw
			on rw.reporting_work_id = dd.reporting_work_id
			@@ -1083,12 +1367,53 @@
			left join sd.order_glass_detail as ogd
			on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
			and ogd.technology_number and dd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			where date(rw.reporting_work_time) >= #{dates[0]}
			and date(rw.reporting_work_time) <= #{dates[1]}
			and rw.this_worn_quantity > 0
			and dd.available = 0
			and reviewed_state != 2
			and rw.this_process != dd.responsible_process
			GROUP BY dd.id
			order by dd.id desc
			</select>

			<select id="exportNotCrossProcessBreakingMp">
			select rw.reporting_work_id,
			rw.reporting_work_time,
			dd.responsible_process,
			dd.responsible_team,
			dd.breakage_type,
			dd.breakage_reason,
			ROUND((dd.breakage_quantity)) as breakage_quantity,
			round(ogd.child_width * ogd.child_height * (dd.breakage_quantity) / 1000000, 2) as area,
			rw.this_process,
			o.project,
			o.order_id,
			ogd.glass_child,
			rw.this_process,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
			rw.creator,
			rw.reporting_work_id,
			ogd.child_width,
			ogd.child_height,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
			from damage_details as dd
			left join reporting_work as rw
			on rw.reporting_work_id = dd.reporting_work_id
			left join sd.order as o
			on rw.order_id = o.order_id
			left join sd.order_glass_detail as ogd
			on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
			and ogd.technology_number and dd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			where date(rw.reporting_work_time) >= #{dates[0]}
			and date(rw.reporting_work_time) <= #{dates[1]}
			and rw.this_worn_quantity > 0
			and dd.available = 0
			and reviewed_state != 2
			and rw.this_process = dd.responsible_process
			GROUP BY dd.id
			order by dd.id desc
			</select>
			@@ -1111,13 +1436,20 @@
			IFNULL(dd.responsible_personnel, '') as personnel,
			ogd.glass_child,
			ogd.child_width,
			ogd.child_height
			ogd.child_height,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
			rw.this_process,
			rw.creator,
			rw.reporting_work_id,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
			FROM sd.ORDER AS o
			LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
			LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
			LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
			AND dd.order_number = ogd.order_number
			AND dd.technology_number = ogd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			WHERE rw.reporting_work_time >= #{dates[0]}
			and rw.reporting_work_time <= #{dates[1]}
			AND dd.available = 0 and rw.reviewed_state>=0
			@@ -1190,7 +1522,8 @@
			od.quantity - odpd.reporting_work_num as incompleteNum,
			ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
			2) as incompleteArea,
			od.product_name
			od.product_name,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness

			from sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			@@ -1208,6 +1541,7 @@
			and odpd.process_id = fc.process_id
			left join sd.`order` as o
			on o.order_id = od.order_id
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			where o.create_order>0
			and odpd.process = #{process}
			and date(o.create_time) >= #{date[0]}
			@@ -1283,7 +1617,9 @@
			and position(#{process} in odpd.process)
			and position(ifnull(#{inputVal}, '') in od.order_id)
			and position(ifnull(#{project}, '') in o.project)

			<if test="terminationVals != '1' and terminationVals != 1">
			and fc.termination_status !=1
			</if>
			group by fc.process_id, fc.order_number, fc.technology_number,odpd.process
			order by fc.process_id, fc.order_number, fc.technology_number
			</select>
			@@ -1433,8 +1769,27 @@
			</select>

			<select id="teamOutputMp" resultMap="teamOutputMap">

			SELECT
			*
			t.*,
			-- 玻璃总厚度（mm）
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt
			) AS thicknessSum,
			ROUND(
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt2
			) * t.area,
			2
			) AS thicknessArea
			FROM
			(
			SELECT
			@@ -1498,7 +1853,7 @@
			AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
			</if>
			<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
			AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
			and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
			</if>
			<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
			AND o.project REGEXP #{teamOutputDTO.project}
			@@ -1512,7 +1867,15 @@
			<if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
			AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
			</if>

			<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
			AND o.batch REGEXP #{teamOutputDTO.batch}
			</if>
			<if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
			</if>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -1540,6 +1903,10 @@
			<if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
			AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
			</if>
			HAVING 1 = 1
			<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
			and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
			</if>
			ORDER BY
			t.this_process,
			t.process_id,
			@@ -1551,39 +1918,84 @@

			<select id="exportTeamOutputMp">
			SELECT
			t.*,
			-- 玻璃总厚度（mm）
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt
			) AS thicknessSum,
			ROUND(
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt2
			) * t.area,
			2
			) AS thicknessArea
			FROM
			(
			SELECT
			rw.reporting_work_time,
			rw.this_process,
			rw.teams_groups_name,
			o.project,
			o.order_id,
			rw.process_id,
			fc.order_number,
			MAX( ogd.child_width ) as width,
			MAX( ogd.child_height ) as height,
			MAX(ogd.child_width) AS width,
			MAX(ogd.child_height) AS height,
			od.edging_type,
			rwd.completed_quantity as completed_quantity,
			ROUND(MAX( ogd.child_width )MAX( ogd.child_height )rwd.completed_quantity/1000000,2) as area,
			rwd.completed_quantity AS completed_quantity,
			ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
			od.product_name,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
			rw.reviewed,
			rw.examine_time,
			rw.device_name,
			o.order_type,
			-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
			CASE
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX( ogd.glass_child )
			WHEN LOCATE('step', #{laminating}) > 0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX(ogd.glass_child)
			END AS workProcessName,
			o.batch
			FROM
			reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
			left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
			left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
			left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
			left join sd.`order` as o on o.order_id=od.order_id
			where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
			rw.reporting_work_time >= #{date[0]}
			pp.reporting_work AS rw
			LEFT JOIN pp.reporting_work_detail AS rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN pp.flow_card AS fc
			ON fc.order_id = rw.order_id
			AND fc.process_id = rw.process_id
			AND fc.order_number = rwd.order_number
			AND fc.technology_number = rwd.technology_number
			LEFT JOIN sd.order_glass_detail AS ogd
			ON ogd.order_id = fc.order_id
			AND ogd.order_number = fc.order_number
			AND ogd.technology_number = fc.technology_number
			LEFT JOIN sd.order_detail AS od
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN sd.`order` AS o
			ON o.order_id = od.order_id
			WHERE
			o.create_order > 0
			AND rw.reviewed_state >= 0
			AND rwd.completed_quantity > 0
			AND rw.reporting_work_time >= #{date[0]}
			AND rw.reporting_work_time < #{date[1]}
			and position(#{process} in rw.this_process)
			<choose>
			<!-- 有传工序：精确匹配 -->
			<when test="process != null and process != ''">
			AND rw.this_process = #{process}
			</when>
			<!-- 未传工序：不加限制，查所有） -->
			<otherwise>
			</otherwise>
			</choose>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -1596,7 +2008,7 @@
			</when>
			<otherwise>
			GROUP BY
			<if test="laminating == 'stepA' \|\| laminating == 'stepC'" >
			<if test="laminating == 'stepA' \|\| laminating == 'stepC'">
			ogd.`group`,
			</if>
			rw.reporting_work_id,
			@@ -1606,60 +2018,132 @@
			rwd.order_number
			</otherwise>
			</choose>
			) t
			ORDER BY
			rw.this_process,
			rw.process_id,
			rwd.order_number,
			rw.reporting_work_time,
			rw.teams_groups_name
			t.this_process,
			t.process_id,
			t.order_number,
			t.reporting_work_time,
			t.teams_groups_name
			</select>

			<select id="teamOutputPageTotal">
			SELECT
			CEILING(count(*)/#{pageSize}) as 'pageTotal',
			count(*) as 'total'
			FROM
			CEILING(COUNT(*) / #{pageSize}) AS pageTotal,
			COUNT(*) AS total
			FROM (

			SELECT
			t.*,

			CASE
			WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
			ELSE (
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt
			)
			END AS thicknessSum,
			CASE
			WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
			ELSE ROUND(
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg2, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
			'$[*]' COLUMNS (seg2 VARCHAR(100) PATH '$')
			) jt2
			) * t.area,
			2
			)
			END AS thicknessArea
			FROM (
			SELECT
			rw.reporting_work_time,
			rw.this_process,
			rw.teams_groups_name,
			o.project,
			o.order_id,
			rw.process_id,
			fc.order_number,
			MAX( ogd.child_width ) as width,
			MAX( ogd.child_height ) as height,
			MAX(ogd.child_width) AS width,
			MAX(ogd.child_height) AS height,
			od.edging_type,
			rwd.completed_quantity as completed_quantity,
			ROUND(MAX( ogd.child_width )MAX( ogd.child_height )rwd.completed_quantity/1000000,2) as area,
			rwd.completed_quantity AS completed_quantity,
			ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
			od.product_name,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
			rw.reviewed,
			rw.examine_time,
			rw.device_name,
			o.order_type,
			CASE
			WHEN LOCATE('step', #{laminating}) > 0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX(ogd.glass_child)
			END AS workProcessName,
			o.batch
			FROM
			pp.reporting_work as rw left join pp.reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
			left join pp.flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
			left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
			left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
			left join sd.`order` as o on o.order_id=od.order_id
			where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
			rw.reporting_work_time >= #{selectTime1}
			pp.reporting_work AS rw
			LEFT JOIN pp.reporting_work_detail AS rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN pp.flow_card AS fc
			ON fc.order_id = rw.order_id
			AND fc.process_id = rw.process_id
			AND fc.order_number = rwd.order_number
			AND fc.technology_number = rwd.technology_number
			LEFT JOIN sd.order_glass_detail AS ogd
			ON ogd.order_id = fc.order_id
			AND ogd.order_number = fc.order_number
			AND ogd.technology_number = fc.technology_number
			LEFT JOIN sd.order_detail AS od
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN sd.`order` AS o
			ON o.order_id = od.order_id
			WHERE
			o.create_order > 0
			AND rw.reviewed_state >= 0
			AND rwd.completed_quantity > 0
			AND rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			and position(#{selectProcesses} in rw.this_process)
			<choose>
			<!-- 有传工序：精确匹配 -->
			<when test="selectProcesses != null and selectProcesses != ''">
			AND rw.this_process = #{selectProcesses}
			</when>
			<!-- 未传工序：不加限制 -->
			<otherwise>
			</otherwise>
			</choose>
			<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
			and rw.this_process regexp #{teamOutputDTO.thisProcess}
			AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
			</if>
			<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{teamOutputDTO.teamsGroupsName}
			AND rw.teams_groups_name LIKE CONCAT('%', #{teamOutputDTO.teamsGroupsName}, '%')
			</if>
			<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
			and o.project regexp #{teamOutputDTO.project}
			AND o.project REGEXP #{teamOutputDTO.project}
			</if>
			<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
			and rw.process_id regexp #{teamOutputDTO.processId}
			AND rw.process_id REGEXP #{teamOutputDTO.processId}
			</if>
			<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			AND od.edging_type REGEXP #{teamOutputDTO.edgingType}
			</if>

			<if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
			AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
			</if>
			<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
			AND o.batch REGEXP #{teamOutputDTO.batch}
			</if>
			<if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
			</if>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -1679,13 +2163,19 @@
			rwd.order_number
			</otherwise>
			</choose>
			ORDER BY
			rw.this_process,
			rw.process_id,
			rwd.order_number,
			rw.reporting_work_time,
			rw.teams_groups_name
			) as page_toal
			) t
			WHERE 1 = 1
			<if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
			AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
			</if>
			) x
			WHERE 1 = 1
			<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
			and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
			AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
			</if>
			limit #{offset},#{pageSize}
			</select>

			@@ -2141,29 +2631,51 @@
			and position(#{selectProcesses} in d.process)
			and position(#{orderId} in od.order_id)
			and position(#{inputProject} in o.project)
			<if test="terminationVals != '1' and terminationVals != 1">
			and fc.termination_status !=1
			</if>
			<if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
			and d.process like concat('%', #{workInProgressDTO.thisProcess}, '%')
			</if>
			<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
			and o.customer_name regexp #{workInProgressDTO.customerName}
			and o.customer_name like concat('%', #{workInProgressDTO.customerName}, '%')
			</if>
			<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
			and o.project regexp #{workInProgressDTO.project}
			and o.project like concat('%', #{workInProgressDTO.project}, '%')
			</if>
			<if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
			and o.order_id regexp #{workInProgressDTO.orderId}
			and o.order_id like concat('%', #{workInProgressDTO.orderId}, '%')
			</if>
			<if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
			and o.batch regexp #{workInProgressDTO.batch}
			and o.batch like concat('%', #{workInProgressDTO.batch}, '%')
			</if>
			<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
			and fc.process_id regexp #{workInProgressDTO.processId}
			and fc.process_id like concat('%', #{workInProgressDTO.processId}, '%')
			</if>
			<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
			and ogd.order_number regexp #{workInProgressDTO.orderNumber}
			and ogd.order_number like concat('%', #{workInProgressDTO.orderNumber}, '%')
			</if>
			<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
			and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
			and ogd.technology_number like concat('%', #{workInProgressDTO.technologyNumber}, '%')
			</if>
			<if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
			and od.quantity like concat('%', #{workInProgressDTO.quantity}, '%')
			</if>
			<if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{workInProgressDTO.childWidth},'\\.0+$','')
			</if>
			<if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{workInProgressDTO.childHeight},'\\.0+$','')
			</if>
			<if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
			and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) like concat('%', #{workInProgressDTO.stockNum}, '%')
			</if>
			<if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
			and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
			d.broken_num) / 1000000, 2) regexp REGEXP_REPLACE(#{workInProgressDTO.stockArea},'\\.0+$','')
			</if>
			<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{workInProgressDTO.glassNumber}, '%')
			</if>

			group by fc.process_id, fc.order_number, fc.technology_number,d.process
			@@ -2219,54 +2731,106 @@
			AND dd.technology_number = ogd.technology_number
			LEFT JOIN sd.order_detail AS od ON o.order_id = od.order_id
			AND od.order_number = ogd.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id
			WHERE
			rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND rw.reporting_work_time <= #{selectTime2}
			AND dd.available = 0 and rw.reviewed_state>=0
			<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
			and o.order_id regexp #{damageReportDTO.orderId}
			and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
			</if>
			<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
			and o.project regexp #{damageReportDTO.project}
			and o.project like concat('%', #{damageReportDTO.project}, '%')
			</if>
			<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
			and rw.process_id regexp #{damageReportDTO.processId}
			and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
			</if>
			<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
			and dd.order_number regexp #{damageReportDTO.orderNumber}
			and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
			</if>
			<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
			and dd.technology_number regexp #{damageReportDTO.technologyNumber}
			and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
			</if>
			<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
			and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
			</if>
			<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
			and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
			</if>
			<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
			and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
			and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
			</if>
			<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
			and dd.breakage_type regexp #{damageReportDTO.breakageType}
			and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
			</if>
			<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
			and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
			and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
			</if>
			<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
			and ogd.glass_child regexp #{damageReportDTO.glassChild}
			and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
			</if>
			<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
			</if>
			<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
			and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
			</if>
			<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
			and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
			</if>
			<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
			and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
			</if>
			<if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
			</if>
			<if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
			</if>
			<if test="damageReportDTO.thickness != null and damageReportDTO.thickness != ''">
			and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{damageReportDTO.thickness}, '%')
			</if>
			</select>

			<select id="teamOutputFootSum">
			SELECT
			SUM(completed_quantity) as completedQuantity,
			ifnull(SUM(ROUND(width * height * completed_quantity / 1000000, 2)),0) AS area
			FROM
			-- 数量合计
			SUM(x.completed_quantity) AS completedQuantity,
			-- 面积合计
			IFNULL(SUM(x.area), 0) AS area,
			-- 厚度×面积合计
			IFNULL(SUM(x.thicknessArea), 0) AS thicknessArea
			FROM (
			/* 第 2 层：在这里根据 workProcessName 计算 thicknessSum / thicknessArea */
			SELECT
			t.*,
			/* 玻璃总厚度：只取每段前面的数字相加 */
			CASE
			WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
			ELSE (
			SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CAST(CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]') AS JSON),
			'$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
			) jt
			)
			END AS thicknessSum,
			/* 厚度 × 面积 */
			CASE
			WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
			ELSE ROUND(
			(
			SELECT SUM(CAST(REGEXP_SUBSTR(seg2, '^[0-9]+') AS UNSIGNED))
			FROM JSON_TABLE(
			CAST(CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]') AS JSON),
			'$[*]' COLUMNS (seg2 VARCHAR(100) PATH '$')
			) jt2
			) * t.area,
			2
			)
			END AS thicknessArea
			FROM (
			/* 第 1 层：只负责算好 workProcessName、area 等基础字段 */
			SELECT
			rw.reporting_work_time,
			rw.this_process,
			@@ -2327,7 +2891,7 @@
			AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
			</if>
			<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
			AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
			AND rw.teams_groups_name LIKE CONCAT('%', #{teamOutputDTO.teamsGroupsName}, '%')
			</if>
			<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
			AND o.project REGEXP #{teamOutputDTO.project}
			@@ -2341,7 +2905,15 @@
			<if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
			AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
			</if>

			<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
			AND o.batch REGEXP #{teamOutputDTO.batch}
			</if>
			<if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
			and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
			and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
			</if>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -2369,12 +2941,17 @@
			<if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
			AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
			</if>
			ORDER BY
			t.this_process,
			t.process_id,
			t.order_number,
			t.reporting_work_time,
			t.teams_groups_name
			) x
			WHERE 1 = 1
			<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
			and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
			</if>
			<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
			AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
			</if>
			;


			</select>

			<select id="getLaminating">
			@@ -2462,48 +3039,51 @@
			and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
			and position(#{orderId} in od.order_id)
			and position(#{inputProject} in o.project)
			<if test="terminationVals != '1' and terminationVals != 1">
			and fc.termination_status !=1
			</if>
			<if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
			and d.process regexp #{workInProgressDTO.thisProcess}
			and d.process like concat('%', #{workInProgressDTO.thisProcess}, '%')
			</if>
			<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
			and o.customer_name regexp #{workInProgressDTO.customerName}
			and o.customer_name like concat('%', #{workInProgressDTO.customerName}, '%')
			</if>
			<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
			and o.project regexp #{workInProgressDTO.project}
			and o.project like concat('%', #{workInProgressDTO.project}, '%')
			</if>
			<if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
			and o.order_id regexp #{workInProgressDTO.orderId}
			and o.order_id like concat('%', #{workInProgressDTO.orderId}, '%')
			</if>
			<if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
			and o.batch regexp #{workInProgressDTO.batch}
			and o.batch like concat('%', #{workInProgressDTO.batch}, '%')
			</if>
			<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
			and fc.process_id regexp #{workInProgressDTO.processId}
			and fc.process_id like concat('%', #{workInProgressDTO.processId}, '%')
			</if>
			<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
			and ogd.order_number regexp #{workInProgressDTO.orderNumber}
			and ogd.order_number like concat('%', #{workInProgressDTO.orderNumber}, '%')
			</if>
			<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
			and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
			and ogd.technology_number like concat('%', #{workInProgressDTO.technologyNumber}, '%')
			</if>
			<if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
			and od.quantity regexp #{workInProgressDTO.quantity}
			and od.quantity like concat('%', #{workInProgressDTO.quantity}, '%')
			</if>
			<if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
			and ogd.child_width regexp #{workInProgressDTO.childWidth}
			and ogd.child_width regexp REGEXP_REPLACE(#{workInProgressDTO.childWidth},'\\.0+$','')
			</if>
			<if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
			and ogd.child_height regexp #{workInProgressDTO.childHeight}
			and ogd.child_height regexp REGEXP_REPLACE(#{workInProgressDTO.childHeight},'\\.0+$','')
			</if>
			<if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
			and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) regexp #{workInProgressDTO.stockNum}
			and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) like concat('%', #{workInProgressDTO.stockNum}, '%')
			</if>
			<if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
			and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
			d.broken_num) / 1000000, 2) regexp #{workInProgressDTO.stockArea}
			d.broken_num) / 1000000, 2) regexp REGEXP_REPLACE(#{workInProgressDTO.stockArea},'\\.0+$','')
			</if>
			<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{workInProgressDTO.glassNumber}, '%')
			</if>
			<choose>
			<when test="laminating != null and laminating == 'stepC'">
			@@ -2917,8 +3497,13 @@
			) AS cb ON cb.process_id = b.process_id
			AND cb.order_sort = b.order_number
			AND cb.technology_number = b.technology_number
			left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
			and fc.technology_number = d.technology_number
			where a.processing_card>0
			and a.warehousing!=2
			<if test=" terminationVal != '1' and terminationVal != 1">
			and termination_status !=1
			</if>
			GROUP BY b.process_id, b.order_number,
			b.technology_number) as f
			LEFT JOIN sd.order_process_detail as e
			@@ -3007,8 +3592,13 @@
			) AS cb ON cb.process_id = b.process_id
			AND cb.order_sort = b.order_number
			AND cb.technology_number = b.technology_number
			left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
			and fc.technology_number = d.technology_number
			where a.processing_card>0
			and a.warehousing!=2
			<if test="terminationVal != '1' and terminationVal != 1">
			and termination_status !=1
			</if>
			GROUP BY b.process_id, b.order_number,
			b.technology_number) as f
			LEFT JOIN sd.order_process_detail as e
			@@ -3093,8 +3683,13 @@
			) AS cb ON cb.process_id = b.process_id
			AND cb.order_sort = b.order_number
			AND cb.technology_number = b.technology_number
			left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
			and fc.technology_number = d.technology_number
			where a.processing_card>0
			and a.warehousing!=2
			<if test="terminationVal != '1' and terminationVal != 1">
			and termination_status !=1
			</if>
			and (c.quantity-b.reporting_work_num_count)>0
			GROUP BY b.process_id, b.order_number,
			b.technology_number) as f
			@@ -3344,5 +3939,63 @@
			GROUP BY hz.project,hz.batch,glass_child
			</select>

			<select id="yieldProcessMp">
			SELECT
			t.this_process as process,
			SUM(t.completed_quantity) as completedQuantity,
			SUM(t.area) as completedArea,
			SUM(t.breakageQuantity) as breakageQuantity,
			SUM(t.breakageArea) as breakageArea,
			CONCAT(ROUND(TRUNCATE(SUM(t.area)/(SUM(t.area) + SUM(t.breakageArea)),2)*100), '%') as finished
			FROM
			(
			SELECT
			rw.reporting_work_time,
			rw.this_process,
			o.project,
			o.batch,
			rw.process_id,
			rwd.completed_quantity AS completed_quantity,
			ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
			IFNULL(dd.breakage_quantity,0) as breakageQuantity,
			IFNULL(ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * dd.breakage_quantity / 1000000, 2),0) AS breakageArea,
			IFNULL(dd.responsible_team,'') as responsibleTeam,
			od.product_name

			FROM
			reporting_work AS rw
			LEFT JOIN reporting_work_detail AS rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN damage_details as dd on dd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN flow_card AS fc
			ON fc.order_id = rw.order_id
			AND fc.process_id = rw.process_id
			AND fc.order_number = rwd.order_number
			AND fc.technology_number = rwd.technology_number
			LEFT JOIN sd.order_glass_detail AS ogd
			ON ogd.order_id = fc.order_id
			AND ogd.order_number = fc.order_number
			AND ogd.technology_number = fc.technology_number
			LEFT JOIN sd.order_detail AS od
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN sd.`order` AS o
			ON o.order_id = od.order_id
			WHERE
			o.create_order > 0
			AND rw.reviewed_state >= 0
			AND rwd.completed_quantity + IFNULL(dd.breakage_quantity,0)> 0
			AND rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time <= #{selectTime2}
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number,
			rwd.technology_number
			) t
			GROUP BY
			t.this_process
			</select>
			</mapper>