ERP_override.git

			@@ -90,6 +90,9 @@
			<result column="freight" property="delivery.freight"/>
			<result column="freight_price" property="delivery.freightPrice"/>
			<result column="freight_quantity" property="delivery.freightQuantity"/>
			<result column="delivery_state" property="delivery.deliveryState"/>
			<result column="money" property="delivery.money"/>
			<result column="other_money" property="delivery.otherMoney"/>

			<result column="product_id" property="orderDetail.productId"/>
			<result column="product_name" property="orderDetail.productName"/>
			@@ -293,7 +296,7 @@
			</if>

			</where>
			order by dd.id
			order by dd.box_no,dd.order_id,dd.order_number
			</select>

			<select id="getSelectShippingOrderDetailPageTotal">
			@@ -486,6 +489,7 @@
			and od.perimeter regexp #{orderDetail.perimeter}
			</if>
			</where>
			order by od.order_id,od.order_number
			</select>

			<select id="getSelectShippingOrderDetailsPageTotal">
			@@ -1399,4 +1403,44 @@
			group by dd.delivery_id,dd.order_id,od.product_id
			order by dd.delivery_id,dd.delivery_number
			</select>


			<select id="getDeliverDetailOrderNumber" resultMap="selectDeliveryDetail">
			select dd.order_id,
			dd.order_Number,
			dd.delivery_number,
			dd.delivery_id,
			dd.quantity,
			dd.price,
			dd.area,
			dd.money,
			dd.other_columns,
			d.delivery_state,
			d.money
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			where dd.order_id=#{orderId} and dd.order_number=#{orderNumber} and dd.delivery_id=#{deliveryId}

			</select>

			<select id="getDeliverOrderNumber">
			select
			d.delivery_id,
			d.delivery_state,
			d.money
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			where dd.order_id=#{orderId} and dd.order_number=#{orderNumber}
			group by d.delivery_id
			</select>

			<update id="updateDeliveryDetailmonye">
			update sd.delivery_detail set price=#{price},money=#{deliveryDetail.money}
			where delivery_id=#{deliveryDetail.deliveryId} and delivery_number=#{deliveryDetail.deliveryNumber}
			</update>

			<update id="updateDeliverymonye">
			update sd.delivery set money=#{money}
			where delivery_id=#{deliveryId}
			</update>
			</mapper>