Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

9 小时以前 e0c8edd1d949fae5883a60019d02a9c5f7cb7a29

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

@@ -11,33 +11,27 @@
        <result property="unit" column="unit"/>
        <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 id="listByBomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
        SELECT ps.id,
               ps.parent_id,
               ps.bom_id,
               ps.unit_quantity,
               ps.process_id,
               pp.name AS process_name
        FROM product_structure ps
                 LEFT JOIN product_process pp ON ps.process_id = pp.id
        WHERE ps.bom_id = #{bomId}
        ORDER BY ps.id
    </select>
    <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">

    <select id="listByBomAndProcess" 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
               pp.name as process_name
        from product_structure ps
                 left join product_process pp on ps.process_id = pp.id
        where ps.bom_id = #{bomId}
        and ps.process_id=#{processId}
          and ps.process_id = #{processId}
        order by ps.id
    </select>
</mapper>