ERP_override.git

			@@ -151,14 +151,18 @@
			select sum(quantity) from sd.order_detail where order_id=#{orderId}
			</select>

			<select id="selectOrderDetailDeliveryCount">
			SELECT * FROM sd.order_detail where order_id=#{orderDetail.orderId} and order_number=#{orderDetail.orderNumber}
			</select>


			<insert id="insertDeliveryDetail" useGeneratedKeys="true" >
			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)
			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}
			#{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
			)
			</insert>

			@@ -170,7 +174,7 @@
			dd.delivery_number,
			fgi.quantity_available + dd.quantity as quantity_available,
			od.order_number,
			od.quantity-dd.quantity as t_quantity,
			od.quantity-od.delivery_num as t_quantity,
			od.quantity as o_quantity,
			dd.quantity as d_quantity,
			od.building_number,
			@@ -183,6 +187,7 @@
			od.height,
			od.shape,
			fgi.actual_signal_area,
			od.area,
			od.gross_area,
			od.compute_area,
			od.compute_gross_area,
			@@ -372,6 +377,7 @@
			od.height,
			od.shape,
			fgi.actual_signal_area,
			od.area,
			od.gross_area,
			od.compute_area,
			od.compute_gross_area,
			@@ -1000,13 +1006,9 @@
			<select id="getSelectOrderPrinting" >
			select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as gross_amount ,sum(od.quantity) as quantity from
			order_detail od left join product p on od.product_id=p.id

			<where>
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			and od.order_id like concat('%',#{orderDetail.orderId},'%')
			</if>
			</where>
			group by od.product_name,od.product_id
			where od.order_id = #{orderId}
			and od.product_id = #{productId}
			group by od.product_name,od.product_id ;
			</select>

			<select id="getSelectDeliveryDetailPrinting" >
			@@ -1041,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`