ERP_override.git

			@@ -34,6 +34,7 @@

			<result column="batch" property="order.batch"/>
			<result column="t_quantity" property="order.quantity"/>
			<result column="calculate_type" property="order.calculateType"/>


			<result column="customer_id" property="delivery.customerId"/>
			@@ -151,7 +152,7 @@
			values (
			#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
			#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
			#{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,#{orderDetail.otherColumns},now()
			#{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
			)
			</insert>

			@@ -351,6 +352,7 @@
			select od.order_id,
			od.order_number,
			o.batch,
			o.calculate_type,
			fgi.quantity_available,
			od.quantity- od.delivery_num as t_quantity,
			od.quantity as o_quantity,
			@@ -885,6 +887,17 @@
			group by od.order_id,od.product_name,od.product_id
			</select>

			<select id="getSelectOrderPrinting" >
			select od.order_id,od.product_id,od.product_name,sum(od.area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
			order_detail od
			<where>
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			and od.order_id like concat('%',#{orderDetail.orderId},'%')
			</if>
			</where>
			group by od.product_name,od.product_id
			</select>

			<select id="getSelectDeliveryDetailPrinting" >
			select od.order_id,
			od.order_number,
			@@ -904,6 +917,23 @@
			and od.product_id = #{productId}
			</select>

			<select id="getSelectOrderDetailPrinting" >
			select od.order_id,
			od.order_number,
			od.product_name,
			od.width,
			od.height,
			od.quantity,
			od.gross_amount,
			od.area,
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.remarks,"") as buildingNumber,
			od.price
			from order_detail od
			where od.order_id = #{orderId}
			and od.product_id = #{productId}
			</select>


			<select id="exportDeliveryDetailReport">
			select dd.id,