ERP_override.git

			@@ -274,7 +274,6 @@

			</where>
			order by dd.id
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectShippingOrderDetailPageTotal">
			@@ -356,7 +355,6 @@
			and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
			@@ -452,7 +450,6 @@
			and od.perimeter regexp #{orderDetail.perimeter}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectShippingOrderDetailsPageTotal">
			@@ -525,7 +522,6 @@
			and od.perimeter regexp #{orderDetail.perimeter}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>


			@@ -978,16 +974,14 @@
			</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 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


			<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>

			@@ -1011,7 +1005,8 @@
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.building_number,"") as buildingNumber,
			dd.price,
			od.other_columns
			od.other_columns,
			od.remarks
			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 p on od.product_id = p.id
			@@ -1047,10 +1042,12 @@
			od.quantity,
			od.gross_amount,
			od.compute_gross_area,
			od.area,
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.building_number,"") as buildingNumber,
			od.price,
			od.other_columns
			od.other_columns,
			od.remarks
			from order_detail od
			where od.order_id = #{orderId}
			and od.product_id = #{productId}