ERP_override.git

			@@ -24,6 +24,7 @@
			remarks,
			bend_radius,
			edging_type,
			arch_rise,
			weight,
			perimeter,
			other_columns
			@@ -49,6 +50,7 @@
			#{orderDetail.remarks},
			#{orderDetail.bendRadius},
			#{orderDetail.edgingType},
			#{orderDetail.archRise},
			#{orderDetail.weight},
			#{orderDetail.perimeter},
			#{orderDetail.otherColumns}
			@@ -744,5 +746,61 @@
			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>

			<select id="getOrderProductDistinctById">
			select

			(a.product_id) as 'productId',
			a.product_name as 'productName',
			a.order_number as 'orderNumber'
			from order_detail as a
			where a.order_id = #{orderId}
			group by a.product_id
			</select>

			<select id="getOrderProductDistinctByIds">
			select

			(a.product_id) as 'productId',
			a.product_name as 'productName',
			a.order_number as 'orderNumber'
			from order_detail as a
			where a.order_id = #{orderId} and a.product_id IN
			<foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
			#{item}
			</foreach>
			group by a.product_id
			</select>

			<select id="getOrderProductByProductId">
			select
			*
			from order_detail as a
			where a.order_id = #{orderId}
			and a.product_id = #{productId}
			order by id;
			</select>






			</mapper>