ERP_override.git

			@@ -73,6 +73,7 @@
			<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
			<result column="delivery_detail_state" property="deliveryDetailState"/>
			<result column="create_time" property="createTime"/>
			<result column="box_no" property="boxNo"/>

			<result column="customer_id" property="delivery.customerId"/>
			<result column="customer_name" property="delivery.customerName"/>
			@@ -92,9 +93,12 @@

			<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="building_number" property="orderDetail.buildingNumber"/>

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

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


			</resultMap>
			@@ -120,6 +124,7 @@
			<result column="height" property="orderDetail.shape"/>

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



			@@ -288,7 +293,7 @@
			</if>

			</where>
			order by dd.id
			order by dd.box_no,dd.order_id,dd.order_number
			</select>

			<select id="getSelectShippingOrderDetailPageTotal">
			@@ -587,13 +592,33 @@
			o.other_money,
			d.freight_price,
			d.freight_quantity,
			d.freight
			d.freight,
			o.batch,
			od.width,
			od.height,
			od.building_number,
			dd.box_no
			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.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
			and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
			</if>
			<if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
			and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
			</if>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			@@ -693,6 +718,21 @@
			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.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
			and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
			</if>
			<if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
			and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
			</if>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			@@ -777,6 +817,7 @@
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
			and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
			</if>

			</where>
			order by dd.delivery_id,dd.delivery_number
			</select>
			@@ -1009,7 +1050,7 @@

			<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
			select dd.delivery_id,od.order_id,od.product_id,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,dd.price,sum(dd.area) as area,
			sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id from
			sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id,o.batch from
			delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			left join product pt on pt.id=od.product_id
			left join sd.`order` o on o.order_id=dd.order_id
			@@ -1305,7 +1346,12 @@
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			d.freight_quantity,
			od.width,
			od.height,
			o.batch,
			od.building_number,
			dd.box_no
			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