ERP_override.git

			@@ -21,7 +21,7 @@
			o.project,
			o.batch,
			od.product_name,
			ogd.technology_number,
			r.technology_number,
			ogd.glass_address,
			r.rework_num,
			od.width,
			@@ -37,7 +37,8 @@
			r.rework_processes,
			r.reviewer,
			date(r.create_time) as create_time,
			date(r.update_time) as update_time
			date(r.update_time) as update_time,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber
			from pp.rework r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
			left join sd.`order` o on r.order_id = o.order_id
			left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
			@@ -89,16 +90,16 @@
			ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
			rw.quality_inspector as qualityInspector
			from pp.damage_details dd
			left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
			left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id and rw.reviewed_state>0
			left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number
			and dd.technology_number=rwd.technology_number and rwd.review_status>0
			left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id

			left join sd.`order` o on rw.order_id = o.order_id
			left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
			left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
			on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

			where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id

			where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
			</select>