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

廖井涛

2024-09-13 5611ccaecae6cb5a1357362ae1a9bd46ba098a6a

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

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

@@ -15,17 +15,17 @@

    <select id="selectMaxOrderId">
        select
           ifnull(SUBSTR(max(order_id) from 9),0)
           ifnull(SUBSTR(max(right(order_id,8)) from 7),0)
        from
            `order` as a
        where
            date(a.create_time) = curdate()
        order by id desc,order_id    desc limit  1
        /*order by order_id desc,order_id    desc limit  1*/
    </select>

    <select id="selectMaxOrderIdByMonth">
        select
            ifnull(SUBSTR(max(order_id) from 7),0)
            ifnull(SUBSTR(max(right(order_id,8)) from 5),0)
        from
            `order` as a
        where
@@ -33,13 +33,12 @@
    </select>

    <select id="selectMaxOrderIdByYear">
       select ifnull((select
            SUBSTR(order_id from 5)
       select
           ifnull(SUBSTR(max(right(order_id,8)) from 3),0)
        from
            `order` as a
        where
            year(a.create_time)  = year(now())
        order by  id desc limit 1),0) temp
    </select>

    <select id="selectOrderIdMin">