ERP_override.git

			@@ -412,6 +412,7 @@
			left join sd.order_glass_detail as ogd
			on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
			and ogd.technology_number and dd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			where date(rw.reporting_work_time) >= #{startDate}
			and date(rw.reporting_work_time) <= #{endDate}
			and rw.this_worn_quantity > 0
			@@ -465,6 +466,7 @@
			left join sd.order_glass_detail as ogd
			on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
			and ogd.technology_number and dd.technology_number
			left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
			where date(rw.reporting_work_time) >= #{startDate}
			and date(rw.reporting_work_time) <= #{endDate}
			and rw.this_worn_quantity > 0