ERP_override.git

			@@ -901,7 +901,7 @@
			<select id="getSelectDeliveryDetailPrinting" >
			select od.order_id,
			od.order_number,
			od.product_name,
			p.remarks as product_name,
			od.width,
			od.height,
			dd.quantity,
			@@ -909,12 +909,24 @@
			dd.area,
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.building_number,"") as buildingNumber,
			od.price
			od.price,
			od.other_columns
			from delivery_detail dd
			left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
			left join product p on od.product_id = p.id
			where delivery_id = #{deliveryId}
			and od.order_id = #{orderId}
			and od.product_id = #{productId}
			</select>

			<select id="getSelectotherMoney" >
			select bom.alias,oom.price,#{value} as count,oom.price*#{value} as monery
			from delivery_detail dd
			left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
			left join order_other_money oom on oom.order_id=dd.order_id and oom.column=#{key}
			left join basic_other_money bom on bom.`column`=oom.`column`
			where delivery_id = #{deliveryId}
			and od.order_id = #{orderId}
			</select>

			<select id="getSelectOrderDetailPrinting" >
			@@ -927,7 +939,7 @@
			od.gross_amount,
			od.compute_gross_area,
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.remarks,"") as buildingNumber,
			ifnull(od.building_number,"") as buildingNumber,
			od.price
			from order_detail od
			where od.order_id = #{orderId}