ERP_override.git

			@@ -92,9 +92,11 @@

			<result column="product_id" property="orderDetail.productId"/>
			<result column="product_name" property="orderDetail.productName"/>
			<result column="width" property="orderDetail.width"/>
			<result column="height" property="orderDetail.height"/>

			<result column="other_money" property="order.otherMoney"/>

			<result column="batch" property="order.batch"/>


			</resultMap>
			@@ -587,13 +589,25 @@
			o.other_money,
			d.freight_price,
			d.freight_quantity,
			d.freight
			d.freight,
			o.batch,
			od.width,
			od.height
			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
			left join sd.`order` o on dd.order_id=o.order_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
			and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
			and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
			and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
			</if>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			@@ -1305,7 +1319,10 @@
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			d.freight_quantity,
			od.width,
			od.height,
			o.batch
			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