Merge branch 'dev_New' into jtwy

zss

2026-02-06 5cb362d364fa8582b2090e0d81585f4a7e9f19a1

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

@@ -25,6 +25,7 @@
        pm.model,
        pm.unit,
        p.product_name AS productName,
        pm.drawing_number,
        po.nps_no AS productOrderNpsNo,
        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
        CASE
@@ -55,6 +56,7 @@
        pp.NAME as processName,
        pm.model,
        pm.unit,
        pm.drawing_number,
        p.product_name AS productName,
        po.nps_no AS productOrderNpsNo,
        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
@@ -76,4 +78,23 @@
                p.product_name,
                po.nps_no
    </select>
    <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
        SELECT
            id,
            actual_start_time AS planStartTime,
            plan_quantity
        FROM
            product_work_order
        WHERE
            actual_start_time &gt;= #{startDate}
            AND actual_start_time &lt;= #{endDate}
    </select>
    <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
        SELECT SUBSTRING(work_order_no, 3) as work_order_no
        FROM product_work_order
        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
        order by work_order_no  desc
        limit 1
        ;
    </select>
</mapper>