ERP_override.git

			@@ -92,6 +92,7 @@
			<result column="glass_child" property="glassChild"/>
			<result column="child_width" property="childWidth"/>
			<result column="child_height" property="childHeight"/>
			<result column="arc" property="arc"/>
			<result column="icon" property="icon"/>
			<result column="process" property="process"/>
			<result column="area" property="area"/>
			@@ -130,7 +131,7 @@
			a.total_area,
			b.edging_type,
			a.child_width,
			a.child_height,
			a.child_height,a.arc,
			a.icon,
			a.area,
			b.quantity,
			@@ -154,7 +155,8 @@
			a.area = #{item.area},
			a.total_area = #{item.area}*b.quantity,
			a.icon = #{item.icon},
			a.process = #{item.process}
			a.process = #{item.process},
			a.arc = #{item.arc}
			where
			a.order_id = b.order_id
			and a.order_id = #{item.orderId}
			@@ -166,11 +168,14 @@

			<select id="getDifferentSizeNumber">
			select if(count(id)>1,1,0) from (select
			id
			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" >
			@@ -189,4 +194,12 @@
			and ogd.glass_child=#{glassChild}
			</select>

			<select id="getMinIdByGroup" >
			select min(id) from sd.order_glass_detail as a
			where a.order_id = #{orderId}
			and a.order_number = #{orderNumber}
			and a.`group` = #{group}

			</select>

			</mapper>