feat(production): 添加设备ID和名称到工单信息查询

buhuazhen

2026-04-16 8885a814634fd9e4ee6485fca2bc1695d20da3d1

feat(production): 添加设备ID和名称到工单信息查询

- 在ProductWorkOrderDto中新增deviceId字段
- 修改ProductWorkOrderMapper.xml，查询结果中加入device_id和device_name
- 更新SQL中的GROUP BY语句，包含设备相关字段以支持聚合
- ProductWorkOrderServiceImpl中增加deviceName字段的映射处理
- 完善工单流程卡查询，支持设备信息显示

 src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java

@@ -45,4 +45,6 @@
    private String workOrderType;

    private String deviceName;

    private Long deviceId;
}

 src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java

@@ -92,6 +92,7 @@
                    put("actualStartTime", productWorkOrderDto.getActualStartTime());
                    put("actualEndTime", productWorkOrderDto.getActualEndTime());
                    put("twoCode", Pictures.ofLocal(codePath).create());
                    put("deviceName", productWorkOrderDto.getDeviceName());
                    put("images", images.isEmpty()?null:images);
                }});


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

@@ -59,7 +59,9 @@
        p.product_name AS productName,
        po.nps_no AS productOrderNpsNo,
        ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
        sum(ppo.scrap_qty) scrapQty
            sum(ppo.scrap_qty) scrapQty,
            ppm.device_id,
            ppm.device_name
        FROM
        product_work_order pwo
        LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -71,6 +73,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.NAME ,
                pm.model,
                pm.unit,

 src/main/resources/static/work-order-template.docx

Binary files differ