Merge branch 'dev_New' into jtwy

zss

2026-02-06 5cb362d364fa8582b2090e0d81585f4a7e9f19a1

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

@@ -10,9 +10,11 @@
        <result property="tenantId" column="tenant_id"/>
        <result property="createTime" column="create_time"/>
    </resultMap>

    <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
        select ppo.*,
        pm.model as model,
        pm.drawing_number,
        ppm.product_no as productNo
        from
        production_product_output ppo
@@ -25,4 +27,36 @@
        </where>
        order by ppo.id
    </select>

    <delete id="deleteByProductMainIds" parameterType="java.util.List">
        DELETE FROM production_product_output
        WHERE product_main_id IN
        <foreach collection="productMainIds" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
    <select id="selectOutputStats" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
        SELECT
            create_time,
            quantity,
            scrap_qty
        FROM
            production_product_output
        WHERE
            create_time &gt;= #{startDate}
            AND create_time &lt;= #{endDate}
    </select>

    <select id="selectDailyOutputStats" resultType="java.util.Map">
        SELECT
            DATE_FORMAT(create_time, '%Y-%m-%d') as date,
            SUM(quantity) as quantity
        FROM
            production_product_output
        WHERE
            create_time &gt;= #{startDate}
            AND create_time &lt;= #{endDate}
        GROUP BY
            DATE_FORMAT(create_time, '%Y-%m-%d')
    </select>
</mapper>