ERP_override.git

			@@ -29,7 +29,8 @@
			perimeter,
			monolithic_perimeter,
			other_columns,
			file_name
			file_name,
			process_attribute
			)
			values
			<foreach collection ="orderDetails" item="orderDetail" separator =",">
			@@ -57,7 +58,8 @@
			#{orderDetail.perimeter},
			#{orderDetail.monolithicPerimeter},
			#{orderDetail.otherColumns},
			#{orderDetail.fileName}
			#{orderDetail.fileName},
			#{orderDetail.processAttribute}
			)
			</foreach>
			</insert>
			@@ -318,6 +320,10 @@
			and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
			</if>

			<if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
			and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
			</if>

			<if test="orderDetail.width != null and orderDetail.width != '' and model==0">
			and a.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
			</if>
			@@ -474,6 +480,10 @@

			<if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
			and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
			</if>

			<if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
			and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
			</if>

			<if test="orderDetail.width != null and orderDetail.width != ''">
			@@ -1068,11 +1078,16 @@
			group by od.product_id,pd.detail
			</select>

			<delete id="deleteOrderFile" >
			delete from sd.order_file where order_id = #{orderId}
			</delete>


			<select id="selectListWithFileById">
			select od.*,sof.id as file_id
			from sd.order_detail as od
			left join sd.order_file as sof
			on sof.order_id = od.order_id
			and sof.order_number = od.order_number
			where od.order_id = #{id}
			</select>


			</mapper>