ERP_override.git

			@@ -720,6 +720,7 @@
			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('{',
			@@ -727,16 +728,18 @@
			'}'
			) as reportWorkQuantity,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
			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.technology_number) as e
			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}
			group by c.order_number,c.technology_number
			ORDER BY a.order_number
			</select>

			@@ -1222,19 +1225,18 @@
			MAX( ogd.child_width ) as width,
			MAX( ogd.child_height ) as height,
			od.edging_type,
			opd.reporting_work_num as completed_quantity,
			ROUND(MAX( ogd.child_width )MAX( ogd.child_height )opd.reporting_work_num/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
			FROM
			sd.`order` as o left join sd.order_detail as od on od.order_id=o.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 flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
			left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id
			left join sd.order_process_detail as opd on opd.order_id = o.order_id AND opd.process_id = rw.process_id
			AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process
			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
			left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
			where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
			where o.create_order>0 and rw.reviewed_state>=0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
			and position(#{selectProcesses} in rw.this_process)
			<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
			and rw.this_process regexp #{teamOutputDTO.thisProcess}
			@@ -1253,10 +1255,12 @@
			</if>

			GROUP BY
			rw.order_id,
			rw.reporting_work_id,
			rw.this_process,
			rw.teams_groups_name,
			rw.process_id,
			fc.order_number
			rwd.order_number
			ORDER BY
			rw.this_process,
			rw.process_id,