Merge branch 'dev_New' into jtwy

zss

2026-02-06 5cb362d364fa8582b2090e0d81585f4a7e9f19a1

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

@@ -25,8 +25,13 @@
        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
        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
        CASE
        WHEN pwo.work_order_no LIKE 'FG%' THEN '返工返修'
        ELSE '正常'
        END AS work_order_type
        FROM
        product_work_order pwo
        LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -51,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,
@@ -83,4 +89,12 @@
            actual_start_time >= #{startDate}
            AND actual_start_time <= #{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>