Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-03-10 c12e4a831b4210ec886b2537824a464d74b59ff5

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -199,7 +199,7 @@
        ) as acc
        order by
        <if test="orderBy == null ">
            id desc
            order_id desc
        </if>
        <if test="orderBy == 'desc'">
            ${field} desc
@@ -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>