Merge remote-tracking branch 'origin/jtwy' into jtwy

yaowanxin

2 天以前 973677d7792dbe440bd032ff4cc138458c89b06e

 src/main/resources/mapper/production/ProductStructureMapper.xml

@@ -25,4 +25,19 @@
        where ps.bom_id = #{bomId}
        order by ps.id
    </select>
    <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
        select ps.*,
               p.product_name,
               pp.name as  process_name,
               pm.product_id,
               pm.model
        from
            product_structure ps
                left join product_bom pb on ps.bom_id = pb.id
                left join product_model pm on ps.product_model_id = pm.id
                left join product p on pm.product_id = p.id
                left join product_process pp on ps.process_id = pp.id
        where pb.product_model_id = #{productModelId}
        order by ps.id
    </select>
</mapper>