ERP_override.git

			@@ -28,7 +28,9 @@
			weight,
			perimeter,
			monolithic_perimeter,
			other_columns
			other_columns,
			file_name,
			process_attribute
			)
			values
			<foreach collection ="orderDetails" item="orderDetail" separator =",">
			@@ -55,7 +57,9 @@
			#{orderDetail.weight},
			#{orderDetail.perimeter},
			#{orderDetail.monolithicPerimeter},
			#{orderDetail.otherColumns}
			#{orderDetail.otherColumns},
			#{orderDetail.fileName},
			#{orderDetail.processAttribute}
			)
			</foreach>
			</insert>
			@@ -316,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>
			@@ -472,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,7 +1080,14 @@




			<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>