ERP_override.git

			@@ -191,7 +191,7 @@
			od.product_name,
			SUM( od.quantity) as quantity,
			SUM(od.compute_gross_area) as compute_gross_area,
			sum(od.perimeter) as perimeter
			round(sum(od.perimeter),2) as perimeter
			from sd.order_detail as od left join
			(select order_id,order_number,production_id,splitting_status from sd.order_glass_detail
			GROUP BY order_id,order_number
			@@ -494,7 +494,7 @@
			where fc.process_id = #{processId}
			and fc.technology_number = #{technologyNumber}
			group by fc.process_id, fc.order_number
			order by fc.order_number
			order by IF(sort!=NULL\|\|sort!='',sort,fc.order_number)
			</select>

			<select id="getProcessList">
			@@ -537,11 +537,38 @@
			left join flow_card as d
			on d.order_id = a.order_id and d.order_number = a.order_number and
			d.technology_number = a.technology_number
			left join sd.product e
			on e.id = b.product_id
			left join sd.basic_glass_type e
			on e.type_id = b.product_id
			where d.process_id = #{processId}
			and d.technology_number = #{technologyNumber}
			group by a.glass_child, a.child_width, a.child_height
			order by d.technology_number
			</select>

			<select id="printFlowCardDetailsMp">
			SELECT fc.process_id,
			fc.order_number,
			fc.technology_number,
			ogd.glass_address,
			ogd.child_width,
			ogd.child_height,
			fc.quantity,
			ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area
			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 fc.technology_number = ogd.technology_number
			where fc.process_id = #{processId}
			and fc.technology_number = #{technologyNumber}
			</select>

			<update id="printSortMp">
			update flow_card
			set sort = #{sort}
			where process_id = #{processId}
			and order_number=#{orderNumber}
			and technology_number = #{technologyNumber}
			</update>


			</mapper>