ERP_override.git

			@@ -196,13 +196,22 @@
			op.project_name,
			0 as patchState,
			c.rack AS rackNo,
			0 as layoutId
			0 as heatLayoutId,
			d.process,
			o.order_id AS orderNo,
			o.customer_name AS customerName,
			o.processing_note AS processingNote,
			o.project AS projectName,
			od.product_name AS productName,
			od.building_number AS buildingNumber
			FROM
			pp.flow_card c
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			AND c.order_number = d.order_number
			AND c.technology_number = d.technology_number
			INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
			LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
			LEFT JOIN order_detail od ON c.order_id = od.order_id
			WHERE
			c.project_no IS NOT NULL
			and c.project_no = #{projectNo}
			@@ -226,7 +235,14 @@
			op.project_name,
			1 as patch_state,
			a.id as rackNo,
			0 as layoutId
			0 as heatLayoutId,
			d.process,
			o.order_id AS orderNo,
			o.customer_name AS customerName,
			o.processing_note AS processingNote,
			o.project AS projectName,
			od.product_name AS productName,
			od.building_number AS buildingNumber
			FROM
			pp.patch_log c
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			@@ -234,6 +250,8 @@
			AND c.technology_number = d.technology_number
			INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
			LEFT JOIN pp.flow_card fc ON c.process_id = fc.process_id and fc.technology_number=c.technology_number
			LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
			LEFT JOIN order_detail od ON c.order_id = od.order_id
			left join
			(select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
			on a.process_id=c.process_id and a.technology_number=c.technology_number
			@@ -311,7 +329,7 @@
			<select id="computeAndOptimization">
			SELECT
			c.rack AS rackNo,
			h.layout_id as layoutId,
			h.layout_id as heatLayoutId,
			h.width AS width,
			h.height AS height,
			count( 1 ) AS quantity,
			@@ -323,7 +341,14 @@
			c.order_number,
			h.order_sort AS orderSort,
			d.icon AS markIcon,
			h.patch_state AS patchState
			h.patch_state AS patchState,
			d.process,
			o.order_id AS orderNo,
			o.customer_name AS customerName,
			o.processing_note AS processingNote,
			o.project AS projectName,
			od.product_name AS productName,
			od.building_number AS buildingNumber
			from
			pp.`optimize_heat_detail` h
			LEFT JOIN pp.flow_card c ON h.process_id = c.process_id
			@@ -332,6 +357,8 @@
			LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
			AND c.order_number = d.order_number
			AND c.technology_number = d.technology_number
			LEFT JOIN sd.order o on o.order_id = c.order_id
			LEFT JOIN order_detail od on c.order_id = od.order_id
			WHERE
			h.project_no = #{projectNo}
			GROUP BY