ERP_override.git

			@@ -45,7 +45,7 @@
			<where>
			date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
			</where>
			order by r.review_status
			order by r.review_status,r.id desc
			limit #{offset},#{pageSize};
			</select>

			@@ -88,7 +88,7 @@
			dd.responsible_equipment as responsibleEquipment,
			dd.responsible_team as responsibleTeam,
			ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
			rw.qualityIns_pector as qualityInsPector
			rw.quality_inspector as qualityInspector
			from pp.damage_details dd
			left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
			left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
			@@ -98,7 +98,7 @@
			left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
			on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

			where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and dd.qualityIns_status=1
			where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and dd.qualityIns_status=1 order by dd.id

			</select>

			@@ -123,7 +123,7 @@
			</insert>

			<update id="updateRework" >
			update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.id}
			update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where id=#{rework.id}
			</update>

			<update id="updateDamageDetails" >