ERP_override.git

			@@ -28,6 +28,10 @@
			<result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
			</resultMap>


			<delete id="deleteDelivery">
			delete from sd.delivery where delivery_id=#{deliveryId}
			</delete>
			<update id="updateDeliveryToExamine">
			update sd.delivery set delivery_state=#{deliveryState} where delivery_id=#{deliveryId}
			</update>
			@@ -122,7 +126,7 @@
			and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
			</if>
			</where>
			group by o.order_id
			group by o.order_id order by o.id desc
			limit #{offset},#{pageSize};
			</select>

			@@ -183,7 +187,7 @@

			</select>

			<select id="getseletShippingOrderDetaildelivery" >
			<select id="getSelectShippingOrderDetailDelivery" >
			select
			d.delivery_state,d.stock_state,d.payment_terms,
			d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
			@@ -199,7 +203,7 @@
			</select>


			<select id="getseletShippingOrderDetaildeliverys" >
			<select id="getSelectShippingOrderDetailDeliverys" >
			select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`
			<where>
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			@@ -210,7 +214,7 @@
			limit 0,1
			</select>

			<select id="getseletShippingOrder">
			<select id="getSelectShippingOrder">
			select * from sd.delivery d
			<where>
			date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
			@@ -250,7 +254,7 @@
			limit #{offset},#{pageSize};
			</select>

			<select id="getseletShippingOrderPageTotal">
			<select id="getSelectShippingOrderPageTotal">
			select
			CEILING(count(id)/#{pageSize}) as 'pageTotal',
			count(id) as 'total'