ERP_override.git

			@@ -392,12 +392,12 @@
			</if>
			</select>

			<select id="exportOrderReport">
			<select id="exportOrderReport" >
			SELECT
			*,
			a.create_time as createTime,
			d.type_name as levelOne,
			e.type_name as levelTwo
			d.type_name as level_one,
			e.type_name as level_two
			from order_detail as a
			left join sd.`order` as b
			on b.order_id = a.order_id
			@@ -407,7 +407,7 @@
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong

			where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]}
			</select>


			@@ -725,4 +725,42 @@
			) as ss
			</select>

			<select id="exportOrderProductSummary" >
			SELECT
			*,
			a.create_time as createTime,
			d.type_name as level_one,
			e.type_name as level_two
			from order_detail as a
			left join sd.`order` as b
			on b.order_id = a.order_id
			left join sd.product as c
			on c.id = a.product_id
			left join sd.basic_glass_type as d
			on d.type_id = c.type_id
			left join sd.basic_glass_type as e
			on e.type_id = d.belong
			where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]}
			group by b.order_id,a.product_id
			order by b.order_id desc
			</select>

			<select id="getOrderProductDetailTag">
			select c.customer_name,c.order_id,b.remarks,c.project,
			if(a.child_width < a.child_height,a.child_width,a.child_height ),
			if(a.child_width < a.child_height,a.child_height,a.child_width ),
			sum(b.quantity),
			a.glass_child,
			b.processing_note
			from order_glass_detail as a
			left join order_detail as b
			on a.order_id = b.order_id
			and a.order_number = b.order_number
			left join `order` as c
			on c.order_id = a.order_id
			where a.order_id = #{orderId}
			group by a.glass_child,a.child_width,a.child_height
			</select>


			</mapper>