feat(生产报工): 报工完成按四类区分计数零件并分流质检入库

liu

5 天以前 a5f66f55b2c176e8504b8a077e00acfe2dfb4b00

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

@@ -13,9 +13,16 @@
        qu.unit,
        qu.quantity,
        qu.defective_phenomena,
        qu.deal_type,
        qu.deal_result,
        qu.repair_work_hour,
        qu.regenerate_new_order,
        qu.photo_urls,
        qu.deal_name,
        qu.deal_time,
        qu.inspect_id,
        qu.product_main_id,
        ppm.product_no as report_no,
        CASE
        WHEN qu.model = pm.id THEN pm.model
        ELSE qu.model
@@ -26,6 +33,7 @@
        END AS method
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.id
        LEFT JOIN production_product_main ppm ON qu.product_main_id = ppm.id
        <where>
            <if test="qualityUnqualified.inspectType != null ">
                AND inspect_type = #{qualityUnqualified.inspectType}
@@ -41,6 +49,9 @@
            </if>
            <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
                AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
            </if>
            <if test="qualityUnqualified.reportNo != null and qualityUnqualified.reportNo != '' ">
                AND ppm.product_no like concat('%',#{qualityUnqualified.reportNo},'%')
            </if>
        </where>
        order by qu.create_time desc
@@ -73,9 +84,16 @@
            qu.unit,
            qu.quantity,
            qu.defective_phenomena,
            qu.deal_type,
            qu.deal_result,
            qu.repair_work_hour,
            qu.regenerate_new_order,
            qu.photo_urls,
            qu.deal_name,
            qu.deal_time,
            qu.inspect_id,
            qu.product_main_id,
            ppm2.product_no as report_no,
            CASE
                WHEN qu.model = pm.id THEN pm.model
                ELSE qu.model
@@ -86,6 +104,7 @@
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
                 LEFT JOIN production_product_main ppm2 ON qu.product_main_id = ppm2.id
        where
            1=1
        and qu.id = #{id}