Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

7 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

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

@@ -40,14 +40,39 @@

    <select id="selectInputStats" resultType="java.util.Map">
        SELECT
            DATE_FORMAT(create_time, '%Y-%m-%d') as date,
            SUM(quantity) as quantity
        FROM
            production_product_input
        WHERE
            create_time &gt;= #{startDate}
            AND create_time &lt;= #{endDate}
        DATE_FORMAT(ppi.create_time, '%Y-%m-%d') AS date,
        -- 报工数量 * 最小系数
        SUM(ppi.quantity * IFNULL(distinct_ps.unit_quantity, 1)) AS quantity
        FROM production_product_input ppi
        INNER JOIN production_product_main ppm ON ppm.id = ppi.product_main_id
        INNER JOIN product_process_route_item ppri ON ppri.id = ppm.product_process_route_item_id
        INNER JOIN product_process_route ppr ON ppr.id = ppri.product_route_id
        INNER JOIN product_model pm ON pm.id = ppi.product_model_id
        INNER JOIN (
        SELECT
        bom_id,
        process_id,
        product_model_id,
        CAST(SUBSTRING_INDEX(GROUP_CONCAT(unit_quantity ORDER BY id ASC), ',', 1) AS DECIMAL(16, 4)) AS unit_quantity
        FROM product_structure
        GROUP BY bom_id, process_id, product_model_id
        ) distinct_ps ON distinct_ps.bom_id = ppr.bom_id
        AND distinct_ps.process_id = ppri.process_id
        AND distinct_ps.product_model_id = ppi.product_model_id
        <where>
            <if test="startDate != null">
                AND ppi.create_time &gt;= #{startDate}
            </if>
            <if test="endDate != null">
                AND ppi.create_time &lt;= #{endDate}
            </if>
        </where>
        GROUP BY
            DATE_FORMAT(create_time, '%Y-%m-%d')
        DATE_FORMAT(ppi.create_time, '%Y-%m-%d'),
        pm.id,
        pm.model
        ORDER BY
        date DESC,
        pm.id ASC
    </select>
</mapper>