ERP_override.git

			@@ -36,8 +36,13 @@
			update sd.delivery set area=#{area},quantity=#{quantity},money=#{money} where delivery_id=#{oddNumber}
			</update>


			<select id="getmaximum" >
			select count(*) from sd.delivery where date(create_time)=CURDATE()
			</select>

			<select id="getDeliveryConut" >
			select count(*) from sd.delivery where delivery_id=#{deliveryId}
			</select>


			@@ -122,7 +127,8 @@
			</select>

			<select id="getSelectOrderInventoryPageTotal" >
			select CEILING(count(zu.order_id)/#{pageSize}) from
			select CEILING(count(zu.order_id)/#{pageSize}) as 'pageTotal',
			count(zu.order_id) as 'total' from
			(select o.create_order,o.process_review,o.order_review,o.production_order,
			o.processing_card,o.warehousing,o.delivery,o.order_id,o.customer_id,
			o.customer_name,o.quantity,sum(fgi.quantity_available),o.project,o.batch,
			@@ -170,8 +176,7 @@
			and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
			</if>
			</where>
			group by o.order_id) as zu
			limit #{offset},#{pageSize};
			group by o.order_id limit #{offset},#{pageSize}) as zu;



			@@ -195,7 +200,7 @@


			<select id="getseletShippingOrderDetaildeliverys" >
			select customer_id,customer_name,project,salesman,salesman_id from sd.`order`
			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 != ''">
			and order_id regexp #{orderDetail.orderId}
			@@ -247,7 +252,8 @@

			<select id="getseletShippingOrderPageTotal">
			select
			CEILING(count(id)/#{pageSize})
			CEILING(count(id)/#{pageSize}) as 'pageTotal',
			count(id) as 'total'
			from sd.delivery d
			<where>
			date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}