feat(production): 添加工序ID字段支持

liyong

2026-04-28 ac79dfd8d661dbe166553ff80fbdbfee64e8134e

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

@@ -22,6 +22,7 @@
        SELECT
        pwo.*,
        pp.NAME as processName,
        pp.id as processId,
        pm.model,
        pm.unit,
        p.product_name AS productName,
@@ -31,7 +32,8 @@
        WHEN pwo.work_order_no LIKE 'FG%' THEN '返工返修'
        ELSE '正常'
        END AS work_order_type,
        pp.device_name
        pp.device_name,
        pp.user_ids as process_user_ids
        FROM
        product_work_order pwo
        LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -49,6 +51,7 @@
            <if test="c.productOrderId != null and c.productOrderId != ''">
               and pwo.product_order_id = #{c.productOrderId}
            </if>
        order by po.id desc,pwo.id asc
    </select>
    <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
        SELECT
@@ -60,8 +63,8 @@
            po.nps_no AS productOrderNpsNo,
            ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
            sum(ppo.scrap_qty) scrapQty,
            ppm.device_id,
            ppm.device_name
            pp.device_id,
            pp.device_name
        FROM
            product_work_order pwo
                LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -73,8 +76,8 @@
                LEFT JOIN product p ON p.id = pm.product_id
        WHERE pwo.id = #{id}
        GROUP BY pwo.id, pwo.product_process_route_item_id, pwo.create_time, pwo.update_time, pwo.work_order_no, pwo.plan_start_time, pwo.plan_end_time, pwo.actual_start_time, pwo.actual_end_time, pwo.status, pwo.tenant_id, pwo.plan_quantity, pwo.product_order_id, pwo.complete_quantity,
                 ppm.device_id,
                 ppm.device_name,
                 pp.device_id,
                 pp.device_name,
                 pp.NAME ,
                 pm.model,
                 pm.unit,
@@ -92,12 +95,9 @@
            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
    <select id="selectMax" resultType="java.lang.Integer">
        SELECT count(1)
        FROM product_work_order
        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
        order by work_order_no  desc
        limit 1
        ;
        WHERE SUBSTRING(work_order_no, 3) like concat('%',#{datePrefix},'%')
    </select>
</mapper>