ERP_override.git

			@@ -246,7 +246,7 @@
			p.total_thickness AS 'totalThickness',
			p.thickness,
			od.weight,
			od.weight,
			od.remarks,
			ods.S01,
			ods.S02,
			ods.S03,
			@@ -544,7 +544,8 @@
			od.other_columns,
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation
			pd.separation,
			fc.technology_number
			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
			@@ -934,4 +935,29 @@
			GROUP BY fc.process_id, ogd.technology_number
			order by fc.process_id, ogd.technology_number
			</select>

			<select id="getDetailListLike">
			select fc.order_number,
			concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
			od.quantity,
			round(ogd.total_area, 2) as total_area,
			od.perimeter,
			od.bend_radius,
			concat(od.processing_note,od.remarks) as remarks,
			od.other_columns,
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			pd.separation,
			fc.technology_number
			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
			left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
			left join sd.product_detail as pd on pd.prod_id=od.product_id and pd.glass_sort=ogd.technology_number
			where fc.process_id = #{processId}
			and position(fc.technology_number in #{technologyNumber})
			group by fc.process_id, fc.order_number,fc.technology_number
			order by IF(sort != NULL \|\| sort != '', sort, fc.order_number)
			</select>
			</mapper>