ERP_override.git

			@@ -95,7 +95,7 @@
			select
			max(a.technology_number) as rowCount,
			RowNum
			from order_process_detail as a
			from sd.order_process_detail as a
			left join
			(select min((@i:=@i+1)) AS RowNum,c.*
			from sd.order_glass_detail as c,
			@@ -129,6 +129,7 @@
			from order_process_detail as a
			left join `order` as b on a.order_id=b.order_id
			where b.create_time BETWEEN #{selectTime1} and #{selectTime2}
			and position(#{orderId} in b.order_id)
			group by process

			</select>
			@@ -144,11 +145,12 @@
			left join sd.`order` o2 on c.order_id = o2.order_id,
			(SELECT @i:=-1) as d
			where o2.create_time BETWEEN #{selectTime1} and #{selectTime2}
			and position(#{orderId} in o2.order_id)
			GROUP BY order_number
			) as b
			on b.order_number = a.order_number
			left join sd.`order` o on a.order_id = o.order_id
			where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
			where o.create_time BETWEEN #{selectTime1} and #{selectTime2} and position(#{orderId} in o.order_id)
			group by a.order_number
			</select>

			@@ -156,12 +158,37 @@
			select a.process from sd.order_process_detail as a,
			(select id,process from sd.order_process_detail
			where process_id=#{processId}
			and technology_number=#{technologyNumber}
			and position(technology_number in #{technologyNumber})
			and order_number=#{orderNumber}
			and process=#{thisProcess}
			group by process) as b
			where a.id = b.id + 1
			and a.process_id=#{processId}
			and a.technology_number=#{technologyNumber}
			and a.order_number=#{orderNumber}
			and position(a.technology_number in #{technologyNumber})

			</select>

			<select id="selectShiftQuantitySv">
			select * 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.order_number
			from pp.reporting_work as b
			left join pp.reporting_work_detail as a
			on a.reporting_work_id = b.reporting_work_id
			left join sd.order_glass_detail as c
			on b.order_id = c.order_id
			and c.order_number = a.order_number
			and c.technology_number = a.technology_number
			where b.reviewed_state >=0
			and b.creator_id = #{creatorId}
			and UNIX_TIMESTAMP(b.reporting_work_time) BETWEEN UNIX_TIMESTAMP(#{startDatetime}) and UNIX_TIMESTAMP(#{endDatetime})
			order by b.id desc ) as e
			<if test="step != null and step != ''">
			group by e.order_number
			</if>
			</select>
			</mapper>