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>


			@@ -106,6 +107,8 @@
			<result column="glassNumber" property="glassNumber"/>
			<result column="child_width" property="childWidth"/>
			<result column="child_height" property="childHeight"/>
			<result column="this_process" property="thisProcess"/>
			<result column="creator" property="creator"/>
			</resultMap>

			<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
			@@ -200,7 +203,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
			@@ -247,7 +251,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
			@@ -261,6 +265,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,
			@@ -269,18 +274,20 @@
			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
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
			rw.creator,
			rw.reporting_work_id
			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 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
			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}
			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 != ''">
			@@ -310,6 +317,94 @@
			<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>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator regexp #{crossProcessBreakingDTO.creator}
			</if>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
			</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
			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 (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' )) regexp #{crossProcessBreakingDTO.code}
			</if>
			<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
			and rw.process_id regexp #{crossProcessBreakingDTO.processId}
			</if>
			<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
			and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
			</if>
			<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
			</if>
			<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
			</if>
			<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
			and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
			</if>
			<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
			and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
			</if>
			<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
			and o.project regexp #{crossProcessBreakingDTO.project}
			</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>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator regexp #{crossProcessBreakingDTO.creator}
			</if>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
			</if>
			GROUP BY dd.id
			order by dd.id desc
			limit #{offset},#{pageSize}
			@@ -318,19 +413,20 @@
			<select id="getProcessBreakingTotal">
			select CEILING(count(dd.id) / #{pageSize}) as 'pageTotal',
			count(distinct dd.id) as 'total'
			from damage_details as dd
			left join reporting_work as rw
			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
			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}
			@@ -358,6 +454,69 @@
			</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>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
			</if>
			<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
			</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' )) regexp #{crossProcessBreakingDTO.code}
			</if>
			<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
			and rw.process_id regexp #{crossProcessBreakingDTO.processId}
			</if>
			<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
			and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
			</if>
			<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
			and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
			</if>
			<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
			and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
			</if>
			<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
			and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
			</if>
			<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
			and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
			</if>
			<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
			and o.project regexp #{crossProcessBreakingDTO.project}
			</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>
			<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
			</if>
			order by dd.id desc
			</select>
			@@ -613,18 +772,21 @@
			ogd.glass_child,
			ogd.child_width,
			ogd.child_height,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
			rw.this_process,
			rw.creator,
			rw.reporting_work_id
			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
			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.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			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 != ''">
			@@ -663,6 +825,15 @@
			<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
			</if>
			<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
			and rw.this_process regexp #{damageReportDTO.thisProcess}
			</if>
			<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
			and rw.creator regexp #{damageReportDTO.creator}
			</if>
			<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{damageReportDTO.reportingWorkId}
			</if>
			GROUP BY
			dd.id
			limit #{offset},#{pageSize};
			@@ -675,14 +846,14 @@
			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
			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
			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}
			</if>
			@@ -862,23 +1033,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
			@@ -889,30 +1081,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">
			@@ -1052,7 +1259,12 @@
			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
			from damage_details as dd
			left join reporting_work as rw
			on rw.reporting_work_id = dd.reporting_work_id
			@@ -1061,12 +1273,50 @@
			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
			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>
			@@ -1089,13 +1339,18 @@
			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
			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
			WHERE rw.reporting_work_time >= #{dates[0]}
			and rw.reporting_work_time <= #{dates[1]}
			AND dd.available = 0 and rw.reviewed_state>=0
			@@ -1261,7 +1516,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>
			@@ -1420,6 +1677,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,
			@@ -1439,10 +1697,10 @@
			END AS workProcessName,
			o.batch
			FROM
			reporting_work AS rw
			LEFT JOIN reporting_work_detail AS rwd
			pp.reporting_work AS rw
			LEFT JOIN pp.reporting_work_detail AS rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN flow_card AS fc
			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
			@@ -1475,7 +1733,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}
			@@ -1488,6 +1746,9 @@
			</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>

			<choose>
			@@ -1612,8 +1873,8 @@
			od.product_name,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
			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
			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
			@@ -1625,7 +1886,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}
			@@ -1636,7 +1897,9 @@
			<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			</if>

			<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
			AND o.batch REGEXP #{teamOutputDTO.batch}
			</if>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -2118,6 +2381,9 @@
			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.customerName != null and workInProgressDTO.customerName != ''">
			and o.customer_name regexp #{workInProgressDTO.customerName}
			</if>
			@@ -2156,7 +2422,7 @@
			SUM(odpd.reporting_work_num) AS completeNum,
			ROUND(SUM(ogd.child_width * ogd.child_height * odpd.reporting_work_num) / 1000000, 2) AS completeArea,
			SUM(fc.quantity - odpd.reporting_work_num) AS incompleteNum,
			ROUND(SUM(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num)) / 1000000, 2) AS incompleteArea
			ROUND(SUM(ogd.child_width * ogd.child_height * (CAST(fc.quantity AS SIGNED) - CAST(odpd.reporting_work_num AS SIGNED))) / 1000000, 2) AS incompleteArea
			FROM sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			@@ -2179,7 +2445,7 @@
			AND o.create_time < #{selectTime2}
			and position(#{orderId} in od.order_id)
			and position(#{inputProject} in o.project)
			AND fc.quantity - odpd.reporting_work_num > 0;
			AND CAST(fc.quantity AS SIGNED) - CAST(odpd.reporting_work_num AS SIGNED)>0;

			</select>

			@@ -2190,15 +2456,15 @@
			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
			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.order_detail AS od ON o.order_id = od.order_id
			AND od.order_number = ogd.order_number
			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}
			@@ -2268,10 +2534,10 @@
			END AS workProcessName,
			o.batch
			FROM
			reporting_work AS rw
			LEFT JOIN reporting_work_detail AS rwd
			pp.reporting_work AS rw
			LEFT JOIN pp.reporting_work_detail AS rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN flow_card AS fc
			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
			@@ -2304,7 +2570,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}
			@@ -2318,7 +2584,9 @@
			<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>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -2439,6 +2707,9 @@
			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}
			</if>
			@@ -2894,9 +3165,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
			and (c.quantity-b.reporting_work_num)>0
			<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
			@@ -2985,9 +3260,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
			and (c.quantity-b.reporting_work_num)>0
			<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
			@@ -3072,8 +3351,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
			@@ -3256,4 +3540,72 @@


			</select>

			<select id="selectProcessCompletedMp">
			SELECT
			#{selectProcesses} as process,
			hz.project,hz.batch,
			SUM(quantity) as quantity,
			SUM(childArea)as childArea,
			SUM(actualArea) as actualArea,
			SUM(completeNum) as completeNum,
			SUM(completeArea) as completeArea,
			SUM(incompleteNum) as incompleteNum,
			SUM(incompleteArea) as incompleteArea,
			hz.glass_child
			from (
			select DATE(o.create_time) as create_time,
			DATE(o.delivery_date) as delivery_date,
			o.order_id,
			fc.process_id,
			o.customer_name,
			o.project,
			o.batch,
			od.order_number,
			ogd.technology_number,
			ogd.glass_child,
			ogd.child_width,
			ogd.child_height,
			fc.quantity - ifnull(fc.termination_quantity,0) as quantity,
			ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
			ROUND(ogd.child_width * ogd.child_height * (fc.quantity- ifnull(fc.termination_quantity,0)) / 1000000, 2) as actualArea,
			odpd.reporting_work_num as completeNum,
			ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
			2) as completeArea,
			fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0) as incompleteNum,
			ROUND(ogd.child_width * ogd.child_height * (CAST(fc.quantity AS SIGNED) - CAST(odpd.reporting_work_num AS SIGNED)- ifnull(fc.termination_quantity,0)) / 1000000,
			2) as incompleteArea,
			od.product_name

			from sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN flow_card AS fc
			ON fc.order_id = ogd.order_id
			and fc.production_id = ogd.production_id
			AND fc.order_number = ogd.order_number
			AND fc.technology_number = ogd.technology_number
			left join sd.order_process_detail as odpd
			ON odpd.order_id = fc.order_id
			AND odpd.order_number = fc.order_number
			AND odpd.technology_number = fc.technology_number
			and odpd.process_id = fc.process_id
			left join sd.`order` as o
			on o.order_id = od.order_id
			where o.create_order>0
			and odpd.process = #{selectProcesses}
			and o.create_time >= #{selectTime1}
			AND o.create_time < #{selectTime2}
			and position(#{orderId} in od.order_id)
			and position(#{inputProject} in o.project)
			and CAST(fc.quantity AS SIGNED) - CAST(odpd.reporting_work_num AS SIGNED)>0
			and fc.quantity-ifnull(fc.termination_quantity,0)>0
			GROUP BY fc.process_id, fc.order_number, fc.technology_number
			order by fc.process_id, fc.order_number, fc.technology_number
			) as hz
			GROUP BY hz.project,hz.batch,glass_child
			</select>


			</mapper>