ERP_override.git

			@@ -215,7 +215,7 @@
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			<if test="process == '夹胶' or (process == '打胶和粘框')">
			<if test="process == '夹胶'">
			AND ogd.`group` = (select `group`
			from sd.order_glass_detail
			where order_id = ogd.order_id
			@@ -528,12 +528,10 @@
			rw.notes,
			rw.reviewed
			# (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state
			from sd.order as o
			left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
			left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
			left join reporting_work_detail as rwd
			on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
			rwd.technology_number = ogd.technology_number
			from
			reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
			left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
			left join sd.`order` as o on o.order_id=rw.order_id
			where rw.reviewed_state != 2
			and rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			@@ -572,12 +570,9 @@
			<select id="getPageTotal">
			select CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
			count(distinct rw.reporting_work_id) as 'total'
			from sd.order as o
			left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
			left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
			left join reporting_work_detail as rwd
			on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
			rwd.technology_number = ogd.technology_number
			from reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
			left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
			left join sd.`order` as o on o.order_id=rw.order_id
			where rw.reviewed_state != 2
			and rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2} and position(#{orderId} in rw.order_id)
			@@ -1027,12 +1022,9 @@
			MAX(rw.this_worn_quantity) AS this_worn_quantity,
			MAX(ogd.child_width) AS child_width,
			MAX(ogd.child_height) AS child_height
			FROM sd.order AS o
			LEFT JOIN sd.order_glass_detail AS ogd
			ON ogd.order_id = o.order_id
			LEFT JOIN reporting_work AS rw
			ON rw.order_id = ogd.order_id
			AND rw.production_id = ogd.production_id
			FROM reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
			left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
			left join sd.`order` as o on o.order_id=rw.order_id
			WHERE rw.reviewed_state != 2
			and rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}