ERP_override.git

			@@ -118,7 +118,9 @@
			<select id="getGlassLRow">
			select
			max(a.technology_number) as rowCount,
			RowNum
			RowNum,
			a.order_number,
			a.process_id
			from pp.flow_card as a
			left join
			(select min((@i:=@i+1)) AS RowNum,c.*
			@@ -130,7 +132,7 @@
			on b.id = a.id
			where a.order_id = #{orderId}
			group by a.order_number,a.process_id
			order by RowNum
			order by a.process_id,a.order_number

			</select>

			@@ -214,13 +216,24 @@
			</select>

			<select id="selectShiftQuantitySv">
			select * from(select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
			select *
			<if test="step != null and step != ''">
			,sum(e.break) as 'breakage_quantity'
			,Round(sum(e.break)*e.area,2) as 'breakage_area'
			</if>
			<if test="step == null \|\| step == ''">
			,e.break as 'breakage_quantity'
			,Round(e.break*e.area,2) as 'breakage_area'
			</if>
			from(select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
			c.child_width,
			c.child_height,
			a.completed_quantity,
			a.breakage_quantity,
			a.breakage_quantity as break,
			a.order_number,
			b.reporting_work_id
			b.reporting_work_id,
			round(c.area*a.completed_quantity,2) as finish_area,
			c.area
			from pp.reporting_work as b
			left join pp.reporting_work_detail as a
			on a.reporting_work_id = b.reporting_work_id