ERP_override.git

			@@ -192,7 +192,7 @@
			od.area,
			od.gross_area,
			od.compute_area,
			dd.area as compute_gross_area,
			od.compute_gross_area,
			od.processing_note,
			od.edging_type,
			od.perimeter,
			@@ -1029,13 +1029,21 @@
			</select>

			<select id="getSelectOrderotherMoney" >
			select bom.alias,ifnull(oom.price,0) as price,#{value}od.quantity as count,ifnull(oom.price,0)#{value}*od.quantity as monery
			select bom.alias,ifnull(oom.price,0) as price,#{value}#{quantity} as count,ifnull(oom.price,0)#{value}*#{quantity} as monery
			from order_detail od
			left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
			left join basic_other_money bom on bom.`column`=oom.`column`
			where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
			</select>

			<select id="getSelectOrderotherMoneys" >
			select bom.alias,ifnull(oom.price,0) as price,#{value}od.quantity as count,ifnull(oom.price,0)#{value}*od.quantity as monery
			from order_detail od
			left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
			left join basic_other_money bom on bom.`column`=oom.`column`
			where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
			</select>

			<select id="getSelectOrderDetailPrinting" >
			select od.order_id,
			od.order_number,