ERP_override.git

			@@ -845,14 +845,18 @@
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5,
			p.remarks as filmNumber,
			od.bend_radius as bendRadius,
			od.other_columns
			od.other_columns,
			ogd.glass_child as glassChild,
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.color' )) AS color
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join flow_card as fc on o.order_id = fc.order_id and
			od.order_number = fc.order_number
			left join sd.product as p on p.id=od.product_id
			left join sd.customer as c on c.id = o.customer_id
			left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number
			left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number and pd.glass_sort=fc.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
			where fc.process_id = #{processId}
			and fc.technology_number = #{technologyNumber}
			group by od.order_number, width, height
			@@ -1173,7 +1177,11 @@
			round(SUM(ogd.total_area), 2) as gross_area,
			sum(od.weight) as weight,
			#{technologyNumber} as technologyNumber,
			concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
			concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
			dd.breakage_type,
			dd.breakage_reason,
			dd.responsible_process,
			dd.responsible_team
			from flow_card as fc
			left join sd.order_glass_detail as ogd
			on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
			@@ -1194,9 +1202,12 @@
			GROUP BY order_id, order_number
			) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
			left join patch_log as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
			left join pp.reporting_work as rw on rw.order_id=fc.order_id and rw.process_id=fc.process_id
			left join pp.damage_details as dd on rw.reporting_work_id=dd.reporting_work_id and dd.order_number=fc.order_number and dd.technology_number=fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			and fc.technology_number = #{technologyNumber}
			and rw.reporting_work_id=#{reportingWorkId}
			group by fc.process_id, fc.technology_number
			</select>

			@@ -1392,7 +1403,7 @@
			p.remarks,
			c.customer_abbreviation as customerAbbreviation,
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			CONCAT(fc.process_id,'/',fc.technology_number) as processId,
			o.create_time as createTime,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S02' )) AS figureNumber,
			@@ -1405,7 +1416,8 @@
			p.remarks as filmNumber,
			od.bend_radius as bendRadius,
			ogd.glass_child as glassChild,
			ogd.glass_address as glassAddress
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.color' )) AS color
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join flow_card as fc on o.order_id = fc.order_id and