ERP_override.git

			@@ -166,11 +166,12 @@
			</select>

			<select id="selectShiftQuantitySv">
			select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
			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.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
			@@ -180,7 +181,10 @@
			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(#{startDate}) and UNIX_TIMESTAMP(#{endDate})
			order by b.id desc
			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>