ERP_override.git

			@@ -1162,6 +1162,7 @@
			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
			where pl.process_id = #{processId}
			and pl.order_sort=#{orderNumber}
			and pl.technology_number = #{technologyNumber}
			and pl.reporting_work_id = #{reportingWorkId}
			group by od.order_number, width, height
			@@ -1962,6 +1963,7 @@
			on ogd.order_id = o.order_id and ogd.order_number = od.order_number and
			ogd.technology_number = fc.technology_number
			where pl.process_id = #{processId}
			and pl.order_sort=#{orderNumber}
			and pl.technology_number = #{technologyNumber}
			and pl.reporting_work_id = #{reportingWorkId}
			group by od.order_number, width, height