ERP_override.git

			@@ -114,6 +114,8 @@
			<result column="product_name" property="orderDetail.productName"/>
			<result column="order_id" property="orderDetail.orderId"/>

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




			@@ -188,9 +190,9 @@
			od.shape,
			fgi.actual_signal_area,
			od.area,
			od.gross_area,
			dd.area as gross_area,
			od.compute_area,
			od.compute_gross_area,
			dd.area as compute_gross_area,
			od.processing_note,
			od.edging_type,
			od.perimeter,
			@@ -974,16 +976,15 @@
			</select>

			<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
			select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
			select dd.delivery_id,od.order_id,od.product_id,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,sum(dd.area) as area,
			sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id 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


			<where>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			</where>
			where dd.delivery_id like concat('%',#{deliveryId},'%')

			group by od.order_id,od.product_name,od.product_id
			</select>

			@@ -1028,13 +1029,21 @@
			</select>

			<select id="getSelectOrderotherMoney" >
			select bom.alias,ifnull(oom.price,0) as price,#{value}od.quantity as count,ifnull(oom.price,0)#{value}*od.quantity as monery
			select bom.alias,ifnull(oom.price,0) as price,#{value}#{quantity} as count,ifnull(oom.price,0)#{value}*#{quantity} as monery
			from order_detail od
			left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
			left join basic_other_money bom on bom.`column`=oom.`column`
			where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
			</select>

			<select id="getSelectOrderotherMoneys" >
			select bom.alias,ifnull(oom.price,0) as price,#{value}od.quantity as count,ifnull(oom.price,0)#{value}*od.quantity as monery
			from order_detail od
			left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
			left join basic_other_money bom on bom.`column`=oom.`column`
			where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
			</select>

			<select id="getSelectOrderDetailPrinting" >
			select od.order_id,
			od.order_number,