ERP_override.git

			@@ -160,7 +160,7 @@
			insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
			area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money)
			values (
			#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
			#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{deliveryDetailArea},
			#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
			#{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
			)
			@@ -1043,7 +1043,7 @@
			</select>

			<select id="getSelectOrderotherMoney" >
			select bom.alias,oom.price,#{value}od.quantity as count,oom.price#{value}*od.quantity as monery
			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`
			@@ -1096,7 +1096,10 @@
			dd.quantity,
			dd.delivery_detail_remakes,
			dd.create_time,
			o.other_money
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			@@ -1132,7 +1135,10 @@
			dd.delivery_detail_remakes,
			dd.price,
			dd.create_time,
			o.other_money
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
			left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			left join sd.`order` o on dd.order_id=o.order_id