From 54a351c35dd08521efcd71d7c846478deb46c888 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 08 六月 2026 18:09:53 +0800
Subject: [PATCH] feat(production): 添加生产作业任务分页查询功能
---
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml | 37 +++++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java | 6 ++----
src/main/java/com/ruoyi/production/service/ProductionOperationTaskService.java | 2 ++
src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java | 2 ++
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java | 7 +++++++
5 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
index cb90420..1f2c2b9 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -77,11 +77,9 @@
}
@GetMapping("/byOrder/{orderId}")
- @Operation(summary = "鏍规嵁鐢熶骇璁㈠崟ID鏌ヨ鍒嗙粍鏁版嵁")
+ @Operation(summary = "鏍规嵁鐢熶骇璁㈠崟ID鏌ヨ宸ュ崟鍒楄〃")
public R<List<ProductionOperationTaskVo>> byOrder(@PathVariable Long orderId) {
- ProductionOperationTaskDto dto = new ProductionOperationTaskDto();
- dto.setProductionOrderId(orderId);
- return R.ok(productionOperationTaskService.listProductionOperationTask(dto));
+ return R.ok(productionOperationTaskService.listByOrderId(orderId));
}
@GetMapping("/getOperation")
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java
index dcd4a90..84e4375 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java
@@ -45,4 +45,6 @@
List<ProductionOperationTaskVo> getOperation(@Param("c") ProductionOperationTaskDto dto);
List<ProductionOperationTaskVo> listGroupedProductionOperationTask(@Param("c") ProductionOperationTaskDto dto);
+
+ List<ProductionOperationTaskVo> listByOrderId(@Param("orderId") Long orderId);
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOperationTaskService.java b/src/main/java/com/ruoyi/production/service/ProductionOperationTaskService.java
index 0945c6a..e89e1ae 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOperationTaskService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOperationTaskService.java
@@ -30,4 +30,6 @@
void down(HttpServletResponse response, ProductionOperationTaskDto dto);
List<ProductionOperationTaskVo> getOperation(ProductionOperationTaskDto dto);
+
+ List<ProductionOperationTaskVo> listByOrderId(Long orderId);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index de822d1..ab8a92a 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -381,6 +381,13 @@
return result;
}
+ @Override
+ public List<ProductionOperationTaskVo> listByOrderId(Long orderId) {
+ List<ProductionOperationTaskVo> result = baseMapper.listByOrderId(orderId);
+ fillUserNames(result);
+ return result;
+ }
+
private void fillOperationTypes(List<ProductionOperationTaskVo> voList) {
// 鍥炲～宸ュ簭绫诲瀷锛�0 璁℃椂 / 1 璁′欢锛�
if (voList == null || voList.isEmpty()) {
diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index 640b6d2..58c9f5a 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -260,4 +260,41 @@
order by min(poro.drag_sort), poro.operation_name
</select>
+ <select id="listByOrderId" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
+ select pot.id,
+ pot.work_order_no,
+ pot.plan_start_time as planStartTime,
+ pot.plan_end_time as planEndTime,
+ pot.actual_start_time as actualStartTime,
+ pot.actual_end_time as actualEndTime,
+ pot.status,
+ pot.production_order_id as productionOrderId,
+ pot.plan_quantity as planQuantity,
+ pot.complete_quantity as completeQuantity,
+ po.nps_no as npsNo,
+ po.is_end_order as endOrder,
+ p.product_name as productName,
+ pm.model as model,
+ pm.unit as unit,
+ poro.operation_name as operationName,
+ poro.type as type,
+ case when pot.work_order_no like 'FG%' then '杩斿伐杩斾慨' else '姝ｅ父' end as workOrderType,
+ ifnull(scrapStat.scrapQty, 0) as scrapQty,
+ round(ifnull(pot.complete_quantity, 0) / nullif(pot.plan_quantity, 0) * 100, 2) as completionStatus
+ from production_operation_task pot
+ left join production_order po on pot.production_order_id = po.id
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ 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 ppm.production_operation_task_id as taskId,
+ sum(ifnull(ppo.scrap_qty, 0)) as scrapQty
+ from production_product_main ppm
+ left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ group by ppm.production_operation_task_id
+ ) scrapStat on scrapStat.taskId = pot.id
+ where pot.production_order_id = #{orderId}
+ order by pot.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3