fix:1.生产报工优化

liding

2026-05-20 4d99e718536ac77dff26dde8da7a59cdc9b52de8

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -4,17 +4,20 @@
    <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        qi.*,
        pm.material_code as materialCode,
        (qi.quantity - qi.defective_quantity) as qualifiedQuantity,
        <choose>
            <when test="qualityInspect.inspectType == 0">
                pl.purchase_contract_number as purchase_contract_no
            </when>
            <otherwise>
                pwo.work_order_no
                pwo.work_order_no,
                po.batch_no
            </otherwise>
        </choose>
        FROM
        quality_inspect qi
        LEFT JOIN product_model pm ON qi.product_model_id = pm.id
        <choose>
            <when test="qualityInspect.inspectType == 0 ">
                LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
@@ -22,10 +25,11 @@
            <otherwise>
                LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
                LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
                LEFT JOIN product_order po ON pwo.product_order_id = po.id
            </otherwise>
        </choose>
        WHERE
        inspect_type=#{qualityInspect.inspectType}
        inspect_type = #{qualityInspect.inspectType}
        <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
            AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
        </if>
@@ -50,8 +54,10 @@
    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        *,
        pm.material_code as materialCode,
        (quantity - defective_quantity) as qualifiedQuantity
        FROM quality_inspect
        FROM quality_inspect qi
        LEFT JOIN product_model pm ON qi.product_model_id = pm.id
        where
        inspect_type=#{qualityInspect.inspectType}
        <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">