Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-06-18 262a56775a30dfbc0159a098592339af6ecadbcb

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

@@ -37,7 +37,8 @@
            o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
            o.quantity = od.b,
            o.area = od.c,
            o.perimeter= od.aa
            o.perimeter= od.aa,
            o.other_money = ifnull(c.money,0)
        where
            o.order_id = #{orderId}

@@ -46,7 +47,7 @@
    <select id="getOrderList">
        select
            *,
        sum(fgi.quantity_available) as goodsQuantity
        ifnull(sum(fgi.quantity_available),0) as goodsQuantity
        from
            `order` as o
        left join mm.finished_goods_inventory as  fgi
@@ -180,7 +181,10 @@
    </select>
    
    <update id="reviewOrderById">
        update `order` set order_review = #{status} where order_id = #{id}
        update `order` set order_review = #{status},
                           verifier_id = #{userId},
                           verifier = #{userName}
                           where order_id = #{id}
    </update>

    <update id="reviewProcessById">