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

chenlu

2025-11-24 4086570d2a4091c86e6fad35a0c36c8963cdf415

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

@@ -292,4 +292,17 @@
          </if>

    </select>
    
    <select id="selectProcessSort">
        select a.process,
               ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) AS sort,
               ifnull(b.nickname,"") as recombination
        from sd.order_process_detail as a
        inner join sd.basic_data as b
                on a.process = b.basic_name and b.basic_category = 'process'
                where a.order_id = #{orderId}
                and a.process_id = #{processId}
                and a.order_number =#{orderNumber}
                and a.technology_number =#{technologyNumber}
    </select>
</mapper>