ERP_override.git

			@@ -792,12 +792,6 @@
			<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
			and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
			and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
			and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
			</if>
			<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
			and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
			</if>
			@@ -859,10 +853,10 @@
			and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != '')">
			and od.product_id like concat('%', #{deliveryDetail.orderDetail.productName},'%')
			and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">
			and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')
			and od.product_id like concat('%', #{deliveryDetail.orderDetail.productId},'%')
			</if>
			<if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">
			and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')
			@@ -900,12 +894,6 @@
			<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
			and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != ''">
			and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != ''">
			and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
			</if>
			<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
			and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
			</if>
			@@ -967,10 +955,10 @@
			and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != '')">
			and od.product_id like concat('%', #{deliveryDetail.orderDetail.productName},'%')
			and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">
			and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')
			and od.product_id like concat('%', #{deliveryDetail.orderDetail.productId},'%')
			</if>
			<if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">
			and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')
			@@ -1096,7 +1084,10 @@
			dd.quantity,
			dd.delivery_detail_remakes,
			dd.create_time,
			o.other_money
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			@@ -1132,7 +1123,10 @@
			dd.delivery_detail_remakes,
			dd.price,
			dd.create_time,
			o.other_money
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
			left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			left join sd.`order` o on dd.order_id=o.order_id