ERP_override.git

			@@ -93,6 +93,7 @@
			<result column="child_width" property="childWidth"/>
			<result column="child_height" property="childHeight"/>
			<result column="arc" property="arc"/>
			<result column="arch_rise" property="archRise"/>
			<result column="icon" property="icon"/>
			<result column="process" property="process"/>
			<result column="area" property="area"/>
			@@ -133,6 +134,7 @@
			a.child_width,
			a.child_height,a.arc,
			a.icon,
			a.arch_rise,
			a.area,
			b.quantity,
			a.process,
			@@ -156,7 +158,8 @@
			a.total_area = #{item.area}*b.quantity,
			a.icon = #{item.icon},
			a.process = #{item.process},
			a.arc = #{item.arc}
			a.arc = #{item.arc},
			a.arch_rise = #{item.archRise}
			where
			a.order_id = b.order_id
			and a.order_id = #{item.orderId}
			@@ -167,14 +170,14 @@
			</update>

			<select id="getDifferentSizeNumber">
			select if(count(id)>1,1,0) from (select
			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}
			and a.child_width != b.width
			and(a.child_width != b.width or a.child_height != b.height)
			) as c
			</select>

			@@ -202,4 +205,29 @@

			</select>

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

			</select>


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

			</select>

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

			</select>

			</mapper>