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

liyong

17 小时以前 7558d3cb61282e41e27f85f56e829c6e6409f66d

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

@@ -9,22 +9,35 @@
        <result property="unitQuantity" column="unit_quantity"/>
        <result property="demandedQuantity" column="demanded_quantity"/>
        <result property="unit" column="unit"/>
        <result property="diskQuantity" column="disk_quantity"/>
        <result property="tenantId" column="tenant_id"/>
    </resultMap>



    <select id="listBybomId" 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_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 ps.bom_id = #{bomId}
        order by ps.id
    </select>
    <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
        select ps.*,
        pm.speculative_trading_name ,
        pp.name as  process_name,
        pm.product_id
               p.product_name,
               pp.name as  process_name,
               pm.product_id,
               pm.model
        from
        product_structure ps
        left join product_model pm on ps.product_model_id = pm.id
        left join product_process pp on ps.process_id = pp.id
        where pm.id = #{productId}
            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>