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>


			@@ -1011,7 +1007,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 +1044,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}