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

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -31,4 +31,23 @@
        order by pbs.id
    </select>

    <select id="pickByBomId" resultType="com.ruoyi.production.bean.vo.ProductionBomStructureVo">
        SELECT
            pbs.*,
            p.product_name AS productName,
            pm.product_id AS productId,
            pm.model,
            top1.NAME AS operationName
        FROM
            production_bom_structure pbs
                LEFT JOIN product_model pm ON pbs.product_model_id = pm.id
                LEFT JOIN product p ON pm.product_id = p.id
                LEFT JOIN technology_operation top1 ON pbs.technology_operation_id = top1.id
        WHERE
            pbs.parent_id IS NOT NULL
          AND pbs.production_order_bom_id = #{bomId}
        ORDER BY
            pbs.id
    </select>

</mapper>