Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-18 c3e3920e4e7fcda3dd986c00bb80188381e93015

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

@@ -71,12 +71,25 @@

    <!--查询筛选后唯一的流程卡号-->
    <select id="filterOrderProcess">
        select process
        select id,process,order_number,technology_number
        from order_process_detail
        where order_id = #{orderId}
        group by process

    </select>

    <select id="filterLastProcess">
        select id,process,order_number,technology_number
        from order_process_detail
        where order_id = #{orderId}
        and order_number = #{orderNumber}
        and technology_number = #{technologyNumber}
        and id &gt; #{id}
        group by process
    </select>



    <select id="getGlassLRow">
        select
             max(a.technology_number) as rowCount,