ERP_override.git

			@@ -63,6 +63,7 @@
			<result column="o_quantity" property="quantity"/>
			<result column="delivery_id" property="deliveryId"/>
			<result column="delivery_number" property="deliveryNumber"/>
			<result column="quantity" property="quantity"/>
			<result column="area" property="area"/>
			<result column="money" property="money"/>
			<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
			@@ -500,68 +501,69 @@
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id regexp #{deliveryDetail.deliveryId}
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
			and dd.delivery_number regexp #{deliveryDetail.deliveryNumber}
			and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
			</if>
			<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
			and dd.order_id regexp #{deliveryDetail.orderId}
			and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
			</if>
			<if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
			and dd.order_number regexp #{deliveryDetail.orderNumber}
			and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
			</if>
			<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
			and dd.area regexp #{deliveryDetail.area}
			and dd.area like concat('%', #{deliveryDetail.area},'%')
			</if>
			<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
			and dd.money regexp #{deliveryDetail.money}
			and dd.money like concat('%', #{deliveryDetail.money},'%')
			</if>
			<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
			and dd.quantity regexp #{deliveryDetail.quantity}
			and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
			</if>
			<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
			and dd.delivery_detail_remakes regexp #{deliveryDetail.deliveryDetailRemakes}
			and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
			</if>
			<if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
			and dd.create_time regexp #{deliveryDetail.createTime}
			and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
			</if>
			<if test="deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != ''">
			and d.payment_terms regexp #{deliveryDetail.delivery.paymentTerms}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
			and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
			</if>
			<if test="deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != ''">
			and d.project regexp #{deliveryDetail.delivery.project}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
			and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
			</if>
			<if test="deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != ''">
			and d.customer_id regexp #{deliveryDetail.delivery.customerId}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
			and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
			</if>
			<if test="deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != ''">
			and d.customer_name regexp #{deliveryDetail.delivery.customerName}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
			and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
			</if>
			<if test="deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != ''">
			and d.delivery_date regexp #{deliveryDetail.delivery.deliveryDate}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
			and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
			</if>
			<if test="deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != ''">
			and d.pay_method regexp #{deliveryDetail.delivery.payMethod}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
			and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
			</if>
			<if test="deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != ''">
			and d.pay_date regexp #{deliveryDetail.delivery.payDate}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
			and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
			</if>
			<if test="deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != ''">
			and d.salesman regexp #{deliveryDetail.delivery.salesman}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
			and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
			</if>
			<if test="deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != ''">
			and d.creator regexp #{deliveryDetail.delivery.creator}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
			and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
			</if>
			<if test="deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != ''">
			and d.contacts regexp #{deliveryDetail.delivery.contacts}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
			and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
			</if>
			<if test="deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != ''">
			and d.contact_number regexp #{deliveryDetail.delivery.contactNumber}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
			and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
			</if>
			<if test="deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != ''">
			and d.delivery_address regexp #{deliveryDetail.delivery.deliveryAddress}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
			and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
			</if>

			</where>
			@@ -569,78 +571,78 @@
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectDeliveryDetailReportPageTotal" resultMap="selectDeliveryDetail">
			<select id="getSelectDeliveryDetailReportPageTotal">
			select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
			count(dd.id) as 'total'
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id regexp #{deliveryDetail.deliveryId}
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
			and dd.delivery_number regexp #{deliveryDetail.deliveryNumber}
			and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
			</if>
			<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
			and dd.order_id regexp #{deliveryDetail.orderId}
			and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
			</if>
			<if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
			and dd.order_number regexp #{deliveryDetail.orderNumber}
			and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
			</if>
			<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
			and dd.area regexp #{deliveryDetail.area}
			and dd.area like concat('%', #{deliveryDetail.area},'%')
			</if>
			<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
			and dd.money regexp #{deliveryDetail.money}
			and dd.money like concat('%', #{deliveryDetail.money},'%')
			</if>
			<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
			and dd.quantity regexp #{deliveryDetail.quantity}
			and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
			</if>
			<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
			and dd.delivery_detail_remakes regexp #{deliveryDetail.deliveryDetailRemakes}
			and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
			</if>
			<if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
			and dd.create_time regexp #{deliveryDetail.createTime}
			and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
			</if>
			<if test="deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != ''">
			and d.payment_terms regexp #{deliveryDetail.delivery.paymentTerms}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
			and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
			</if>
			<if test="deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != ''">
			and d.project regexp #{deliveryDetail.delivery.project}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
			and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
			</if>
			<if test="deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != ''">
			and d.customer_id regexp #{deliveryDetail.delivery.customerId}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
			and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
			</if>
			<if test="deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != ''">
			and d.customer_name regexp #{deliveryDetail.delivery.customerName}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
			and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
			</if>
			<if test="deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != ''">
			and d.delivery_date regexp #{deliveryDetail.delivery.deliveryDate}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
			and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
			</if>
			<if test="deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != ''">
			and d.pay_method regexp #{deliveryDetail.delivery.payMethod}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
			and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
			</if>
			<if test="deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != ''">
			and d.pay_date regexp #{deliveryDetail.delivery.payDate}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
			and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
			</if>
			<if test="deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != ''">
			and d.salesman regexp #{deliveryDetail.delivery.salesman}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
			and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
			</if>
			<if test="deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != ''">
			and d.creator regexp #{deliveryDetail.delivery.creator}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
			and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
			</if>
			<if test="deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != ''">
			and d.contacts regexp #{deliveryDetail.delivery.contacts}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
			and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
			</if>
			<if test="deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != ''">
			and d.contact_number regexp #{deliveryDetail.delivery.contactNumber}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
			and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
			</if>
			<if test="deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != ''">
			and d.delivery_address regexp #{deliveryDetail.delivery.deliveryAddress}
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
			and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
			</if>

			</where>
			order by dd.delivery_id,dd.delivery_number
			limit #{offset},#{pageSize};
			</select>
			</mapper>