ERP_override.git

			@@ -81,7 +81,7 @@
			insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
			area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,create_time)
			values (
			#{number} ,#{deliveryNumber},#{orderDetail.order_number},#{orderDetail.computeGrossArea},
			#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
			#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
			#{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,now()
			)
			@@ -89,7 +89,7 @@



			<select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
			<select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
			select od.order_id,
			o.batch,
			dd.delivery_number,
			@@ -192,10 +192,11 @@
			</if>

			</where>
			order by dd.id desc
			limit #{offset},#{pageSize};
			</select>

			<select id="getseletShippingOrderDetailPageTotal">
			<select id="getSelectShippingOrderDetailPageTotal">
			select
			CEILING(count(dd.id)/#{pageSize})
			from sd.delivery_detail dd
			@@ -277,7 +278,7 @@
			limit #{offset},#{pageSize};
			</select>

			<select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
			<select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
			select od.order_id,
			od.order_number,
			o.batch,
			@@ -370,7 +371,7 @@
			limit #{offset},#{pageSize};
			</select>

			<select id="getseletShippingOrderDetailsPageTotal">
			<select id="getSelectShippingOrderDetailsPageTotal">
			select
			CEILING(count(od.id)/#{pageSize})
			from sd.order_detail od