ERP_override.git

			@@ -167,12 +167,15 @@
			</update>

			<select id="getDifferentSizeNumber">
			select if(count(id)>1,1,0) from (select
			id
			select if(count(id)>0,1,0) from (select
			a.id,a.child_width,b.width
			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
			where a.order_id = #{orderId}
			and a.order_number = #{orderNumber}
			group by child_width,child_height) as c
			and a.child_width != b.width
			) as c
			</select>

			<select id="getOrderGlassDetailByProductIdGlassChild" >