ERP_override.git

			@@ -102,8 +102,8 @@
			</update>

			<select id="getOrderList">
			select
			*,
			select * from (select
			o.*,
			ifnull(sum(fgi.quantity_available),0) as goodsQuantity
			from
			sd.`order` as o
			@@ -196,17 +196,17 @@
			and o.processing_note REGEXP #{order.processingNote}
			</if>
			group by o.id
			) as acc
			order by
			<if test="orderBy == 'null' or orderBy == null">
			o.id desc
			</if>
			<if test="!(orderBy == 'null' or orderBy == null) and orderBy == 'desc'">
			#{field} desc
			<if test="orderBy == null ">
			id desc
			</if>
			<if test="!(orderBy == 'null' or orderBy == null) and orderBy == 'asc'">
			#{field} asc
			<if test="orderBy == 'desc'">
			${field} desc
			</if>

			<if test="orderBy == 'asc'">
			${field}
			</if>
			limit #{offset},#{pageSize}
			</select>

			@@ -217,7 +217,7 @@
			sum(o.quantity) as quantity,
			sum(o.area) as area,
			sum(o.money) as money,
			fgi.goodsQuantity,
			ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
			ROUND(sum(perimeter),2) as perimeter,
			#{pageSize} as pageSize
			from
			@@ -330,6 +330,13 @@
			where order_id = #{id}
			</update>

			<update id="backReviewOrderById">
			update `order` set order_review = 0,
			verifier_id = null,
			verifier = null
			where order_id = #{id}
			</update>

			<update id="reviewProcessById">
			update `order` set process_review = #{status} where order_id = #{id}
			</update>
			@@ -368,4 +375,8 @@
			having count(a.order_number) > 1
			</select>

			<select id="searchOrderWarehousing">
			select warehousing from `order`
			where order_id = #{orderId}
			</select>
			</mapper>