zhang_nuo
2 天以前 f3d0cf42321bb6f0f3c03a66c3d33c260f5d593e
feat[production]: 生产作业任务新增领料状态字段

- 在 ProductionOperationTaskVo 中新增 picked 布尔字段,用于标记
作业任务是否已完成领料
- 在 ProductionOperationTaskMapper.xml 中关联领料统计表,通过
生产订单和工艺工序维度统计领料记录数,动态计算 picked 字段值
已修改2个文件
10 ■■■■■ 文件已修改
src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
@@ -49,4 +49,7 @@
    @Schema(description = "类型 区分计时和计件(0计时1计件)")
    private Integer type;
    @Schema(description = "是否已领料")
    private Boolean picked;
}
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -31,6 +31,7 @@
               poro.operation_name as operationName,
               poro.type as type,
               IFNULL(scrapStat.scrapQty, 0) AS scrapQty,
               CASE WHEN pickStat.pickCount > 0 THEN 1 ELSE 0 END AS picked,
        ROUND(IFNULL(pot.complete_quantity, 0) / NULLIF(pot.plan_quantity, 0) * 100, 2) AS completionStatus,
        CASE
            WHEN pot.work_order_no LIKE 'FG%' THEN '返工返修'
@@ -42,6 +43,12 @@
                 left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
                 left join product p on pm.product_id = p.id
                 left join (
            select count(1) as pickCount, pop.production_order_id, pop.technology_operation_id
            from production_order_pick pop
            group by pop.production_order_id, pop.technology_operation_id
        ) pickStat on pickStat.production_order_id = pot.production_order_id
                  and pickStat.technology_operation_id = poro.technology_operation_id
                 left join (
            select ppm.production_operation_task_id as taskId,
                   sum(ifnull(ppo.scrap_qty, 0)) as scrapQty
            from production_product_main ppm