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

廖井涛

2025-08-07 ac0bc1d3df54c8f18a10b135daf28faebb25d20a

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

@@ -71,11 +71,21 @@

    <!--查询筛选后唯一的流程卡号-->
    <select id="filterOrderProcess">
        select id,process,order_number,technology_number
      select * from( select max(id) as id,process,order_number,technology_number,b.nickname,
                            case b.nickname when '' then 1
                            when null then 1
                            when 'stepC' then 2
                            when 'stepA' then 3
                            when 'stepD' then 4
                            when 'stepB' then 4
                     end as sort

        from order_process_detail
        left join (select DISTINCT basic_name,nickname from basic_data where basic_category = 'process') as b
        on b.basic_name = process
        where order_id = #{orderId}
        group by process
        order by id
        group by process) as a
        order by sort,id

    </select>

@@ -158,14 +168,14 @@
        select a.process from sd.order_process_detail as a,
                              (select id,process from sd.order_process_detail
                                  where process_id=#{processId}
                                    and technology_number=#{technologyNumber}
                                    and position(technology_number in #{technologyNumber})
                                    and order_number=#{orderNumber}
                                    and process=#{thisProcess}
                                group by process) as b
        where a.id = b.id + 1
        and a.process_id=#{processId}
        and a.order_number=#{orderNumber}
        and a.technology_number=#{technologyNumber}
        and position(a.technology_number in #{technologyNumber})

    </select>