ERP_override.git

			@@ -110,7 +110,9 @@
			<select id="SelectTechnologicalProcess">
			select ifnull((select ogd.process
			from sd.order_glass_detail as ogd
			left join sd.`order` as o on o.order_id=ogd.order_id
			where ogd.production_id = LEFT(#{processIdStr}, 11)
			and o.create_order>0
			and POSITION(ogd.technology_number in #{technologyStr})
			limit 1),'') as process

			@@ -528,6 +530,7 @@
			and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
			and position(#{orderId} in rw.order_id)
			and rw.reviewed_state!=-1
			and o.create_order>0
			<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
			</if>
			@@ -569,6 +572,7 @@
			where rw.reviewed_state != 2
			and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
			and rw.reviewed_state!=-1
			and o.create_order>0
			<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
			and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
			</if>