ERP_override.git

			@@ -22,7 +22,7 @@
			o.batch,
			od.building_number,
			od.product_name,
			ogd.technology_number,
			r.technology_number,
			ogd.glass_address,
			r.patch_num,
			od.width,
			@@ -46,7 +46,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,6 +88,24 @@
			update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
			</update>


			<update id="updateOrderProcessDetail" >
			update sd.order_process_detail
			set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
			where order_id = #{patchLog.orderId}
			and process_id = #{patchLog.processId}
			and order_number = #{patchLog.orderSort}
			and technology_number = #{patchLog.technologyNumber}
			and id <![CDATA[<]]> (select a.opdid
			from (select id as opdid
			from sd.order_process_detail opd
			where opd.order_id = #{patchLog.orderId}
			and opd.process_id = #{patchLog.processId}
			and opd.order_number = #{patchLog.orderSort}
			and opd.technology_number = #{patchLog.technologyNumber}
			and process = #{reportingWork.thisProcess}) as a)
			</update>

			<update id="updateDamageDetails" >
			update pp.damage_details set quantity=quantity+#{patchLog.patchNum},patch_status=1 where id=#{patchLog.reviewer}
			</update>
			@@ -111,6 +129,8 @@
			od.width,
			od.height,
			od.shape,
			dd.responsible_process as responsibleProcess,
			rw.this_process as patchProcesses,
			dd.breakage_quantity-dd.quantity as breakageQuantity,
			dd.return_process as patchProcesses,
			dd.breakage_reason as patchReason,
			@@ -119,7 +139,7 @@
			dd.responsible_equipment as responsibleEquipment,
			dd.responsible_team as responsibleTeam,
			ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
			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
			@@ -129,8 +149,8 @@
			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=0

			where dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1))
			order by dd.id desc
			</select>