ERP_override.git

			@@ -121,6 +121,10 @@
			update sd.order_detail set delivery_num=delivery_num-#{quantity} where order_id=#{orderId} and order_number=#{orderNumber}
			</update>

			<update id="updateOrderDelivery">
			update sd.`order` set delivery=#{state} where order_id=#{orderDetail.orderId}
			</update>

			<select id="getdeliveryDetailmaximum" >
			select count(*) from sd.delivery_detail where delivery_id=#{deliveryId}
			</select>
			@@ -129,14 +133,22 @@
			select * from sd.delivery_detail where delivery_id=#{deliveryId}
			</select>

			<select id="getSelectDetailQuantity" >
			select quantity from sd.`order` where order_id=#{orderId}
			</select>

			<select id="getSelectDetailNum" >
			select sum(quantity) from sd.order_detail where order_id=#{orderId}
			</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,create_time)
			area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time)
			values (
			#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
			#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
			#{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,now()
			#{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,#{orderDetail.otherColumns},now()
			)
			</insert>

			@@ -167,7 +179,8 @@
			od.processing_note,
			od.edging_type,
			od.perimeter,
			dd.delivery_detail_remakes
			dd.delivery_detail_remakes,
			dd.other_columns
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number